Update method name to match Credential Manager docs, merge Firebase s…

…ign out with clearing credential state

auth/app/src/main/java/com/google/firebase/quickstart/auth/GoogleSignInActivity.java

@@ -88,7 +88,7 @@ private void launchCredentialManager() {
         // Instantiate a Google sign-in request
         GetGoogleIdOption googleIdOption = new GetGoogleIdOption.Builder()
                 .setFilterByAuthorizedAccounts(true)
-                .setServerClientId(getBaseContext().getString(R.string.default_web_client_id))
+                .setServerClientId(getString(R.string.default_web_client_id))
                 .build();
 
         // Create the Credential Manager request
@@ -107,7 +107,7 @@ private void launchCredentialManager() {
                     @Override
                     public void onResult(GetCredentialResponse result) {
                         // Extract credential from the result returned by Credential Manager
-                        createGoogleIdToken(result.getCredential());
+                        handleSignIn(result.getCredential());
                     }
 
                     @Override
@@ -118,8 +118,8 @@ public void onError(GetCredentialException e) {
         );
     }
 
-    // [START create_google_id_token]
-    private void createGoogleIdToken(Credential credential) {
+    // [START handle_sign_in]
+    private void handleSignIn(Credential credential) {
         // Check if credential is of type Google ID
         if (credential instanceof CustomCredential customCredential
                 && credential.getType().equals(TYPE_GOOGLE_ID_TOKEN_CREDENTIAL)) {
@@ -133,7 +133,7 @@ private void createGoogleIdToken(Credential credential) {
             Log.w(TAG, "Credential is not of type Google ID!");
         }
     }
-    // [END create_google_id_token]
+    // [END handle_sign_in]
 
     // [START auth_with_google]
     private void firebaseAuthWithGoogle(String idToken) {
@@ -154,8 +154,11 @@ private void firebaseAuthWithGoogle(String idToken) {
     }
     // [END auth_with_google]
 
-    // [START clear_credential_stage]
-    private void clearCredentialState() {
+    // [START sign_out]
+    private void signOut() {
+        // Firebase sign out
+        mAuth.signOut();
+
         // When a user signs out, clear the current user credential state from all credential providers.
         ClearCredentialStateRequest clearRequest = new ClearCredentialStateRequest();
         credentialManager.clearCredentialStateAsync(
@@ -174,7 +177,7 @@ public void onError(@NonNull ClearCredentialException e) {
                     }
                 });
     }
-    // [END clear_credential_stage]
+    // [END sign_out]
 
     private void updateUI(FirebaseUser user) {
 

auth/app/src/main/java/com/google/firebase/quickstart/auth/kotlin/GoogleSignInActivity.kt

@@ -86,15 +86,15 @@ class GoogleSignInActivity : AppCompatActivity() {
                 )
 
                 // Extract credential from the result returned by Credential Manager
-                createGoogleIdToken(result.credential)
+                handleSignIn(result.credential)
             } catch (e: GetCredentialException) {
                 Log.e(TAG, "Couldn't retrieve user's credentials: ${e.localizedMessage}")
             }
         }
     }
 
-    // [START create_google_id_token]
-    private fun createGoogleIdToken(credential: Credential) {
+    // [START handle_sign_in]
+    private fun handleSignIn(credential: Credential) {
         // Check if credential is of type Google ID
         if (credential is CustomCredential && credential.type == TYPE_GOOGLE_ID_TOKEN_CREDENTIAL) {
             // Create Google ID Token
@@ -106,7 +106,7 @@ class GoogleSignInActivity : AppCompatActivity() {
             Log.w(TAG, "Credential is not of type Google ID!")
         }
     }
-    // [END create_google_id_token]
+    // [END handle_sign_in]
 
     // [START auth_with_google]
     private fun firebaseAuthWithGoogle(idToken: String) {
@@ -127,8 +127,11 @@ class GoogleSignInActivity : AppCompatActivity() {
     }
     // [END auth_with_google]
 
-    // [START clear_credential_stage]
-    private fun clearCredentialState() {
+    // [START sign_out]
+    private fun signOut() {
+        // Firebase sign out
+        auth.signOut()
+
         // When a user signs out, clear the current user credential state from all credential providers.
         lifecycleScope.launch {
             try {
@@ -140,7 +143,7 @@ class GoogleSignInActivity : AppCompatActivity() {
             }
         }
     }
-    // [END clear_credential_stage]
+    // [END sign_out]
 
     private fun updateUI(user: FirebaseUser?) {
     }