Merge pull request #33 from frontegg/FR-FR-14855-support-consent

FR-14855 - Support social login consent prompt
frontegg · Jan 22, 2024 · 6babc4d · 6babc4d
2 parents 8b0aba8 + 41fc0a7
commit 6babc4d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/Sources/FronteggSwift/FronteggApp.swift b/Sources/FronteggSwift/FronteggApp.swift
@@ -20,6 +20,10 @@ public class FronteggApp {
     public var handleLoginWithSocialLogin:Bool = true
     public var handleLoginWithSSO:Bool = false
 
+    /* force consent when authenticate with social login */
+    public var shouldPromptSocialLoginConsent:Bool = true
+
+
     public var regionData: [RegionConfig] = []
     let credentialManager: CredentialManager
     let logger = getLogger("FronteggApp")

diff --git a/Sources/FronteggSwift/FronteggAuth.swift b/Sources/FronteggSwift/FronteggAuth.swift
@@ -358,10 +358,15 @@ public class FronteggAuth: ObservableObject {
 
     internal func getRootVC() -> UIViewController? {
 
+
         if let appDelegate = UIApplication.shared.delegate,
            let window = appDelegate.window,
            let rootVC = window?.rootViewController {
+            if let presented = rootVC.presentedViewController {
+                return presented
+            }else {
                 return rootVC
+            }
         }
 
         if let rootVC = UIWindow.key?.rootViewController {

diff --git a/Sources/FronteggSwift/embedded/FronteggWebView.swift b/Sources/FronteggSwift/embedded/FronteggWebView.swift
@@ -30,6 +30,7 @@ public struct FronteggWebView: UIViewRepresentable {
         let jsObject = String(data: try! JSONSerialization.data(withJSONObject: [
             "loginWithSocialLogin": fronteggApp.handleLoginWithSocialLogin,
             "loginWithSSO": fronteggApp.handleLoginWithSSO,
+            "shouldPromptSocialLoginConsent": fronteggApp.shouldPromptSocialLoginConsent
         ]), encoding: .utf8)
 
         let jsScript = WKUserScript(source: "window.FronteggNativeBridgeFunctions = \(jsObject ?? "{}");", injectionTime: .atDocumentEnd, forMainFrameOnly: false)