Merge pull request #31 from moratori/interpret-response-code-after-vp…

…-rdt435 Open the `redirect_uri` obtained after VP in an external app.
OWND-Project · Oct 11, 2024 · 1261a1f · 1261a1f
2 parents ce194db + 82bd328
commit 1261a1f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 38 deletions.
diff --git a/tw2023_wallet/Feature/ShareCredential/Views/RedirectView.swift b/tw2023_wallet/Feature/ShareCredential/Views/RedirectView.swift
@@ -137,19 +137,6 @@ struct RedirectView: View {
             )
         }
     }
-
-    func openURLInSafari(urlString: String) {
-        if let url = URL(string: urlString), UIApplication.shared.canOpenURL(url) {
-            UIApplication.shared.open(url, options: [:], completionHandler: nil)
-            presentationMode.wrappedValue.dismiss()
-        }
-        else {
-            print("invalid url is specified.")
-            alertTitle = "URLが不正です"
-            alertMessage = urlString
-            showAlert = true
-        }
-    }
 }
 
 #Preview {

diff --git a/tw2023_wallet/tw2023_walletApp.swift b/tw2023_wallet/tw2023_walletApp.swift
@@ -29,7 +29,6 @@ extension String: Identifiable {
 struct tw2023_walletApp: App {
     @State private var credentialOffer: String? = nil
     @State private var openID4VP: String? = nil
-    @State private var navigateToRedirectView = false
 
     @State private var sharingRequestModel = SharingRequestModel()
 
@@ -59,36 +58,13 @@ struct tw2023_walletApp: App {
                             if let postResult = sharingRequestModel.postResult,
                                 let location = postResult.location
                             {
-                                navigateToRedirectView.toggle()
+                                openURLInExternalApp(urlString: location)
                             }
                         }
                     ) { value in
                         SharingRequest(args: createOpenID4VPArgs(value: value)).environment(
                             sharingRequestModel)
                     }
-                    .fullScreenCover(
-                        isPresented: $navigateToRedirectView,
-                        onDismiss: {
-                            navigateToRedirectView = false
-                        }
-                    ) {
-                        // let (urlString, cookies) = getRedirectParameters()
-                        if let postResult = sharingRequestModel.postResult,
-                            let urlString = postResult.location
-                        {
-                            NavigationView {
-                                RedirectView(urlString: urlString, cookieStrings: [])
-                                    .navigationBarItems(
-                                        trailing: Button("close") {
-                                            navigateToRedirectView = false
-                                        }
-                                    )
-                            }
-                        }
-                        else {
-                            EmptyView()
-                        }
-                    }
             }
             else {
                 AuthenticationView(authenticationManager: self.authenticationManager).onOpenURL(
@@ -103,6 +79,15 @@ struct tw2023_walletApp: App {
         }
     }
 
+    private func openURLInExternalApp(urlString: String) {
+        if let url = URL(string: urlString), UIApplication.shared.canOpenURL(url) {
+            UIApplication.shared.open(url, options: [:], completionHandler: nil)
+        }
+        else {
+            print("invalid url is specified.")
+        }
+    }
+
     private func handleScenePhaseChange(_ newPhase: ScenePhase) {
         switch newPhase {
             case .active: