From 7b6a851eb78dd6c8ea4b00d7d4e2e5734d68f1fd Mon Sep 17 00:00:00 2001
From: Michael Rittmeister <michael@rittmeister.in>
Date: Fri, 20 Oct 2023 21:42:30 +0200
Subject: [PATCH] Use AuthenticationService to sign in instead of
 SFSafariViewController

---
 .idea/misc.xml                                |  1 -
 app/android/src/main/java/AppActivity.kt      | 10 ++++-
 app/ios/iosApp.xcodeproj/project.pbxproj      |  4 +-
 app/ios/iosApp/ComposeView.swift              | 37 ++++++++++++++++++-
 app/ios/iosApp/iosAppApp.swift                | 33 +++++------------
 app/ios/src/appleMain/kotlin/Main.kt          |  5 ++-
 .../tonbrett/app/util/InAppBrowser.kt         | 18 ---------
 .../tonbrett/app/util/InAppBrowser.kt         | 21 -----------
 .../tonbrett/app/MobileTonbrettApp.kt         | 24 +++++-------
 .../tonbrett/app/util/InAppBrowser.kt         |  9 -----
 build.gradle.kts                              |  2 +-
 11 files changed, 68 insertions(+), 96 deletions(-)
 delete mode 100644 app/shared/src/androidMain/kotlin/dev/schlaubi/tonbrett/app/util/InAppBrowser.kt
 delete mode 100644 app/shared/src/appleMain/kotlin/dev/schlaubi/tonbrett/app/util/InAppBrowser.kt
 delete mode 100644 app/shared/src/mobileMain/kotlin/dev/schlaubi/tonbrett/app/util/InAppBrowser.kt

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 34c36fd..4ff656f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ArendSettings">
     <option name="consolePrintingOptions">
diff --git a/app/android/src/main/java/AppActivity.kt b/app/android/src/main/java/AppActivity.kt
index fce16ac..f42e6b3 100644
--- a/app/android/src/main/java/AppActivity.kt
+++ b/app/android/src/main/java/AppActivity.kt
@@ -1,11 +1,16 @@
 package dev.schlaubi.tonbrett.app.android
 
+import android.net.Uri
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
 import dev.schlaubi.tonbrett.app.MobileTonbrettApp
 import dev.schlaubi.tonbrett.app.ProvideImageLoader
 import dev.schlaubi.tonbrett.app.api.AppContext
+import dev.schlaubi.tonbrett.app.api.LocalContext
 import dev.schlaubi.tonbrett.app.api.ProvideContext
 import dev.schlaubi.tonbrett.app.api.tokenKey
 
@@ -28,7 +33,10 @@ class AppActivity : AppCompatActivity() {
             ProvideContext(context) {
                 ProvideImageLoader {
                     UpdateAwareAppScope(activity = this) {
-                        MobileTonbrettApp(token)
+                        MobileTonbrettApp(token) { url ->
+                            val intent = CustomTabsIntent.Builder().build()
+                            intent.launchUrl(this@AppActivity, Uri.parse(url))
+                        }
                     }
                 }
             }
diff --git a/app/ios/iosApp.xcodeproj/project.pbxproj b/app/ios/iosApp.xcodeproj/project.pbxproj
index 2fc4e6b..860350f 100644
--- a/app/ios/iosApp.xcodeproj/project.pbxproj
+++ b/app/ios/iosApp.xcodeproj/project.pbxproj
@@ -383,7 +383,7 @@
 				"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 13.3;
@@ -436,7 +436,7 @@
 				"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 13.3;
diff --git a/app/ios/iosApp/ComposeView.swift b/app/ios/iosApp/ComposeView.swift
index 9fa4ffd..b537558 100644
--- a/app/ios/iosApp/ComposeView.swift
+++ b/app/ios/iosApp/ComposeView.swift
@@ -11,9 +11,10 @@ import shared
 
 struct ComposeView: UIViewControllerRepresentable {
     let receivedToken: String?
+    let onAuth: (String) -> Void
     
     func makeUIViewController(context: Context) -> some UIViewController {
-        MainKt.MainUiViewController(receivedToken: receivedToken)
+        MainKt.MainUiViewController(receivedToken: receivedToken, onAuth: onAuth)
     }
     
     func updateUIViewController(_ uiViewController: UIViewControllerType, context: Context) {}
@@ -21,9 +22,41 @@ struct ComposeView: UIViewControllerRepresentable {
 
 struct ContentView: View {
     let receivedToken: String?
+    let onAuth: (String) async -> Void
+    @Environment(\.webAuthenticationSession) private var webAuthenticationSession
+        
     var body: some View {
-        ComposeView(receivedToken: receivedToken)
+        ComposeView(receivedToken: receivedToken, onAuth: signIn)
             .ignoresSafeArea(.keyboard) // Compose has own keyboard handler
             .preferredColorScheme(.dark) // there is no light theme YET or ever
     }
+    
+    func signIn(url: String) {
+        Task {
+            do {
+                let urlWithToken = try await webAuthenticationSession.authenticate(
+                    using: URL(string: url)!,
+                    callbackURLScheme: "tonbrett",
+                    preferredBrowserSession: nil
+                )
+                
+                let token = urlWithToken.queryParameters!["token"]!
+                
+                await onAuth(token)
+            } catch {
+                print("Unexpected error: \(error).")
+            }
+        }
+    }
+}
+
+extension URL {
+    public var queryParameters: [String: String]? {
+        guard
+            let components = URLComponents(url: self, resolvingAgainstBaseURL: true),
+            let queryItems = components.queryItems else { return nil }
+        return queryItems.reduce(into: [String: String]()) { (result, item) in
+            result[item.name] = item.value
+        }
+    }
 }
diff --git a/app/ios/iosApp/iosAppApp.swift b/app/ios/iosApp/iosAppApp.swift
index 54b660b..1d95d60 100644
--- a/app/ios/iosApp/iosAppApp.swift
+++ b/app/ios/iosApp/iosAppApp.swift
@@ -1,6 +1,8 @@
 import SwiftUI
 import shared
 import FirebaseCore
+import Foundation
+import AuthenticationServices
 
 class AppDelegate: NSObject, UIApplicationDelegate {
   func application(_ application: UIApplication,
@@ -22,32 +24,15 @@ struct TonbrettApp: App {
             VStack {
                 ProgressView()
             }.fullScreenCover(isPresented: $loadApp, content: {
-                ComposeView(receivedToken: token)
-            }).onOpenURL(perform: { incomingUrl in
-                if(incomingUrl.scheme == "tonbrett" && incomingUrl.host == "login") {
-                    let token = incomingUrl.queryParameters!["token"]!
-                    self.loadApp = false
-                    self.token = token
-                    Task {
-                        try? await Task.sleep(nanoseconds: 1_000_000_000)
-                        loadApp = true
-                    }
-                }
+                ContentView(receivedToken: token, onAuth: onAuth)
             })
         }
     }
-}
-
-
-
-
-extension URL {
-    public var queryParameters: [String: String]? {
-        guard
-            let components = URLComponents(url: self, resolvingAgainstBaseURL: true),
-            let queryItems = components.queryItems else { return nil }
-        return queryItems.reduce(into: [String: String]()) { (result, item) in
-            result[item.name] = item.value
-        }
+    
+    func onAuth(token: String) async {
+        loadApp = false
+        self.token = token
+        try? await Task.sleep(nanoseconds: 1_000_000_000)
+        loadApp = true
     }
 }
diff --git a/app/ios/src/appleMain/kotlin/Main.kt b/app/ios/src/appleMain/kotlin/Main.kt
index 72cc54e..d6a64cf 100644
--- a/app/ios/src/appleMain/kotlin/Main.kt
+++ b/app/ios/src/appleMain/kotlin/Main.kt
@@ -1,10 +1,11 @@
 import androidx.compose.ui.window.ComposeUIViewController
+import com.liftric.kvault.KVault
 import dev.schlaubi.tonbrett.app.MobileTonbrettApp
 import dev.schlaubi.tonbrett.app.api.ProvideContext
 import platform.UIKit.UIViewController
 
 @Suppress("FunctionName", "unused")
-fun MainUiViewController(receivedToken: String?): UIViewController {
+fun MainUiViewController(receivedToken: String?, onAuth: (url: String) -> Unit): UIViewController {
     var onPresent: (UIViewController) -> Unit = {}
     val context = object : AppleAppContext() {
         override fun present(viewController: UIViewController) = onPresent(viewController)
@@ -12,7 +13,7 @@ fun MainUiViewController(receivedToken: String?): UIViewController {
     }
     val controller = ComposeUIViewController {
         ProvideContext(context) {
-            MobileTonbrettApp(receivedToken)
+            MobileTonbrettApp(receivedToken, onAuth)
         }
     }
 
diff --git a/app/shared/src/androidMain/kotlin/dev/schlaubi/tonbrett/app/util/InAppBrowser.kt b/app/shared/src/androidMain/kotlin/dev/schlaubi/tonbrett/app/util/InAppBrowser.kt
deleted file mode 100644
index 6361bb7..0000000
--- a/app/shared/src/androidMain/kotlin/dev/schlaubi/tonbrett/app/util/InAppBrowser.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package dev.schlaubi.tonbrett.app.util
-
-import android.net.Uri
-import androidx.browser.customtabs.CustomTabsIntent
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.remember
-import dev.schlaubi.tonbrett.app.api.LocalContext
-
-@Composable
-actual fun InAppBrowser(url: String) {
-    val context = LocalContext.current.currentActivity
-    val intent = remember(url) { CustomTabsIntent.Builder().build() }
-
-    LaunchedEffect(url) {
-        intent.launchUrl(context, Uri.parse(url))
-    }
-}
diff --git a/app/shared/src/appleMain/kotlin/dev/schlaubi/tonbrett/app/util/InAppBrowser.kt b/app/shared/src/appleMain/kotlin/dev/schlaubi/tonbrett/app/util/InAppBrowser.kt
deleted file mode 100644
index dba97dd..0000000
--- a/app/shared/src/appleMain/kotlin/dev/schlaubi/tonbrett/app/util/InAppBrowser.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package dev.schlaubi.tonbrett.app.util
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.remember
-import dev.schlaubi.tonbrett.app.api.LocalContext
-import platform.Foundation.NSURL
-import platform.SafariServices.SFSafariViewController
-
-@Composable
-actual fun InAppBrowser(url: String) {
-    val context = LocalContext.current
-    val safariViewController = remember(url) {
-        val nsUrl = NSURL(string = url)
-        SFSafariViewController(uRL = nsUrl)
-    }
-
-    LaunchedEffect(url) {
-        context.present(safariViewController)
-    }
-}
diff --git a/app/shared/src/mobileMain/kotlin/dev/schlaubi/tonbrett/app/MobileTonbrettApp.kt b/app/shared/src/mobileMain/kotlin/dev/schlaubi/tonbrett/app/MobileTonbrettApp.kt
index 5ceb70e..66469fd 100644
--- a/app/shared/src/mobileMain/kotlin/dev/schlaubi/tonbrett/app/MobileTonbrettApp.kt
+++ b/app/shared/src/mobileMain/kotlin/dev/schlaubi/tonbrett/app/MobileTonbrettApp.kt
@@ -10,29 +10,27 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
-import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import cafe.adriel.lyricist.LocalStrings
 import dev.schlaubi.tonbrett.app.api.LocalContext
 import dev.schlaubi.tonbrett.app.api.getUrl
-import dev.schlaubi.tonbrett.app.util.InAppBrowser
 import dev.schlaubi.tonbrett.client.href
 import dev.schlaubi.tonbrett.common.Route
 
 @Composable
-fun MobileTonbrettApp(receivedToken: String? = null) {
+fun MobileTonbrettApp(receivedToken: String? = null, onAuth: (url: String) -> Unit) {
     val sessionExpired = remember { mutableStateOf(false) }
     val context = LocalContext.current
-    var showLogin by remember { mutableStateOf(false) }
-    if (showLogin) {
-        showLogin = false
+
+    fun authorize() {
         val url = href(Route.Auth(Route.Auth.Type.MOBILE_APP), getUrl())
-        InAppBrowser(url)
-    } else if (receivedToken != null || context.isSignedIn || sessionExpired.value) {
+        onAuth(url)
+    }
+
+    if (receivedToken != null || context.isSignedIn || sessionExpired.value) {
         if (receivedToken != null) {
             sessionExpired.value = false
             context.token = receivedToken
@@ -40,9 +38,7 @@ fun MobileTonbrettApp(receivedToken: String? = null) {
         context.resetApi()
 
         SideEffect {
-            context.withReAuthroize {
-                showLogin = true
-            }
+            context.withReAuthroize(::authorize)
         }
         TonbrettApp(sessionExpired)
     } else {
@@ -57,9 +53,7 @@ fun MobileTonbrettApp(receivedToken: String? = null) {
             } else {
                 Text(strings.pleaseSignIn)
             }
-            Button({
-                showLogin = true
-            }) {
+            Button(::authorize) {
                 Icon(Icons.Default.OpenInBrowser, null)
                 Text(strings.signInWithDiscord)
             }
diff --git a/app/shared/src/mobileMain/kotlin/dev/schlaubi/tonbrett/app/util/InAppBrowser.kt b/app/shared/src/mobileMain/kotlin/dev/schlaubi/tonbrett/app/util/InAppBrowser.kt
deleted file mode 100644
index 8b9803b..0000000
--- a/app/shared/src/mobileMain/kotlin/dev/schlaubi/tonbrett/app/util/InAppBrowser.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package dev.schlaubi.tonbrett.app.util
-
-import androidx.compose.runtime.Composable
-
-/**
- * Launches in in-app browser for [url].
- */
-@Composable
-expect fun InAppBrowser(url: String)
diff --git a/build.gradle.kts b/build.gradle.kts
index 52e5bda..d3e6b16 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 
 allprojects {
     group = "dev.schlaubi.tonbrett"
-    version = "1.14.37"
+    version = "1.14.38"
 
     repositories {
         mavenCentral()