sign out

Author: mohitc1

common/src/main/java/com/microsoft/identity/common/internal/msafederation/google/GoogleSignInProvider.kt

@@ -35,6 +35,7 @@ import com.google.android.libraries.identity.googleid.GoogleIdTokenParsingExcept
 import com.microsoft.identity.common.internal.msafederation.IFederatedSignInProvider
 import com.microsoft.identity.common.java.base64.Base64Util
 import com.microsoft.identity.common.java.exception.ClientException
+import com.microsoft.identity.common.logging.Logger
 import java.security.SecureRandom
 
 /**
@@ -126,6 +127,7 @@ internal class GoogleSignInProvider(private val credentialManager: CredentialMan
     private suspend fun getCredential(
         option: GetCustomCredentialOption
     ) : Result<SignInWithGoogleCredential> {
+        val methodTag = "$TAG:getCredential"
         val getCredentialRequest: GetCredentialRequest = GetCredentialRequest.Builder()
             .addCredentialOption(option)
             .build()
@@ -151,26 +153,37 @@ internal class GoogleSignInProvider(private val credentialManager: CredentialMan
                         )
                     } catch (e: GoogleIdTokenParsingException) {
                         // error parsing Google ID Token
-                        return Result.failure(e)
+                        Logger.warn(TAG, "Error parsing Google ID Token, $e.message")
+                        val clientException = ClientException(
+                            ClientException.SIGN_IN_WITH_GOOGLE_FAILED,
+                            e.message,
+                            e
+                        )
+                        return Result.failure(clientException)
                     }
                 } else {
                     // unsupported credential type
+                    val errorMessage = "Unsupported credential type, " + credential.type
+                    Logger.warn(TAG, errorMessage)
                     val clientException = ClientException(
                         ClientException.SIGN_IN_WITH_GOOGLE_FAILED,
-                        "Unsupported credential type" + credential.type
+                        errorMessage
                     )
                     return Result.failure(clientException)
                 }
             } else {
                 // Unexpected credential type
+                val errorMessage = "Unexpected credential type" + credential.javaClass.simpleName
+                Logger.warn(TAG, errorMessage)
                 val clientException = ClientException(
                     ClientException.SIGN_IN_WITH_GOOGLE_FAILED,
-                    "Unexpected credential type" + credential.javaClass.simpleName
+                    errorMessage
                 )
                 return Result.failure(clientException)
             }
         } catch (e: GetCredentialException) {
             // failure
+            Logger.warn(TAG, "Error getting google id token credential, $e.message")
             val clientException = ClientException(
                 ClientException.SIGN_IN_WITH_GOOGLE_FAILED,
                 e.message,

common/src/main/java/com/microsoft/identity/common/internal/msafederation/google/SignInWithGoogleApi.kt

@@ -22,6 +22,7 @@
 // THE SOFTWARE.
 package com.microsoft.identity.common.internal.msafederation.google
 
+import android.app.Activity
 import com.microsoft.identity.common.internal.msafederation.FederatedSignInProviderFactory
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -96,4 +97,12 @@ class SignInWithGoogleApi internal constructor(
             }
         }
     }
+
+    suspend fun signOut(activity: Activity) {
+        val signInWithGoogleParameters = SignInWithGoogleParameters(activity)
+        val googleSignInProvider = federatedSignInProviderFactory.getProvider(
+            signInWithGoogleParameters
+        )
+        googleSignInProvider.signOut()
+    }
 }

common/src/test/java/com/microsoft/identity/common/internal/msafederation/google/GoogleSignInProviderTest.kt

@@ -23,6 +23,7 @@
 package com.microsoft.identity.common.internal.msafederation.google
 
 import android.app.Activity
+import androidx.credentials.ClearCredentialStateRequest
 import androidx.credentials.CredentialManager
 import androidx.credentials.GetCredentialRequest
 import androidx.credentials.GetCredentialResponse
@@ -31,6 +32,7 @@ import com.google.android.libraries.identity.googleid.GetSignInWithGoogleOption
 import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
 import com.microsoft.identity.common.internal.msafederation.MsaFederationConstants
 import io.mockk.coEvery
+import io.mockk.coVerify
 import io.mockk.mockk
 import io.mockk.slot
 import kotlinx.coroutines.runBlocking
@@ -83,7 +85,7 @@ class GoogleSignInProviderTest {
     }
 
     @Test
-    fun testSignInWithBottomSheet() {
+    fun testSignInBottomSheet() {
         val mockCredentialManager = mockk<CredentialManager>()
         val mockActivity = mockk<Activity>()
         val mockParameters = SignInWithGoogleParameters(mockActivity, true)
@@ -119,4 +121,17 @@ class GoogleSignInProviderTest {
         val capturedActivity = activitySlot.captured
         assertSame(mockActivity, capturedActivity)
     }
+
+    @Test
+    fun testSignOut() {
+        val mockCredentialManager = mockk<CredentialManager>()
+        val mockActivity = mockk<Activity>()
+        val mockParameters = SignInWithGoogleParameters(mockActivity)
+        val webClientId = MsaFederationConstants.GOOGLE_MSA_WEB_CLIENT_ID
+        val googleSignInProvider = GoogleSignInProvider(mockCredentialManager, mockParameters, webClientId)
+
+        coEvery { mockCredentialManager.clearCredentialState(any()) } returns Unit
+        runBlocking { googleSignInProvider.signOut() }
+        coVerify { mockCredentialManager.clearCredentialState(any<ClearCredentialStateRequest>()) }
+    }
 }

common/src/test/java/com/microsoft/identity/common/internal/msafederation/google/MockGoogleSignInProvider.kt

@@ -33,6 +33,6 @@ class MockGoogleSignInProvider : IFederatedSignInProvider {
     }
 
     override suspend fun signOut() {
-        TODO("Not yet implemented")
+        // No-op
     }
 }

common/src/test/java/com/microsoft/identity/common/internal/msafederation/google/SignInWithGoogleParametersTest.kt

@@ -33,7 +33,7 @@ import org.robolectric.Robolectric
 import org.robolectric.RobolectricTestRunner
 
 /**
- * Tests for []SignInWithGoogleParameters].
+ * Tests for [SignInWithGoogleParameters].
  */
 @RunWith(RobolectricTestRunner::class)
 class SignInWithGoogleParametersTest {