FR-12444 - remove unused code from previous implementation

frontegg · Jul 2, 2023 · 5d4fc82 · 5d4fc82
1 parent c53a9a8
commit 5d4fc82
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 104 deletions.
diff --git a/Sources/FronteggSwift/FronteggAuth.swift b/Sources/FronteggSwift/FronteggAuth.swift
@@ -18,9 +18,7 @@ public class FronteggAuth: ObservableObject {
     @Published public var isLoading = true
     @Published public var initializing = true
     @Published public var showLoader = true
-    @Published public var pendingAppLink: URL?
-    @Published public var appLink: URL?
-    @Published public var externalLink = false
+    @Published public var appLink: Bool = false
     public var baseUrl = ""
     public var clientId = ""
 
@@ -48,15 +46,6 @@ public class FronteggAuth: ObservableObject {
         }.store(in: &subscribers)
 
 
-        self.$pendingAppLink.sink() { pendingAppLinkValue in
-            if(pendingAppLinkValue != nil){
-                DispatchQueue.main.async {
-                    self.appLink = pendingAppLinkValue
-                    self.pendingAppLink = nil
-                }
-            }
-        }.store(in: &subscribers)
-
         if let refreshToken = try? credentialManager.get(key: KeychainKeys.refreshToken.rawValue),
            let accessToken = try? credentialManager.get(key: KeychainKeys.accessToken.rawValue) {
 
@@ -91,8 +80,7 @@ public class FronteggAuth: ObservableObject {
                 self.accessToken = accessToken
                 self.user = user
                 self.isAuthenticated = true
-                self.pendingAppLink = nil
-                self.appLink = nil
+                self.appLink = false
 
                 let offset = Double((decode["exp"] as! Int) - Int(Date().timeIntervalSince1970))  * 0.9
                 DispatchQueue.global(qos: .utility).asyncAfter(deadline: .now() + offset) {
@@ -262,9 +250,12 @@ public class FronteggAuth: ObservableObject {
     public func handleOpenUrl(_ url: URL) -> Bool {
 
         if(!url.absoluteString.hasPrefix(self.baseUrl)){
+            self.appLink = false
             return false
         }
 
+        self.appLink = true
+
         self.webAuthentication?.webAuthSession?.cancel()
         self.webAuthentication = WebAuthentication()
         let oauthCallback = createOauthCallbackHandler() { res in

diff --git a/Sources/FronteggSwift/views/FronteggLoginPage.swift b/Sources/FronteggSwift/views/FronteggLoginPage.swift
diff --git a/Sources/FronteggSwift/views/FronteggUIKitWrapper.swift b/Sources/FronteggSwift/views/FronteggUIKitWrapper.swift
@@ -17,22 +17,14 @@ struct FronteggUIKitWrapper: View {
     }
     public var body: some View {
         ZStack {
-            if !fronteggAuth.initializing && fronteggAuth.pendingAppLink == nil {
-                if(fronteggAuth.appLink != nil){
-                    FronteggLoginPage()
-                } else {
-                    if(fronteggAuth.isAuthenticated){
-                        self.loaderView
-                        .onAppear() {
-                            self.navigateToAuthenticated()
-                        }
-                    }else {
-                        FronteggLoginPage()
-                    }
-                }
-            }
-            if fronteggAuth.showLoader || fronteggAuth.pendingAppLink != nil {
+            if fronteggAuth.initializing
+                || fronteggAuth.showLoader
+                || fronteggAuth.appLink {
                 self.loaderView
+            }else {
+                self.loaderView.onAppear() {
+                    self.navigateToAuthenticated()
+                }
             }
         }
         .environmentObject(fronteggAuth)

diff --git a/Sources/FronteggSwift/views/FronteggWrapper.swift b/Sources/FronteggSwift/views/FronteggWrapper.swift
@@ -24,17 +24,12 @@ public struct FronteggWrapper<Content: View>: View {
     }
     public var body: some View {
         ZStack {
-            if !fronteggAuth.initializing && fronteggAuth.pendingAppLink == nil {
-                if(fronteggAuth.appLink != nil){
-
-
-
-                } else {
-                    Group(content: content)
-                }
-            }
-            if fronteggAuth.showLoader || fronteggAuth.pendingAppLink != nil {
+            if fronteggAuth.initializing
+                || fronteggAuth.showLoader
+                || fronteggAuth.appLink {
                 self.loaderView
+            } else {
+                Group(content: content)
             }
         }
         .environmentObject(fronteggAuth)