merge local changes

frontegg · Dec 18, 2023 · 5582ace · 5582ace
1 parent 4f4edf3
commit 5582ace
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 11 deletions.
diff --git a/Sources/FronteggSwift/FronteggApp.swift b/Sources/FronteggSwift/FronteggApp.swift
@@ -55,7 +55,6 @@ public class FronteggApp {
         if let data = try? PlistHelper.fronteggRegionalConfig() {
             logger.info("Regional frontegg initialization")
             self.bundleIdentifier = data.bundleIdentifier
-            self.credentialManager = CredentialManager(serviceKey: data.keychainService)
             self.regionData = data.regions
 
 
@@ -65,7 +64,8 @@ public class FronteggApp {
                 clientId: self.clientId,
                 credentialManager: self.credentialManager,
                 isRegional:true,
-                regionData: self.regionData
+                regionData: self.regionData,
+                embeddedMode: self.embeddedMode
             )
 
             if let config = self.auth.selectedRegion {
@@ -94,15 +94,15 @@ public class FronteggApp {
 
         self.baseUrl = data.baseUrl
         self.clientId = data.clientId
-        self.bundleIdentifier = data.bundleIdentifier
-        self.credentialManager = CredentialManager(serviceKey: data.keychainService)
+
 
         self.auth = FronteggAuth(
             baseUrl: self.baseUrl,
             clientId: self.clientId,
             credentialManager: self.credentialManager,
             isRegional: false,
-            regionData: []
+            regionData: [],
+            embeddedMode: self.embeddedMode
         )
 
         logger.info("Frontegg Initialized succcessfully")

diff --git a/Sources/FronteggSwift/FronteggAuth.swift b/Sources/FronteggSwift/FronteggAuth.swift
@@ -26,6 +26,7 @@ public class FronteggAuth: ObservableObject {
     @Published public var isLoading = true
     @Published public var webLoading = true
     @Published public var initializing = true
+    @Published public var lateInit = false
     @Published public var showLoader = true
     @Published public var appLink: Bool = false
     @Published public var externalLink: Bool = false
@@ -53,26 +54,54 @@ public class FronteggAuth: ObservableObject {
           clientId: String,
           credentialManager: CredentialManager,
           isRegional: Bool,
-          regionData: [RegionConfig]) {
+          regionData: [RegionConfig],
+          embeddedMode: Bool,
+          isLateInit: Bool? = false) {
         self.isRegional = isRegional
         self.regionData = regionData
+        self.lateInit = isLateInit ?? false
         self.credentialManager = credentialManager
 
-        self.embeddedMode = PlistHelper.isEmbeddedMode()
+        self.embeddedMode = embeddedMode
         self.baseUrl = baseUrl
         self.clientId = clientId
         self.api = Api(baseUrl: self.baseUrl, clientId: self.clientId)
         self.selectedRegion = self.getSelectedRegion()
 
-        if ( isRegional ) {
+        if ( isRegional || isLateInit == true ) {
+            initializing = false
+            showLoader = false
             return;
         }
 
 
         self.initializeSubscriptions()
     }
 
+    public func manualInit(baseUrl:String, clientId:String) {
+        self.lateInit = false
+        self.baseUrl = baseUrl
+        self.clientId = clientId
+        self.isRegional = false
+        self.api = Api(baseUrl: self.baseUrl, clientId: self.clientId)
+        self.initializeSubscriptions()
+    }
 
+    public func manualInitRegions(regions:[RegionConfig]) {
+
+        self.lateInit = false
+        self.isRegional = true
+        self.regionData = regions
+
+        if let config = self.selectedRegion {
+            self.baseUrl = config.baseUrl
+            self.clientId = config.clientId
+            self.api = Api(baseUrl: self.baseUrl, clientId: self.clientId)
+            self.initializeSubscriptions()
+        }
+    }
+
+
     public func reinitWithRegion(config:RegionConfig) {
         self.baseUrl = config.baseUrl
         self.clientId = config.clientId

diff --git a/Sources/FronteggSwift/utils/PlistHelper.swift b/Sources/FronteggSwift/utils/PlistHelper.swift
@@ -109,6 +109,15 @@ struct PlistHelper {
         return Logger.Level.warning
     }
 
+
+
+    public static func bundleIdentifier() -> String {
+        let bundle = Bundle.main;
+        return bundle.bundleIdentifier!
+    }
+
+
+
     public static func isEmbeddedMode() -> Bool {
 
         let bundle = Bundle.main;

diff --git a/demo-multi-region/demo-multi-region/MyApp.swift b/demo-multi-region/demo-multi-region/MyApp.swift
@@ -31,11 +31,22 @@ struct MyApp: View {
                 }
             } else {
 
-                DefaultLoader().onAppear(){
-                    if(!FronteggAuth.shared.isAuthenticated){
-                        fronteggAuth.login()
+                if(fronteggAuth.lateInit) {
+                    Button("EU") {
+                        FronteggApp.shared.manualInit(baseUrl: "https://auth.davidantoon.me", cliendId: "b6adfe4c-d695-4c04-b95f-3ec9fd0c6cca")
+                    }.padding(.top, 40)
+
+                    Button("US") {
+                        FronteggApp.shared.manualInit(baseUrl: "https://davidprod.frontegg.com", cliendId: "d7d07347-2c57-4450-8418-0ec7ee6e096b")
+                    }
+                }else {
+                    DefaultLoader().onAppear(){
+                        if(!fronteggAuth.isAuthenticated && !fronteggAuth.initializing){
+                            fronteggAuth.login()
+                        }
                     }
                 }
+
             }
         }
     }