@live-change/user-frontend 0.8.33 → 0.8.34

package/.nx/cache/file-map.json

@@ -2,30 +2,30 @@
   "version": "6.0",
   "nxVersion": "18.0.6",
   "deps": {
-    "@live-change/cli": "0.8.22",
-    "@live-change/dao": "0.8.22",
-    "@live-change/dao-vue3": "0.8.22",
-    "@live-change/dao-websocket": "0.8.22",
-    "@live-change/email-service": "0.8.22",
-    "@live-change/framework": "0.8.22",
-    "@live-change/identicon-service": "0.8.22",
-    "@live-change/image-frontend": "0.8.22",
-    "@live-change/message-authentication-service": "0.8.22",
-    "@live-change/notification-service": "0.8.22",
-    "@live-change/password-authentication-service": "0.8.22",
-    "@live-change/pattern": "0.8.22",
-    "@live-change/secret-code-service": "0.8.22",
-    "@live-change/secret-link-service": "0.8.22",
-    "@live-change/security-frontend": "0.8.22",
-    "@live-change/security-service": "0.8.22",
-    "@live-change/session-service": "0.8.22",
-    "@live-change/timer-service": "0.8.22",
-    "@live-change/upload-service": "0.8.22",
-    "@live-change/user-identification-service": "0.8.22",
-    "@live-change/user-service": "0.8.22",
-    "@live-change/vue3-components": "0.8.22",
-    "@live-change/vue3-ssr": "0.8.22",
-    "@vueuse/core": "^10.9.0",
+    "@live-change/cli": "0.8.33",
+    "@live-change/dao": "0.8.33",
+    "@live-change/dao-vue3": "0.8.33",
+    "@live-change/dao-websocket": "0.8.33",
+    "@live-change/email-service": "0.8.33",
+    "@live-change/framework": "0.8.33",
+    "@live-change/identicon-service": "0.8.33",
+    "@live-change/image-frontend": "0.8.33",
+    "@live-change/message-authentication-service": "0.8.33",
+    "@live-change/notification-service": "0.8.33",
+    "@live-change/password-authentication-service": "0.8.33",
+    "@live-change/pattern": "0.8.33",
+    "@live-change/secret-code-service": "0.8.33",
+    "@live-change/secret-link-service": "0.8.33",
+    "@live-change/security-frontend": "0.8.33",
+    "@live-change/security-service": "0.8.33",
+    "@live-change/session-service": "0.8.33",
+    "@live-change/timer-service": "0.8.33",
+    "@live-change/upload-service": "0.8.33",
+    "@live-change/user-identification-service": "0.8.33",
+    "@live-change/user-service": "0.8.33",
+    "@live-change/vue3-components": "0.8.33",
+    "@live-change/vue3-ssr": "0.8.33",
+    "@vueuse/core": "^10.11.0",
     "codeceptjs-assert": "^0.0.5",
     "codeceptjs-video-helper": "0.1.3",
     "compression": "^1.7.4",
@@ -40,10 +40,10 @@
     "unique-names-generator": "4.7.1",
     "v-shared-element": "3.1.1",
     "vue-meta": "^3.0.0-alpha.9",
-    "vue-router": "^4.2.5",
+    "vue-router": "^4.3.3",
     "vue3-scroll-border": "0.1.6",
     "wtfnode": "^0.9.1",
-    "@live-change/codeceptjs-helper": "0.8.22",
+    "@live-change/codeceptjs-helper": "0.8.33",
     "codeceptjs": "^3.5.12",
     "generate-password": "1.7.1",
     "playwright": "^1.41.2",
@@ -58,15 +58,7 @@
     "nonProjectFiles": [
       {
         "file": ".gitignore",
-        "hash": "16142390958919539472"
-      },
-      {
-        "file": "build-stats/ssr-srcentryserverjs-outDir-distserver.html",
-        "hash": "17084642017258807740"
-      },
-      {
-        "file": "build-stats/ssrManifest-outDir-distclient.html",
-        "hash": "3717210539203410457"
+        "hash": "16223102139109646162"
       },
       {
         "file": "e2e/codecept.conf.js",
@@ -132,10 +124,6 @@
         "file": "e2e/steps_file.js",
         "hash": "2840236016458073038"
       },
-      {
-        "file": "front/components.d.ts",
-        "hash": "16126346593933999340"
-      },
       {
         "file": "front/index.html",
         "hash": "14592446545376477605"
@@ -162,7 +150,7 @@
       },
       {
         "file": "front/src/App.vue",
-        "hash": "9444669136274040524"
+        "hash": "2987862695029806083"
       },
       {
         "file": "front/src/Index.vue",
@@ -238,7 +226,7 @@
       },
       {
         "file": "front/src/locale/LocaleSettings.vue",
-        "hash": "8043550231211679672"
+        "hash": "15462056023784231614"
       },
       {
         "file": "front/src/locale/routes.js",
@@ -386,11 +374,11 @@
       },
       {
         "file": "front/src/sign/GoogleAuth.vue",
-        "hash": "339885639525588130"
+        "hash": "5043472338996276712"
       },
       {
         "file": "front/src/sign/GoogleAuthReturn.vue",
-        "hash": "16033219181863400422"
+        "hash": "11578892278379018497"
       },
       {
         "file": "front/src/sign/SignInEmail.vue",
@@ -418,15 +406,15 @@
       },
       {
         "file": "front/src/sign/routes.js",
-        "hash": "13520340671954201795"
+        "hash": "731553876160166852"
       },
       {
         "file": "front/src/utils/countries.js",
         "hash": "6201169448865628496"
       },
       {
-        "file": "front/src/utils/googleApi.js",
-        "hash": "6876031073201770248"
+        "file": "front/src/utils/googleAuth.js",
+        "hash": "10682927559112869908"
       },
       {
         "file": "front/vite.config.js",
@@ -438,11 +426,11 @@
       },
       {
         "file": "package.json",
-        "hash": "4486716430883503029"
+        "hash": "12911801514831005291"
       },
       {
         "file": "server/app.config.js",
-        "hash": "6845178030219464653"
+        "hash": "18401554844996247569"
       },
       {
         "file": "server/init-functions.js",
@@ -462,7 +450,7 @@
       },
       {
         "file": "server/start.js",
-        "hash": "8389694059221215231"
+        "hash": "12152681523604331573"
       }
     ]
   }

package/front/src/sign/GoogleAuth.vue

@@ -14,13 +14,13 @@
         </div>
       </div>
       <div v-else-if="state === 'waiting'" class="text-center">
-        Authentication will open in a new window.
+        Authentication will open in this window.
       </div>
       <div v-else-if="state === 'working'" class="text-center">
         Waiting for server...
       </div>
       <div v-else-if="state === 'error'" class="text-center">
-        <div>Error during authentication</div>
+        <div>Error during authentication:</div>
         <div>{{ error }}</div>
       </div>
       <div v-else>
@@ -32,79 +32,53 @@
 </template>
 
 <script setup>
-  import { loadGoogleAuth2 } from "../utils/googleApi.js"
   import { defineProps, toRefs, ref, onMounted, inject } from 'vue'
 
-  import { useApi } from "@live-change/vue3-ssr"
-  const api = useApi()
-
-  import { useToast } from 'primevue/usetoast'
-  const toast = useToast()
+  import { useRouter } from 'vue-router'
+  const router = useRouter()
 
   const workingZone = inject('workingZone')
 
-  import { useRouter } from 'vue-router'
-  const router = useRouter()
+  import { googleAuthRedirect } from '../utils/googleAuth.js'
 
   const props = defineProps({
     action: {
       type: String,
       default: 'signInOrSignUp'
+    },
+    accessType: {
+      type: String,
+      default: 'offline', //'online'
+    },
+    scope: {
+      type: Array,
+      default: () => ['profile', 'email']
     }
   })
 
-  const { action } = toRefs(props)
+  const { action, accessType, scope } = toRefs(props)
   const state = ref('waiting')
   const error = ref(null)
 
-  async function googleAuth() {
+  function googleAuth() {
     state.value = 'waiting'
-    const auth = await loadGoogleAuth2()
-    const googleRedirectUri = document.location.protocol + '//' + document.location.host
-      + router.resolve({ name: 'user:googleAuthReturn', params: { action: action.value } }).href
-    const response = await (auth.signIn({
-      scope: 'profile email'
-    }).catch(error => {
-      if(error.error === 'popup_blocked_by_browser') {
-        return auth.signIn({
-          scope: 'profile email',
-          ux_mode: 'redirect',
-          redirect_uri: googleRedirectUri
-        })
-      }
-      if(error.error === 'popup_closed_by_user') {
-        toast.add({ severity: 'warning', summary: 'Canceled', detail: 'You closed login window', life: 3000 })
-        state.value = 'canceled'
-        return
-      }
-      throw error
+
+    workingZone.addPromise('google auth', new Promise((resolve, reject) => {
+      setTimeout(() => {
+        state.value = 'error'
+        error.value = 'redirect_timeout'
+        // return reject('redirect timeout?!')
+        return resolve()
+      }, 4000)
     }))
 
-    state.value = 'working'
-    try {
-      const result = await workingZone.addPromise(`google ${action.value}`,
-        api.command(['googleAuthentication', action.value], {
-          accessToken: response.getAuthResponse().id_token
-        })
-      )
-      //console.log("GAUTH RESULT", result)
-      const { action: actionDone, user } = result
-      while(api.client.value.user !== result.user) {
-        await new Promise(resolve => setTimeout(resolve, 100))
-      }
-      if(actionDone === 'signIn') {
-        router.push({ name: 'user:signInFinished' })
-      } else if(actionDone === 'signUp') {
-        router.push({ name: 'user:signUpFinished' })
-      } else {
-        console.error("Unknown action", actionDone)
-      }
-    } catch(error) {
-      console.error("Google auth error", error)
-      toast.add({ severity: 'error', summary: 'Error', detail: 'Error during google authentication', life: 3000 })
-      state.value = 'error'
-      error.value = error
-    }
+    googleAuthRedirect({
+      scope: scope.value.join(' '),
+      redirectUri: document.location.protocol + '//' + document.location.host
+        + router.resolve({ name: 'user:googleAuthReturn', params: { action: action.value } }).href,
+      accessType: accessType.value
+    })
+
   }
 
   async function back() {

package/front/src/sign/GoogleAuthReturn.vue

@@ -9,7 +9,8 @@
       <div v-if="state === 'canceled'" class="text-center">
         <div>Authentication canceled by user</div>
         <div class="flex flex-row">
-          <Button @click="back" label="Go back" icon="pi pi-arrow-left" class="w-full p-button-secondary mb-1" />
+          <Button @click="back" label="Go back" icon="pi pi-arrow-left"
+                  class="w-full p-button-secondary mb-1" />
         </div>
       </div>
       <div v-else-if="state === 'working'" class="text-center">
@@ -28,7 +29,6 @@
 </template>
 
 <script setup>
-  import { loadGoogleAuth2 } from "../utils/googleApi.js"
   import { defineProps, toRefs, ref, onMounted, inject } from 'vue'
 
   import { useApi } from "@live-change/vue3-ssr"
@@ -39,8 +39,9 @@
 
   const workingZone = inject('workingZone')
 
-  import { useRouter } from 'vue-router'
+  import { useRouter, useRoute } from 'vue-router'
   const router = useRouter()
+  const route = useRoute()
 
   const props = defineProps({
     action: {
@@ -53,24 +54,20 @@
   const state = ref('waiting')
   const error = ref(null)
 
-
   onMounted(async () => {
-    const id_token = decodeURIComponent(
-      document.location.hash
-        .slice(1)
-        .split('&')
-        .map(p => p.split('='))
-        .find(a => a[0] === 'id_token')
-        [1]
-    )
-    if(!id_token) {
+    const query = route.query
+    console.log("QUERY", query)
+
+    if(!query.code) {
       state.value = 'canceled'
       return
     }
     try {
       const result = await workingZone.addPromise(`google ${action.value}`,
         api.command(['googleAuthentication', action.value], {
-          accessToken: id_token
+          redirectUri: document.location.protocol + '//' + document.location.host
+            + router.resolve({ name: 'user:googleAuthReturn', params: { action: action.value } }).href,
+          ...query
         })
       )
       console.log("GAUTH RESULT", result)

package/front/src/sign/routes.js

@@ -5,6 +5,8 @@ export function routes(config = {}) {
 
     route({ name: 'user:googleAuth', path: prefix + 'google-auth/:action',
       component: () => import("./GoogleAuth.vue"), props: true, meta: { } }),
+    route({ name: 'user:googleAuthScopes', path: prefix + 'google-auth/:action/:scopes*',
+      component: () => import("./GoogleAuth.vue"), props: true, meta: { } }),
     route({ name: 'user:googleAuthReturn', path: prefix + 'google-auth-return/:action',
       component: () => import("./GoogleAuthReturn.vue"), props: true }),
 

package/front/src/utils/googleAuth.js

@@ -0,0 +1,29 @@
+export function getAuthorizationUri(config) {
+  const {
+    authorizationBase = 'https://accounts.google.com/o/oauth2/auth',
+    accessType = 'offline',
+    approvalPrompt = 'force',
+    scope,
+    responseType = 'code',
+    clientId = ENV_GOOGLE_CLIENT_ID,
+    redirectUri = 'urn:ietf:wg:oauth:2.0:oob',
+  } = config
+
+  const authorizationUri = authorizationBase +
+    `?access_type=${accessType}&approval_prompt=${approvalPrompt}` +
+    `&scope=${encodeURIComponent(scope)}&response_type=${responseType}`+
+    `&client_id=${encodeURIComponent(clientId)}`+
+    //`&state=${encodeURIComponent(clientId)}` +
+    `&redirect_uri=${encodeURIComponent(redirectUri)}`
+
+  return authorizationUri
+}
+
+export function googleAuthRedirect(opts) {
+  const authUri = getAuthorizationUri({
+    ...opts
+  })
+  console.log("AUTH URI", authUri)
+
+  setTimeout(() => window.location = authUri, 100)
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/user-frontend",
-  "version": "0.8.33",
+  "version": "0.8.34",
   "scripts": {
     "memDev": "node --inspect --expose-gc server/start.js memDev --enableSessions --initScript ./init.js --dbAccess",
     "localDevInit": "rm tmp.db; node server/start.js localDev --enableSessions --initScript ./init.js",
@@ -22,30 +22,30 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/cli": "^0.8.33",
-    "@live-change/dao": "^0.8.33",
-    "@live-change/dao-vue3": "^0.8.33",
-    "@live-change/dao-websocket": "^0.8.33",
-    "@live-change/email-service": "^0.8.33",
-    "@live-change/framework": "^0.8.33",
-    "@live-change/identicon-service": "^0.8.33",
-    "@live-change/image-frontend": "^0.8.33",
-    "@live-change/message-authentication-service": "^0.8.33",
-    "@live-change/notification-service": "^0.8.33",
-    "@live-change/password-authentication-service": "^0.8.33",
-    "@live-change/pattern": "^0.8.33",
-    "@live-change/secret-code-service": "^0.8.33",
-    "@live-change/secret-link-service": "^0.8.33",
-    "@live-change/security-frontend": "^0.8.33",
-    "@live-change/security-service": "^0.8.33",
-    "@live-change/session-service": "^0.8.33",
-    "@live-change/timer-service": "^0.8.33",
-    "@live-change/upload-service": "^0.8.33",
-    "@live-change/user-identification-service": "^0.8.33",
-    "@live-change/user-service": "^0.8.33",
-    "@live-change/vue3-components": "^0.8.33",
-    "@live-change/vue3-ssr": "^0.8.33",
-    "@vueuse/core": "^10.9.0",
+    "@live-change/cli": "^0.8.34",
+    "@live-change/dao": "^0.8.34",
+    "@live-change/dao-vue3": "^0.8.34",
+    "@live-change/dao-websocket": "^0.8.34",
+    "@live-change/email-service": "^0.8.34",
+    "@live-change/framework": "^0.8.34",
+    "@live-change/identicon-service": "^0.8.34",
+    "@live-change/image-frontend": "^0.8.34",
+    "@live-change/message-authentication-service": "^0.8.34",
+    "@live-change/notification-service": "^0.8.34",
+    "@live-change/password-authentication-service": "^0.8.34",
+    "@live-change/pattern": "^0.8.34",
+    "@live-change/secret-code-service": "^0.8.34",
+    "@live-change/secret-link-service": "^0.8.34",
+    "@live-change/security-frontend": "^0.8.34",
+    "@live-change/security-service": "^0.8.34",
+    "@live-change/session-service": "^0.8.34",
+    "@live-change/timer-service": "^0.8.34",
+    "@live-change/upload-service": "^0.8.34",
+    "@live-change/user-identification-service": "^0.8.34",
+    "@live-change/user-service": "^0.8.34",
+    "@live-change/vue3-components": "^0.8.34",
+    "@live-change/vue3-ssr": "^0.8.34",
+    "@vueuse/core": "^10.11.0",
     "codeceptjs-assert": "^0.0.5",
     "codeceptjs-video-helper": "0.1.3",
     "compression": "^1.7.4",
@@ -60,12 +60,12 @@
     "unique-names-generator": "4.7.1",
     "v-shared-element": "3.1.1",
     "vue-meta": "^3.0.0-alpha.9",
-    "vue-router": "^4.2.5",
+    "vue-router": "^4.3.3",
     "vue3-scroll-border": "0.1.6",
     "wtfnode": "^0.9.1"
   },
   "devDependencies": {
-    "@live-change/codeceptjs-helper": "^0.8.33",
+    "@live-change/codeceptjs-helper": "^0.8.34",
     "codeceptjs": "^3.5.12",
     "generate-password": "1.7.1",
     "playwright": "^1.41.2",
@@ -76,5 +76,5 @@
   "author": "Michał Łaszczewski <michal@laszczewski.pl>",
   "license": "BSD-3-Clause",
   "description": "",
-  "gitHead": "98ff6f9c09e5fc1f408010df6cc8038eff571276"
+  "gitHead": "40e61928bf43b35352c76fc135f36a2d8bd76c4a"
 }

package/front/src/utils/googleApi.js

@@ -1,50 +0,0 @@
-let googPromise
-
-function loadGoogle() {
-  if(googPromise) return googPromise
-  let resolved = false
-  googPromise = new Promise((resolve, reject) => {
-    if (typeof window != 'undefined') {
-      window.googAsyncInit = function () {
-        if(resolved) return
-        resolved = true
-        resolve(gapi)
-      }
-
-      ;(function (d, s, id) {
-        const fjs = d.getElementsByTagName(s)[0]
-        if (d.getElementById(id)) return
-        const js = d.createElement(s)
-        js.id = id
-        js.src = "https://apis.google.com/js/platform.js?onload=googAsyncInit"
-        fjs.parentNode.insertBefore(js, fjs)
-      }(document, 'script', 'google-jssdk'))
-    } else {
-      reject('unavailable')
-    }
-  })
-  return googPromise
-}
-
-let googAuth2Promise
-
-async function loadGoogleAuth2() {
-  if(googAuth2Promise) return googAuth2Promise
-  let gapi = await loadGoogle()
-  let resolved = false
-  googAuth2Promise = new Promise((resolve, reject) => {
-    gapi.load('auth2', function() {
-      if(resolved) return
-      resolved = true
-      let client_id = ENV_GOOGLE_CLIENT_ID
-      resolve(gapi.auth2.init({
-        client_id
-      }))
-    })
-  })
-  return googAuth2Promise
-}
-
-
-
-export { loadGoogle, loadGoogleAuth2 }