Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enable apple auth button

Browse Source
This commit is contained in:
Satindar Dhillon
2022-08-28 07:51:23 -07:00
parent 3ea8304726
commit f4ebcd5578
3 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/Omnivore/app/src/main/java/app/omnivore/omnivore/Constants.kt
View File

@ -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"
}

25
android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/AppleAuth.kt
View File

@ -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")

6
android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/WelcomeScreen.kt
View File

@ -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"),