From f4ebcd5578bbb04d13febee87886f43430af6f75 Mon Sep 17 00:00:00 2001
From: Satindar Dhillon <satindar@gmail.com>
Date: Sun, 28 Aug 2022 07:51:23 -0700
Subject: [PATCH] enable apple auth button

---
 .../java/app/omnivore/omnivore/Constants.kt   |  3 +--
 .../omnivore/omnivore/ui/auth/AppleAuth.kt    | 25 ++++++-------------
 .../omnivore/ui/auth/WelcomeScreen.kt         |  6 ++---
 3 files changed, 10 insertions(+), 24 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 e4852a6bc..07353c083 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,8 +12,7 @@ object DatastoreKeys {
 
 object AppleConstants {
   const val clientId = "app.omnivore"
-  const val redirectURI = "https://api-demo.omnivore.app/api/auth/vercel/apple-redirect"
+  const val redirectURI = "https%3A%2F%2Fapi-demo.omnivore.app%2Fapi%2Fauth%2Fvercel%2Fapple-redirect"
   const val scope = "name%20email"
   const val authUrl = "https://appleid.apple.com/auth/authorize"
-  const val tokenUrl = "https://appleid.apple.com/auth/token"
 }
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 5bfd56466..f75f32361 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
@@ -70,23 +70,13 @@ fun AppleAuthWebContainerView(onDismiss: (String?) -> Unit) {
 @Composable
 fun AppleAuthWebView(onDismiss: (String?) -> Unit) {
   val url = AppleConstants.authUrl +
-    "?client_id=" +
-    AppleConstants.clientId +
-    "&redirect_uri=" +
-    AppleConstants.redirectURI +
-    "&response_type=code%20id_token&scope=" +
-    AppleConstants.scope +
-    "&response_mode=form_post&state=android:login"
-
-//  clientId="app.omnivore"
-//  scope="name email"
-//  state="web:login"
-//  redirectURI={appleAuthRedirectURI}
-//  responseMode="form_post"
-//  responseType="code id_token"
-//  designProp={{
-//    color: 'black',
-
+    "?client_id=" + AppleConstants.clientId +
+    "&redirect_uri=" + AppleConstants.redirectURI +
+    "&response_type=code%20id_token" +
+    "&scope=" + AppleConstants.scope +
+    "&response_mode=form_post" +
+    "&state=android:login"
+  
   // Adding a WebView inside AndroidView
   // with layout as full screen
   AndroidView(factory = {
@@ -95,7 +85,6 @@ fun AppleAuthWebView(onDismiss: (String?) -> Unit) {
         ViewGroup.LayoutParams.MATCH_PARENT,
         ViewGroup.LayoutParams.MATCH_PARENT
       )
-//      webViewClient = WebViewClient()
       webViewClient = object : WebViewClient() {
         override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
           Log.i("Apple payload one: ", request?.url.toString() ?: "null")
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt
index ccd6b4162..455037475 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt
@@ -128,16 +128,14 @@ fun AuthProviderView(
   ) {
     Spacer(modifier = Modifier.weight(1.0F))
     Column(
-//      verticalArrangement = Arrangement.Center,
-//      horizontalAlignment = Alignment.CenterHorizontally
-              verticalArrangement = Arrangement.spacedBy(8.dp),
+      verticalArrangement = Arrangement.spacedBy(8.dp),
       horizontalAlignment = Alignment.CenterHorizontally
     ) {
       if (isGoogleAuthAvailable) {
         GoogleAuthButton(viewModel)
       }
 
-      // AppleAuthButton(viewModel)
+      AppleAuthButton(viewModel)
 
       ClickableText(
         text = AnnotatedString("Continue with Email"),