Attempt to fix Google sign-in user switch (#330)

Co-authored-by: Walter Lara <walter.lara@nike.com>

Author: wlara

android/app-newm/src/main/java/io/newm/Logout.kt

@@ -3,6 +3,7 @@
 package io.newm
 
 import android.content.Context
+import com.google.android.gms.auth.api.signin.GoogleSignInClient
 import com.jakewharton.processphoenix.ProcessPhoenix
 import io.newm.shared.NewmAppLogger
 import io.newm.shared.public.usecases.LoginUseCase
@@ -17,13 +18,15 @@ class Logout(
     private val userSessionUseCase: UserSessionUseCase,
     private val restartApp: RestartApp,
     private val scope: CoroutineScope,
-    private val logger: NewmAppLogger
+    private val logger: NewmAppLogger,
+    private val googleSignInClient: GoogleSignInClient
 ) {
 
     fun signOutUser() {
         scope.launch {
             try {
                 loginUseCase.logout()
+                googleSignInClient.signOut()
                 logger.info("Logout", "Logout successful")
                 restartApp.run()
             } catch (e: Exception) {

android/app-newm/src/main/java/io/newm/di/android/Dependencies.kt

@@ -41,20 +41,18 @@ val viewModule = module {
             get()
         , get())
     }
-    single<GoogleSignInLauncher> {
+    single {
         val sharedBuildConfig = get<NewmSharedBuildConfig>()
-
-        GoogleSignInLauncherImpl(
-            GoogleSignIn.getClient(
-                androidContext(),
-                GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-                    .requestIdToken(sharedBuildConfig.googleAuthClientId)
-                    .requestScopes(Scope(Scopes.EMAIL), Scope(Scopes.PROFILE))
-                    .requestEmail()
-                    .build()
-            )
+        GoogleSignIn.getClient(
+            androidContext(),
+            GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+                .requestIdToken(sharedBuildConfig.googleAuthClientId)
+                .requestScopes(Scope(Scopes.EMAIL), Scope(Scopes.PROFILE))
+                .requestEmail()
+                .build()
         )
     }
+    single<GoogleSignInLauncher> { GoogleSignInLauncherImpl(get()) }
     factory { params ->
         WelcomeScreenPresenter(
             navigator = params.get(),
@@ -109,6 +107,6 @@ val viewModule = module {
 }
 
 val androidModules = module {
-    single { Logout(get(), get(), get(), get(), get()) }
+    single { Logout(get(), get(), get(), get(), get(), get()) }
     single { RestartApp(get()) }
 }