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 b2f672c6c..fa8d7cc69 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 @@ -1,6 +1,7 @@ package app.omnivore.omnivore.ui.auth import android.annotation.SuppressLint +import android.content.ContentValues import android.net.Uri import android.util.Log import android.view.ViewGroup @@ -36,9 +37,9 @@ fun AppleAuthButton(viewModel: LoginViewModel) { ) if (showDialog.value) { - AppleAuthDialog(onDismiss = { authToken -> - if (authToken != null ) { - viewModel.saveAuthToken(authToken) + AppleAuthDialog(onDismiss = { token -> + if (token != null ) { + viewModel.handleAppleToken(token) } showDialog.value = false }) diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt index 9735f81be..36e5c315f 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/auth/LoginViewModel.kt @@ -68,10 +68,10 @@ class LoginViewModel @Inject constructor( } } - fun saveAuthToken(authToken: String) { - viewModelScope.launch { - datastoreRepo.putString(DatastoreKeys.omnivoreAuthToken, authToken) - } + fun handleAppleToken(authToken: String) { + submitAuthProviderPayload( + params = SignInParams(token = authToken, provider = "APPLE") + ) } fun logout() { @@ -98,15 +98,19 @@ class LoginViewModel @Inject constructor( return } + submitAuthProviderPayload( + params = SignInParams(token = googleIdToken, provider = "GOOGLE") + ) + } + + private fun submitAuthProviderPayload(params: SignInParams) { val login = RetrofitHelper.getInstance().create(AuthProviderLoginSubmit::class.java) viewModelScope.launch { isLoading = true errorMessage = null - val result = login.submitAuthProviderLogin( - SignInParams(token = googleIdToken, provider = "GOOGLE") - ) + val result = login.submitAuthProviderLogin(params) isLoading = false