Merge branch 'master' into refresh_token_fixes

FronteggSwift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FronteggSwift'
-  s.version          = '1.2.26'
+  s.version          = '1.2.27'
   s.summary          = 'A swift library for easy integrating iOS application with Frontegg Services'
   s.description      = 'Frontegg is an end-to-end user management platform for B2B SaaS, powering strategies from PLG to enterprise readiness. Easy migration, no credit card required'
   s.homepage         = 'https://github.com/frontegg/frontegg-ios-swift'

Sources/FronteggSwift/FronteggApp.swift

@@ -24,6 +24,8 @@ public class FronteggApp {
     /* force consent when authenticate with social login */
     public var shouldPromptSocialLoginConsent:Bool = true
 
+    public var shouldSuggestSavePassword:Bool = false
+
 
     public var regionData: [RegionConfig] = []
     let credentialManager: CredentialManager
@@ -46,6 +48,7 @@ public class FronteggApp {
         self.bundleIdentifier = bundleIdentifier
         self.handleLoginWithSocialLogin = config.loginWithSocialLogin
         self.handleLoginWithSSO = config.loginWithSSO
+        self.shouldSuggestSavePassword = config.shouldSuggestSavePassword
 
         if FronteggApp.clearKeychain(config: config) {
             self.credentialManager.clear()

Sources/FronteggSwift/FronteggAuth.swift

@@ -208,8 +208,8 @@ public class FronteggAuth: ObservableObject {
 
             let decode = try JWTHelper.decode(jwtToken: accessToken)
             let user = try await self.api.me(accessToken: accessToken)
-            
-            
+
+
             DispatchQueue.main.sync {
                 self.refreshToken = refreshToken
                 self.accessToken = accessToken
@@ -218,26 +218,26 @@ public class FronteggAuth: ObservableObject {
                 self.appLink = false
                 self.initializing = false
                 self.appLink = false
-                
+
                 // isLoading must be at the bottom
                 self.isLoading = false
-                
-                
+
+
                 let offset = calculateOffset(expirationTime: decode["exp"] as! Int)
 
                 scheduleTokenRefresh(offset: offset)
-                
+
             }
         } catch {
-            logger.error("Failed to load user data, \(error)")
+            logger.error("Failed to load user data: \(error)")
             DispatchQueue.main.sync {
                 self.refreshToken = nil
                 self.accessToken = nil
                 self.user = nil
                 self.isAuthenticated = false
                 self.initializing = false
                 self.appLink = false
-                
+
                 // isLoading must be at the last bottom
                 self.isLoading = false
             }
@@ -512,7 +512,7 @@ public class FronteggAuth: ObservableObject {
     public typealias ConditionCompletionHandler = (_ error: FronteggError?) -> Void
 
     public func login(_ _completion: FronteggAuth.CompletionHandler? = nil, loginHint: String? = nil) {
-        
+
         if(self.embeddedMode){
             self.embeddedLogin(_completion, loginHint: loginHint)
             return
@@ -523,14 +523,30 @@ public class FronteggAuth: ObservableObject {
         }
 
         let oauthCallback = createOauthCallbackHandler(completion)
-        let (authorizeUrl, codeVerifier) = AuthorizeUrlGenerator.shared.generate(loginHint: loginHint)
+        let (authorizeUrl, codeVerifier) = AuthorizeUrlGenerator.shared.generate(loginHint: loginHint)  
         CredentialManager.saveCodeVerifier(codeVerifier)
-        
-        
+
+
         WebAuthenticator.shared.start(authorizeUrl, completionHandler: oauthCallback)
-
     }
-
+
+
+    func saveWebCredentials(domain: String, email: String, password: String, completion: @escaping (Bool, Error?) -> Void) {
+        let domainString = domain
+        let account = email
+
+        SecAddSharedWebCredential(domainString as CFString, account as CFString, password as CFString) { error in
+            if let error = error {
+                print("❌ Failed to save shared web credentials: \(error.localizedDescription)")
+                completion(false, error)
+            } else {
+                print("✅ Shared web credentials saved successfully!")
+                completion(true, nil)
+            }
+        }
+    }
+
+
 
     public func loginWithPopup(window: UIWindow?, ephemeralSession: Bool? = true, loginHint: String? = nil, loginAction: String? = nil, _completion: FronteggAuth.CompletionHandler? = nil) {
 
@@ -725,6 +741,7 @@ public class FronteggAuth: ObservableObject {
 
     func loginWithSocialLogin(socialLoginUrl: String, _ _completion: FronteggAuth.CompletionHandler? = nil) {
         let completion = _completion ?? self.loginCompletion ?? { res in
+
 
         }
 

Sources/FronteggSwift/embedded/FronteggWKContentController.swift

@@ -72,6 +72,26 @@ class FronteggWKContentController: NSObject, WKScriptMessageHandler {
             FronteggAuth.shared.loginWithSSO(email: message.payload)
         case "loginWithSocialLogin":
             FronteggAuth.shared.loginWithSocialLogin(socialLoginUrl: message.payload)
+        case "suggestSavePassword":
+            guard let data = try? JSONSerialization.jsonObject(with: Data(message.payload.utf8), options: []) as? [String: String],
+                let email = data["email"],
+                let password = data["password"] else {
+                    print("Invalid payload for loginWithPassword")
+
+                    return
+                }
+
+                if let url = URL(string: FronteggAuth.shared.baseUrl), let domain = url.host {
+                    FronteggAuth.shared.saveWebCredentials(domain: domain, email: email, password: password) { success, error in
+                        if success {
+                            print("✅ Credentials saved successfully for \(email)")
+                        } else {
+                            print("❌ Failed to save credentials: \(error?.localizedDescription ?? "Unknown error")")
+                        }
+                    }
+                } else {
+                    print("❌ Invalid base URL: \(FronteggAuth.shared.baseUrl)")
+                }
         case "showLoader":
             FronteggAuth.shared.webLoading = true
         case "hideLoader":

Sources/FronteggSwift/embedded/FronteggWebView.swift

@@ -30,7 +30,8 @@ public struct FronteggWebView: UIViewRepresentable {
         let jsObject = String(data: try! JSONSerialization.data(withJSONObject: [
             "loginWithSocialLogin": fronteggApp.handleLoginWithSocialLogin,
             "loginWithSSO": fronteggApp.handleLoginWithSSO,
-            "shouldPromptSocialLoginConsent": fronteggApp.shouldPromptSocialLoginConsent
+            "shouldPromptSocialLoginConsent": fronteggApp.shouldPromptSocialLoginConsent,
+            "suggestSavePassword": fronteggApp.shouldSuggestSavePassword
         ]), encoding: .utf8)
 
         let jsScript = WKUserScript(source: "window.FronteggNativeBridgeFunctions = \(jsObject ?? "{}");", injectionTime: .atDocumentEnd, forMainFrameOnly: false)

Sources/FronteggSwift/models/plist/FronteggPlist.swift

@@ -21,6 +21,7 @@ struct FronteggPlist: Decodable, Equatable {
     let payload: Payload
     let keepUserLoggedInAfterReinstall: Bool
     let useAsWebAuthenticationForAppleLogin: Bool
+    let shouldSuggestSavePassword:Bool
 
     enum CodingKeys: CodingKey {
         case keychainService
@@ -31,6 +32,7 @@ struct FronteggPlist: Decodable, Equatable {
         case logLevel
         case keepUserLoggedInAfterReinstall
         case useAsWebAuthenticationForAppleLogin
+        case shouldSuggestSavePassword
     }
 
     init(
@@ -42,7 +44,8 @@ struct FronteggPlist: Decodable, Equatable {
         logLevel: LogLevel = .warn,
         payload: Payload,
         keepUserLoggedInAfterReinstall: Bool,
-        useAsWebAuthenticationForAppleLogin: Bool = true
+        useAsWebAuthenticationForAppleLogin: Bool = true,
+        shouldSuggestSavePassword: Bool = false
     ) {
         self.keychainService = keychainService
         self.embeddedMode = embeddedMode
@@ -53,6 +56,7 @@ struct FronteggPlist: Decodable, Equatable {
         self.payload = payload
         self.keepUserLoggedInAfterReinstall = keepUserLoggedInAfterReinstall
         self.useAsWebAuthenticationForAppleLogin = useAsWebAuthenticationForAppleLogin
+        self.shouldSuggestSavePassword = shouldSuggestSavePassword
     }
 
     init(from decoder: any Decoder) throws {
@@ -82,6 +86,11 @@ struct FronteggPlist: Decodable, Equatable {
         let useAsWebAuthenticationForAppleLogin = try container.decodeIfPresent(Bool.self, forKey: .useAsWebAuthenticationForAppleLogin)
         self.useAsWebAuthenticationForAppleLogin = useAsWebAuthenticationForAppleLogin ?? false
 
+        let shouldSuggestSavePassword = try container.decodeIfPresent(Bool.self, forKey: .shouldSuggestSavePassword)
+        self.shouldSuggestSavePassword = shouldSuggestSavePassword ?? false
+
+
+
         do {
             self.payload = try Payload(from: decoder)
         } catch {

demo-embedded/demo-embedded/Frontegg.plist

@@ -6,6 +6,8 @@
 	<true/>
 	<key>embeddedMode</key>
 	<true/>
+	<key>shouldSuggestSavePassword</key>
+	<true/>
 	<key>baseUrl</key>
 	<string>https://autheu.davidantoon.me</string>
 	<key>clientId</key>

demo-embedded/demo-embedded/demo-embedded.entitlements

@@ -8,11 +8,17 @@
 	</array>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-		<string>webcredentials:auth.davidantoon.me</string>
-		<string>applinks:auth.davidantoon.me</string>
+		<string>webcredentials:autheu.davidantoon.me</string>
+		<string>applinks:autheu.davidantoon.me</string>
 		<string>webcredentials:davidantoon.me</string>
 		<string>applinks:autheu.davidantoon.me</string>
 		<string>webcredentials:autheu.davidantoon.me</string>
 	</array>
+	<key>com.apple.developer.authentication-services.autofill-credential-provider</key>
+	<true/>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)com.frontegg.demo</string>
+	</array>
 </dict>
 </plist>