From 8ca10ea75e7f4b3f5a3f5b5f1b16ea0deefb9e39 Mon Sep 17 00:00:00 2001 From: Satindar Dhillon Date: Sun, 28 Aug 2022 09:35:41 -0700 Subject: [PATCH] update android apple login redirect uri --- .../app/src/main/java/app/omnivore/omnivore/Constants.kt | 2 +- .../src/main/java/app/omnivore/omnivore/ui/auth/AppleAuth.kt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/Constants.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/Constants.kt index 07353c083..4aa48a1e3 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/Constants.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/Constants.kt @@ -12,7 +12,7 @@ object DatastoreKeys { object AppleConstants { const val clientId = "app.omnivore" - const val redirectURI = "https%3A%2F%2Fapi-demo.omnivore.app%2Fapi%2Fauth%2Fvercel%2Fapple-redirect" + const val redirectURI = "https%3A%2F%2Fapi-demo.omnivore.app%2Fapi%2Fmobile-auth%2Fandroid-apple-redirect" const val scope = "name%20email" const val authUrl = "https://appleid.apple.com/auth/authorize" } diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/AppleAuth.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/AppleAuth.kt index 1d352b2ed..b2f672c6c 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/AppleAuth.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/AppleAuth.kt @@ -88,9 +88,10 @@ fun AppleAuthWebView(onDismiss: (String?) -> Unit) { ) webViewClient = object : WebViewClient() { override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean { - if (request?.url.toString().contains("client/auth")) { + if (request?.url.toString().contains("android-apple-token")) { val uri = Uri.parse(request!!.url.toString()) - val token = uri.getQueryParameter("tok") + val token = uri.getQueryParameter("token") + onDismiss(token) } return true