@live-change/user-frontend 0.8.13 → 0.8.15

package/front/src/sign/routes.js

@@ -3,20 +3,25 @@ export function routes(config = {}) {
 
   return [
 
-    route({ name: 'user:signIn', path: prefix + 'sign-in',
-      component: () => import("./SignIn.vue") }),
+    route({ name: 'user:googleAuth', path: prefix + 'google-auth/:action',
+      component: () => import("./GoogleAuth.vue"), props: true, meta: { signedOut: true } }),
+    route({ name: 'user:googleAuthReturn', path: prefix + 'google-auth-return/:action',
+      component: () => import("./GoogleAuthReturn.vue"), props: true }),
+
+    route({ name: 'user:signInEmail', path: prefix + 'sign-in-email',
+      component: () => import("./SignInEmail.vue"), meta: { signedOut: true } }),
     route({ name: 'user:signInFinished', path: prefix + 'sign-in-finished',
       component: () => import("./SignInFinished.vue"), meta: { signedIn: true } }),
 
-    route({ name: 'user:signUp', path: prefix + 'sign-up',
-      component: () => import("./SignUp.vue") }),
+    route({ name: 'user:signUpEmail', path: prefix + 'sign-up-email',
+      component: () => import("./SignUpEmail.vue"), meta: { signedOut: true } }),
     route({ name: 'user:signUpFinished', path: prefix + 'sign-up-finished',
       component: () => import("./SignUpFinished.vue"), meta: { signedIn: true } }),
 
     route({ name: 'user:signOut', path: prefix + 'sign-out',
       component: () => import("./SignOut.vue") }),
     route({ name: 'user:signOutFinished', path: prefix + 'sign-out-finished',
-      component: () => import("./SignOutFinished.vue") }),
+      component: () => import("./SignOutFinished.vue"), meta: { signedOut: true } }),
 
   ]
 }

package/front/src/utils/googleApi.js

@@ -0,0 +1,50 @@
+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 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/user-frontend",
-  "version": "0.8.13",
+  "version": "0.8.15",
   "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",
@@ -17,33 +17,34 @@
     "build:client": "cd front; vite build --ssrManifest --outDir dist/client",
     "build:server": "cd front; vite build --ssr src/entry-server.js --outDir dist/server",
     "generate": "vite build --ssrManifest --outDir dist/static && yarn build:server && node prerender",
-    "debug": "node --inspect-brk server"
+    "debug": "node --inspect-brk server",
+    "describe": "node server/start.js describe"
   },
   "type": "module",
   "dependencies": {
-    "@live-change/cli": "^0.8.13",
-    "@live-change/dao": "^0.8.13",
-    "@live-change/dao-vue3": "^0.8.13",
-    "@live-change/dao-websocket": "^0.8.13",
-    "@live-change/email-service": "^0.8.13",
-    "@live-change/framework": "^0.8.13",
-    "@live-change/identicon-service": "^0.8.13",
-    "@live-change/image-frontend": "^0.8.13",
-    "@live-change/message-authentication-service": "^0.8.13",
-    "@live-change/notification-service": "^0.8.13",
-    "@live-change/password-authentication-service": "^0.8.13",
-    "@live-change/pattern": "^0.8.13",
-    "@live-change/secret-code-service": "^0.8.13",
-    "@live-change/secret-link-service": "^0.8.13",
-    "@live-change/security-frontend": "^0.8.13",
-    "@live-change/security-service": "^0.8.13",
-    "@live-change/session-service": "^0.8.13",
-    "@live-change/timer-service": "^0.8.13",
-    "@live-change/upload-service": "^0.8.13",
-    "@live-change/user-identification-service": "^0.8.13",
-    "@live-change/user-service": "^0.8.13",
-    "@live-change/vue3-components": "^0.8.13",
-    "@live-change/vue3-ssr": "^0.8.13",
+    "@live-change/cli": "^0.8.15",
+    "@live-change/dao": "^0.8.15",
+    "@live-change/dao-vue3": "^0.8.15",
+    "@live-change/dao-websocket": "^0.8.15",
+    "@live-change/email-service": "^0.8.15",
+    "@live-change/framework": "^0.8.15",
+    "@live-change/identicon-service": "^0.8.15",
+    "@live-change/image-frontend": "^0.8.15",
+    "@live-change/message-authentication-service": "^0.8.15",
+    "@live-change/notification-service": "^0.8.15",
+    "@live-change/password-authentication-service": "^0.8.15",
+    "@live-change/pattern": "^0.8.15",
+    "@live-change/secret-code-service": "^0.8.15",
+    "@live-change/secret-link-service": "^0.8.15",
+    "@live-change/security-frontend": "^0.8.15",
+    "@live-change/security-service": "^0.8.15",
+    "@live-change/session-service": "^0.8.15",
+    "@live-change/timer-service": "^0.8.15",
+    "@live-change/upload-service": "^0.8.15",
+    "@live-change/user-identification-service": "^0.8.15",
+    "@live-change/user-service": "^0.8.15",
+    "@live-change/vue3-components": "^0.8.15",
+    "@live-change/vue3-ssr": "^0.8.15",
     "@vueuse/core": "^10.7.2",
     "codeceptjs-assert": "^0.0.5",
     "codeceptjs-video-helper": "0.1.3",
@@ -64,7 +65,7 @@
     "wtfnode": "^0.9.1"
   },
   "devDependencies": {
-    "@live-change/codeceptjs-helper": "^0.8.13",
+    "@live-change/codeceptjs-helper": "^0.8.15",
     "codeceptjs": "^3.5.12",
     "generate-password": "1.7.1",
     "playwright": "^1.41.2",
@@ -75,5 +76,5 @@
   "author": "",
   "license": "BSD-3-Clause",
   "description": "",
-  "gitHead": "4453aa639a9fe1a857d93d73ebd28a82c97fdd87"
+  "gitHead": "4897eefbf3ce9ace57630127da89503c71114563"
 }

package/server/app.config.js

@@ -2,6 +2,7 @@ import App from "@live-change/framework"
 const app = App.app()
 
 const contactTypes = ['email', 'phone']
+const remoteAccountTypes = ['google']
 
 import securityConfig from './security.config.js'
 
@@ -18,7 +19,8 @@ app.config = {
     },
     {
       name: 'user',
-      path: '@live-change/user-service'
+      path: '@live-change/user-service',
+      remoteAccountTypes
     },
     {
       name: 'email',
@@ -50,6 +52,10 @@ app.config = {
       contactTypes,
       signInWithoutPassword: true
     },
+    {
+      name: 'googleAuthentication',
+      path: '@live-change/google-authentication-service',
+    },
     {
       name: 'security',
       path: '@live-change/security-service',

package/server/services.list.js

@@ -13,6 +13,7 @@ import image from '@live-change/image-service'
 import secretCode from '@live-change/secret-code-service'
 import secretLink from '@live-change/secret-link-service'
 import messageAuthentication from '@live-change/message-authentication-service'
+import googleAuthentication from '@live-change/google-authentication-service'
 
 import backup from '@live-change/backup-service'
 import init from './init.js'
@@ -32,6 +33,7 @@ export {
   secretCode,
   secretLink,
   messageAuthentication,
+  googleAuthentication,
   localeSettings,
   backup,
   init

package/server/start.js

@@ -10,7 +10,7 @@ import { starter } from '@live-change/cli'
 
 starter(appConfig)
 
-/*
+//*
 import os from 'os'
 const formatMemoryUsage = (data) => `${Math.round(data / 1024 / 1024 * 100) / 100} MB`;
 const formatUptime = (data) => // dd:hh:mm:ss