Login View Modernization

MAGE.xctestplan

@@ -55,6 +55,7 @@
         "FeedItemsViewControllerNoTimestampTests\/testOneFeedItemNoContent()",
         "FeedItemsViewControllerWithTimestampTests",
         "FeedItemsViewControllerWithTimestampTests\/testOneFeedItemWithPrimaryAndSecondaryValueAndIconWithoutTimestamp()",
+        "LocalLoginViewTests",
         "MageServerTestsSwift\/testShouldFailWhenAnImageIsrReturned()",
         "MageServiceTests",
         "MageTests",

Mage/AuthenticationButton.h

@@ -7,20 +7,16 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "MAGE-Swift.h"
+
 @import MaterialComponents;
 
 NS_ASSUME_NONNULL_BEGIN
 
-@protocol AuthenticationButtonDelegate
-
-- (void) onAuthenticationButtonTapped:(id) sender;
-
-@end
-
 @interface AuthenticationButton : UIView
 
 @property (strong, nonatomic) NSDictionary *strategy;
-@property (weak, nonatomic) id<AuthenticationButtonDelegate> delegate;
+@property (weak, nonatomic) id<IDPLoginDelegate> delegate;
 
 - (void) applyThemeWithContainerScheme:(id<MDCContainerScheming>)containerScheme;
 

Mage/AuthenticationButton.m

@@ -77,11 +77,6 @@ - (void) applyThemeWithContainerScheme:(id<MDCContainerScheming>)containerScheme
     [self setStrategy:self.strategy];
 }
 
-
-- (IBAction)onAuthenticationButtonTapped:(id)sender {
-    [self.delegate onAuthenticationButtonTapped:sender];
-}
-
 -(void) touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
     [super touchesBegan:touches withEvent:event];
     [self setButtonBackgroundColor:self.buttonColorHighlighted];

Mage/AuthenticationButton.xib

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -79,10 +77,6 @@
             </connections>
             <point key="canvasLocation" x="76.811594202898561" y="-102.45535714285714"/>
         </view>
-        <tapGestureRecognizer id="lU4-a0-QMb">
-            <connections>
-                <action selector="onAuthenticationButtonTapped:" destination="-1" id="Nrq-yQ-13g"/>
-            </connections>
-        </tapGestureRecognizer>
+        <tapGestureRecognizer id="lU4-a0-QMb"/>
     </objects>
 </document>

Mage/AuthenticationCoordinator.m

@@ -10,7 +10,6 @@
 #import "LoginViewController.h"
 #import "SignUpViewController.h"
 #import "SignUpViewController_Server5.h"
-#import "IDPLoginView.h"
 #import "IDPCoordinator.h"
 #import "MageOfflineObservationManager.h"
 #import "FadeTransitionSegue.h"
@@ -21,7 +20,7 @@
 #import "ContactInfo.h"
 #import "MAGE-Swift.h"
 
-@interface AuthenticationCoordinator() <LoginDelegate, DisclaimerDelegate, SignupDelegate, IDPButtonDelegate>
+@interface AuthenticationCoordinator() <LoginDelegate, DisclaimerDelegate, SignupDelegate, IDPLoginDelegate>
 
 @property (strong, nonatomic) UINavigationController *navigationController;
 @property (strong, nonatomic, readwrite) MageServer *server;

Mage/AuthenticationCoordinator_Server5.m

@@ -9,7 +9,6 @@
 #import "AuthenticationCoordinator_Server5.h"
 #import "LoginViewController.h"
 #import "SignUpViewController.h"
-#import "IDPLoginView.h"
 #import "IDPCoordinator.h"
 #import "MAGE-Swift.h"
 #import "MageOfflineObservationManager.h"

Mage/DemoAllLoginViews.swift

@@ -0,0 +1,42 @@
+//
+//  DemoAllLoginViews.swift
+//  MAGETests
+//
+//  Created by Brent Michalski on 8/5/25.
+//  Copyright © 2025 National Geospatial Intelligence Agency. All rights reserved.
+//
+
+import Foundation
+import SwiftUI
+
+let demoStrategies: [[String: Any]] = [
+    ["identifier": "local", "strategy": ["title": "Email"]],
+    ["identifier": "ldap", "strategy": ["title": "LDAP"]],
+    ["identifier": "idp", "strategy": ["title": "IDP", "name": "SSO"]]
+]
+
+struct DemoAllLoginViews: View {
+    var body: some View {
+        VStack(spacing: 24) {
+            ForEach(Array(demoStrategies.enumerated()), id: \.offset) { _, strategy in
+                if let identifier = strategy["identifier"] as? String {
+                    if identifier == "local" || identifier == "ldap" {
+                        LoginViewSwiftUI(viewModel: LoginViewModel(strategy: strategy, delegate: nil))
+                            .background(Color(UIColor.secondarySystemBackground))
+                            .cornerRadius(12)
+                            .padding()
+                    } else if identifier == "idp" {
+                        IDPLoginViewSwiftUI(viewModel: IDPLoginViewModel(strategy: strategy, delegate: nil))
+                            .padding()
+                    }
+                }
+            }
+        }
+        .padding()
+    }
+}
+
+#Preview("All Strategies Demo") {
+    DemoAllLoginViews()
+}
+

Mage/IDPCoordinator.h

@@ -1,5 +1,5 @@
 //
-//  OAuthCoordinator.h
+//  IDPCoordinator.h
 //  MAGE
 //
 //  Created by William Newman on 5/18/20.

Mage/IDPLoginViewModel.swift

@@ -0,0 +1,31 @@
+//
+//  IDPLoginViewModel.swift
+//  MAGE
+//
+//  Created by Brent Michalski on 7/31/25.
+//  Copyright © 2025 National Geospatial Intelligence Agency. All rights reserved.
+//
+
+import Foundation
+import Combine
+
+@objcMembers
+public class IDPLoginViewModel: NSObject, ObservableObject {
+    let strategy: [String: Any]
+    weak var delegate: IDPLoginDelegate?
+
+    init(strategy: [String: Any], delegate: IDPLoginDelegate?) {
+        self.strategy = strategy
+        self.delegate = delegate
+    }
+
+    func signin() {
+        delegate?.signinForStrategy(strategy as NSDictionary)
+    }
+
+    // Properties for button and such, based on strategy
+    var displayName: String {
+        strategy["name"] as? String ?? "Sign in with IDP"
+    }
+}
+

Mage/IDPLoginViewModelWrapper.swift

@@ -0,0 +1,31 @@
+//
+//  IDPLoginViewModelWrapper.swift
+//  MAGE
+//
+//  Created by Brent Michalski on 7/31/25.
+//  Copyright © 2025 National Geospatial Intelligence Agency. All rights reserved.
+//
+
+import Foundation
+import SwiftUI
+
+@objc public protocol IDPLoginDelegate: NSObjectProtocol {
+    @objc func signinForStrategy(_ strategy: NSDictionary)
+}
+
+@objc public class IDPLoginViewModelWrapper: NSObject {
+    @objc public var viewModel: IDPLoginViewModel
+
+    @objc public init(strategy: NSDictionary, delegate: IDPLoginDelegate?) {
+        let swiftStrategy = strategy as? [String: Any] ?? [:]
+        self.viewModel = IDPLoginViewModel(strategy: swiftStrategy, delegate: delegate)
+        super.init()
+    }
+}
+
+@objc public class IDPLoginViewHoster: NSObject {
+    @objc public static func hostingController(withViewModel viewModel: IDPLoginViewModel) -> UIViewController {
+        let swiftUIView = IDPLoginViewSwiftUI(viewModel: viewModel)
+        return UIHostingController(rootView: swiftUIView)
+    }
+}

Mage/IDPLoginViewSwiftUI.swift

@@ -0,0 +1,53 @@
+//
+//  IDPLoginViewSwiftUI.swift
+//  MAGE
+//
+//  Created by Brent Michalski on 7/31/25.
+//  Copyright © 2025 National Geospatial Intelligence Agency. All rights reserved.
+//
+
+import SwiftUI
+
+struct IDPLoginViewSwiftUI: View {
+    @ObservedObject var viewModel: IDPLoginViewModel
+
+    var body: some View {
+        Button(action: {
+            viewModel.signin()
+        }) {
+            HStack {
+                Image(systemName: "person.crop.circle.badge.checkmark")
+                Text(viewModel.displayName)
+                    .font(.headline)
+            }
+            .frame(maxWidth: .infinity)
+        }
+        .buttonStyle(.borderedProminent)
+        .padding(.vertical, 12)
+    }
+}
+
+
+// MARK: - Mock Delegate for Preview
+class MockIDPLoginDelegate: NSObject, IDPLoginDelegate {
+    func signinForStrategy(_ strategy: NSDictionary) {
+        print("Sign in tapped for strategy: \(strategy)")
+    }
+}
+
+
+// MARK: - Preview
+struct IDPLoginViewSwiftUI_Previews: PreviewProvider {
+    static var previews: some View {
+        let mockStrategy: [String: Any] = [
+            "identifier": "idp",
+            "name": "Sign in with Google",
+            "url": "https://example.com/oauth"
+        ]
+        let mockDelegate = MockIDPLoginDelegate()
+        let viewModel = IDPLoginViewModel(strategy: mockStrategy, delegate: mockDelegate)
+        return IDPLoginViewSwiftUI(viewModel: viewModel)
+            .padding()
+            .previewLayout(.sizeThatFits)
+    }
+}

Mage/IntroViews/Views/MageIntroButtonView.swift

@@ -35,16 +35,16 @@ struct MageIntroButtonView: View {
 struct MageIntroButtonView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            LocalLoginViewSwiftUI(viewModel: PreviewLocalLoginViewModel())
+            LoginViewSwiftUI(viewModel: PreviewLoginViewModel())
                 .previewDisplayName("Default")
-            LocalLoginViewSwiftUI(viewModel: {
-                let vm = PreviewLocalLoginViewModel()
+            LoginViewSwiftUI(viewModel: {
+                let vm = PreviewLoginViewModel()
                 vm.errorMessage = "Bad username or password!"
                 return vm
             }())
             .previewDisplayName("With Error")
-            LocalLoginViewSwiftUI(viewModel: {
-                let vm = PreviewLocalLoginViewModel()
+            LoginViewSwiftUI(viewModel: {
+                let vm = PreviewLoginViewModel()
                 vm.isLoading = true
                 return vm
             }())