Merge pull request #148 from donetick/fix-login-with-google

Fix login with google

android/app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.donetick.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 31
-        versionName "1.2.10"
+        versionCode 32
+        versionName "1.2.11"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

ios/App/App.xcodeproj/project.pbxproj

@@ -358,12 +358,12 @@
 				CODE_SIGN_ALLOW_ENTITLEMENTS_MODIFICATION = YES;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = 6UJJ78R3BS;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.2.10;
+				MARKETING_VERSION = 1.2.11;
 				PRODUCT_BUNDLE_IDENTIFIER = com.donetick.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -381,12 +381,12 @@
 				CODE_SIGN_IDENTITY = "Apple Distribution";
 				CODE_SIGN_STYLE = Manual;
 				PROVISIONING_PROFILE_SPECIFIER = "Donetick App Store(fastline)";
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 32;
 				DEVELOPMENT_TEAM = 6UJJ78R3BS;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.2.10;
+				MARKETING_VERSION = 1.2.11;
 				PRODUCT_BUNDLE_IDENTIFIER = com.donetick.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";

package.json

@@ -1,7 +1,7 @@
 {
   "name": "donetick",
   "private": true,
-  "version": "1.2.10",
+  "version": "1.2.11",
   "type": "module",
   "engines": {
     "node": ">=20.0.0",

src/views/Authorization/LoginView.jsx

@@ -699,14 +699,27 @@ const LoginView = () => {
                     variant='soft'
                     size='lg'
                     sx={{ mt: 3, mb: 2 }}
-                    onClick={() => {
-                      SocialLogin.login({
-                        provider: 'google',
-                        options: { scopes: ['profile', 'email', 'openid'] },
-                      }).then(user => {
+                    onClick={async () => {
+                      try {
+                        // Clear any cached session so the account picker shows
+                        await SocialLogin.logout({ provider: 'google' }).catch(
+                          () => {},
+                        )
+                        const user = await SocialLogin.login({
+                          provider: 'google',
+                          options: { scopes: ['profile', 'email', 'openid'] },
+                        })
                         console.log('Google user', user)
                         loggedWithProvider('google', user.result)
-                      })
+                      } catch (error) {
+                        console.error('Google login error:', error)
+                        showError({
+                          title: 'Google Login Failed',
+                          message: `Couldn't log in with Google, please try again${
+                            error?.message ? `: ${error.message}` : ''
+                          }`,
+                        })
+                      }
                     }}
                   >
                     <div className='flex gap-2'>