@live-change/user-frontend 0.9.183 → 0.9.185

package/front/locales/en.json

@@ -40,6 +40,7 @@
     "authenticationCanceled": "Authentication canceled by user",
     "authenticationError": "Error during authentication",
     "goBack": "Go back",
+    "goToConnected": "Go to connected accounts",
     "tryAgain": "Try again",
     "confirmEmail": "Confirm email",
     "confirmPhone": "Confirm phone",
@@ -238,9 +239,11 @@
     "emailTakenLink": "connected accounts page",
     "invalidGrant": "Invalid grant. Please try again. You may used this link before, or google authentication failed.",
     "connectedToAnotherUser": "This account is already connected to another user. Please sign in with your email address or google account.",
+    "alreadyConnected": "This Google account is already added to your account. You can check connected accounts in settings.",
     "emailAlreadyInUse": "Email is already in use",
     "invalidGrantToast": "Invalid grant",
     "connectedToAnotherUserToast": "Connected to another user",
+    "alreadyConnectedToast": "Account already added",
     "errorToast": "Error during google authentication"
   },
   "linkedinAuth": {

package/front/locales/pl.json

@@ -40,6 +40,7 @@
     "authenticationCanceled": "Uwierzytelnianie anulowane przez użytkownika",
     "authenticationError": "Błąd podczas uwierzytelniania",
     "goBack": "Wróć",
+    "goToConnected": "Przejdź do połączonych kont",
     "tryAgain": "Spróbuj ponownie",
     "confirmEmail": "Potwierdź email",
     "confirmPhone": "Potwierdź telefon",
@@ -238,9 +239,11 @@
     "emailTakenLink": "strony połączonych kont",
     "invalidGrant": "Nieprawidłowy grant. Spróbuj ponownie. Możesz użyć tego linku wcześniej lub uwierzytelnianie Google nie powiodło się.",
     "connectedToAnotherUser": "To konto jest już połączone z innym użytkownikiem. Zaloguj się swoim adresem email lub kontem Google.",
+    "alreadyConnected": "To konto Google jest już dodane do Twojego konta. Możesz sprawdzić połączone konta w ustawieniach.",
     "emailAlreadyInUse": "Email jest już w użyciu",
     "invalidGrantToast": "Nieprawidłowy grant",
     "connectedToAnotherUserToast": "Połączone z innym użytkownikiem",
+    "alreadyConnectedToast": "Konto już dodane",
     "errorToast": "Błąd podczas uwierzytelniania Google"
   },
   "linkedinAuth": {

package/front/src/message-auth/sms/ConnectSms.vue

@@ -31,8 +31,6 @@
   import { useI18n } from 'vue-i18n'
   const { locale: i18nLocale, t } = useI18n()
 
-  console.log("T", t)
-
   import { useApi } from '@live-change/vue3-ssr'
   const api = useApi()
   const {
@@ -44,8 +42,6 @@
     to: contact
   }
 
-  console.log("CLIENT", api.client.value)
-
   import { useRouter } from 'vue-router'
   const router = useRouter()
 

package/front/src/sign/GoogleAuthReturn.vue

@@ -43,6 +43,16 @@
           {{ t('googleAuth.connectedToAnotherUser') }}
         </div>
       </div>
+      <div v-else-if="state === 'alreadyConnected'" class="text-center">
+        <div>
+          {{ t('googleAuth.alreadyConnected') }}
+          <div class="flex flex-row mt-4 justify-center">
+            <router-link :to="{ name: 'user:connected' }">
+              <Button :label="t('auth.goToConnected')" icon="pi pi-arrow-left" class="w-full p-button-secondary mb-1" />
+            </router-link>
+          </div>
+        </div>
+      </div>
       <div v-else>
         {{ t('googleAuth.unknownState', { state }) }}
       </div>
@@ -123,11 +133,16 @@
           state.value = 'invalidGrant'
           return
         }
-        if(err === 'connectedToAnotherUser') {
+        if(err === 'connectedToAnotherUser' || err === 'alreadyConnectedElsewhere') {
           toast.add({ severity: 'error', summary: t('common.error'), detail: t('googleAuth.connectedToAnotherUserToast'), life: 3000 })
           state.value = 'connectedToAnotherUser'
           return
         }
+        if(err === 'alreadyConnected') {
+          toast.add({ severity: 'error', summary: t('common.error'), detail: t('googleAuth.alreadyConnectedToast'), life: 3000 })
+          state.value = 'alreadyConnected'
+          return
+        }
         console.error("Google auth error", err)
         toast.add({ severity: 'error', summary: t('common.error'), detail: t('googleAuth.errorToast'), life: 3000 })
         state.value = 'error' 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/user-frontend",
-  "version": "0.9.183",
+  "version": "0.9.185",
   "scripts": {
     "memDev": "tsx --inspect --expose-gc server/start.js memDev --enableSessions --initScript ./init.js --dbAccess",
     "localDevInit": "tsx server/start.js localDev --enableSessions --initScript ./init.js --dbAccess",
@@ -36,29 +36,29 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/cli": "^0.9.183",
-    "@live-change/dao": "^0.9.183",
-    "@live-change/dao-vue3": "^0.9.183",
-    "@live-change/dao-websocket": "^0.9.183",
-    "@live-change/email-service": "^0.9.183",
-    "@live-change/framework": "^0.9.183",
-    "@live-change/identicon-service": "^0.9.183",
-    "@live-change/image-frontend": "^0.9.183",
-    "@live-change/message-authentication-service": "^0.9.183",
-    "@live-change/notification-service": "^0.9.183",
-    "@live-change/password-authentication-service": "^0.9.183",
-    "@live-change/pattern": "^0.9.183",
-    "@live-change/secret-code-service": "^0.9.183",
-    "@live-change/secret-link-service": "^0.9.183",
-    "@live-change/security-frontend": "^0.9.183",
-    "@live-change/security-service": "^0.9.183",
-    "@live-change/session-service": "^0.9.183",
-    "@live-change/timer-service": "^0.9.183",
-    "@live-change/upload-service": "^0.9.183",
-    "@live-change/user-identification-service": "^0.9.183",
-    "@live-change/user-service": "^0.9.183",
-    "@live-change/vue3-components": "^0.9.183",
-    "@live-change/vue3-ssr": "^0.9.183",
+    "@live-change/cli": "^0.9.185",
+    "@live-change/dao": "^0.9.185",
+    "@live-change/dao-vue3": "^0.9.185",
+    "@live-change/dao-websocket": "^0.9.185",
+    "@live-change/email-service": "^0.9.185",
+    "@live-change/framework": "^0.9.185",
+    "@live-change/identicon-service": "^0.9.185",
+    "@live-change/image-frontend": "^0.9.185",
+    "@live-change/message-authentication-service": "^0.9.185",
+    "@live-change/notification-service": "^0.9.185",
+    "@live-change/password-authentication-service": "^0.9.185",
+    "@live-change/pattern": "^0.9.185",
+    "@live-change/secret-code-service": "^0.9.185",
+    "@live-change/secret-link-service": "^0.9.185",
+    "@live-change/security-frontend": "^0.9.185",
+    "@live-change/security-service": "^0.9.185",
+    "@live-change/session-service": "^0.9.185",
+    "@live-change/timer-service": "^0.9.185",
+    "@live-change/upload-service": "^0.9.185",
+    "@live-change/user-identification-service": "^0.9.185",
+    "@live-change/user-service": "^0.9.185",
+    "@live-change/vue3-components": "^0.9.185",
+    "@live-change/vue3-ssr": "^0.9.185",
     "@vueuse/core": "^12.3.0",
     "codeceptjs-assert": "^0.0.5",
     "codeceptjs-video-helper": "0.1.3",
@@ -79,7 +79,7 @@
     "wtfnode": "^0.9.1"
   },
   "devDependencies": {
-    "@live-change/codeceptjs-helper": "^0.9.183",
+    "@live-change/codeceptjs-helper": "^0.9.185",
     "codeceptjs": "^3.6.10",
     "generate-password": "1.7.1",
     "playwright": "1.49.1",
@@ -90,5 +90,5 @@
   "author": "Michał Łaszczewski <michal@laszczewski.pl>",
   "license": "BSD-3-Clause",
   "description": "",
-  "gitHead": "a61bc04560d627571a9c511b29b22357800e4927"
+  "gitHead": "f8f4caa3498f2dc1229e17adc1a3024dbb772b25"
 }