@live-change/google-authentication-service 0.9.10 → 0.9.11

package/account.js

@@ -76,7 +76,7 @@ definition.event({
       validation: ['nonEmpty']
     }
   },
-  async execute({ account }) {
+  async execute({ account, user }) {
     await Account.delete(account)
   }
 })

package/connect.js

@@ -9,6 +9,7 @@ import { User, googleProperties, Account } from './account.js'
 import { getTokensWithCode, getUserInfo } from './googleClient.js'
 
 import { downloadData } from './downloadData.js'
+import { OfflineAccess } from './offlineAccess.js'
 
 definition.trigger({
   name: "connectGoogle",
@@ -68,10 +69,23 @@ definition.trigger({
       validation: ['nonEmpty']
     }
   },
-  async execute({ account }, { client, service }, emit) {
+  async execute({ account }, { client, service, triggerService }, emit) {
     const accountData = await Account.get(account)
     if(!accountData) throw 'notFound'
     const { user } = accountData
+
+    console.log("GET OFFLINE ACCESS!", account, user)
+    const offlineAccess = await OfflineAccess.indexObjectGet('byUserAccount', [user, account])
+    console.log("OFFLINE ACCESS", offlineAccess)
+    if(offlineAccess) {
+      await triggerService({
+        type: 'googleAuthentication_resetOfflineAccess',
+        service: definition.name
+      }, {
+        offlineAccess: offlineAccess.to ?? offlineAccess.id
+      })
+    }
+
     emit({
       type: 'accountDisconnected',
       account, user

package/googleClient.js

@@ -35,7 +35,9 @@ export async function getTokensWithCode(code, redirectUri) {
   } catch(error) {
     console.error("OAUTH ERROR", error?.stack || error?.message || JSON.stringify(error))
     console.error("OAUTH ERROR RESPONSE", error?.response?.data)
-    throw error?.response?.data  ? new Error(error?.response?.data) : error
+    throw error?.response?.data
+      ? new Error(error?.response?.data?.error || error?.response?.data)
+      : new Error(error.message || error.toString())
   }
 }
 

package/index.js

@@ -6,7 +6,6 @@ import "./account.js"
 import "./connect.js"
 import "./sign.js"
 import "./offlineAccess.js"
-
-
+import "./userDeleted.js"
 
 export default definition

package/offlineAccess.js

@@ -3,6 +3,7 @@ const app = App.app()
 import definition from './definition.js'
 import Debug from 'debug'
 import { getTokensWithCode, getUserInfo } from './googleClient.js'
+import { Account } from './account.js'
 const debug = Debug('services:googleAuthentication')
 
 export const OfflineAccess = definition.model({
@@ -34,12 +35,22 @@ export const OfflineAccess = definition.model({
     },
     lastRefresh: {
       type: Date
+    },
+    account: {
+      type: String,
+      validation: ['nonEmpty']
     }
   },
   indexes: {
     byUserAndScope: {
       multi: true,
       property: ['user', 'scopes']
+    },
+    byUser: {
+      property: 'user'
+    },
+    byUserAccount: {
+      property: ['user', 'account']
     }
   }
 })
@@ -130,29 +141,47 @@ definition.action({
     if(!user) throw 'notAuthorized'
     const tokens = await getTokensWithCode(code, redirectUri)
     console.log("TOKENS", tokens)
+    if(!tokens.refresh_token) throw new Error("No refresh token")
     const scopes = tokens.scope.split(' ')
     if(tokens.token_type !== 'Bearer') throw new Error("Invalid token type "+tokens.token_type)
+    const googleUser = await getUserInfo(tokens.access_token)
+    console.log("GOOGLE USER", googleUser)
+    const account = googleUser.sub
+    const accountData = await Account.get(account)
+    console.log("ACCOUNT DATA", accountData, 'CURRENT USER', user)
+    if(accountData) {
+      if(accountData.user !== user) throw 'connectedToAnotherUser'
+    } else {
+      await service.trigger({ type: 'connectGoogle' }, {
+        user, account, data: googleUser,
+      })
+      console.log("CONNECTED")
+    }
     await OfflineAccess.update(user, {
       id: user,
       user,
       scopes,
+      account,
       refreshToken: tokens.refresh_token,
       accessToken: tokens.access_token,
       accessTokenExpire: tokens.expires_in ? new Date(Date.now() + tokens.expires_in * 1000) : null,
       lastRefresh: new Date()
     })
+    console.log("OFFLINE ACCESS SAVED")
     await service.triggerService({ type: 'googleAuthentication_setOfflineAccess', service: definition.name }, {
-      user, scopes,
+      user, scopes, account,
       accessToken: tokens.access_token,
       accessTokenExpire: tokens.expires_in ? new Date(Date.now() + tokens.expires_in * 1000) : null,
       refreshToken: tokens.refresh_token,
     })
+    console.log("TRIGGER other services")
     await service.trigger({ type: 'googleOfflineAccessGained' }, {
       user, scopes,
       accessToken: tokens.access_token,
       accessTokenExpire: tokens.expires_in ? new Date(Date.now() + tokens.expires_in * 1000) : null,
       refreshToken: tokens.refresh_token,
     })
+    console.log("TRIGGER FINISHED")
     return {
       action: 'addOfflineAccessToken'
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/google-authentication-service",
-  "version": "0.9.10",
+  "version": "0.9.11",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,10 +21,10 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.9.10",
-    "@live-change/relations-plugin": "^0.9.10",
+    "@live-change/framework": "^0.9.11",
+    "@live-change/relations-plugin": "^0.9.11",
     "google-auth-library": "9.0.0"
   },
-  "gitHead": "d41e404c1933e9ed6e3927d85a5dadf66da0f951",
+  "gitHead": "a1bd367ae175f0937d999577f1b10bf10e7df0fb",
   "type": "module"
 }

package/userDeleted.js

@@ -0,0 +1,36 @@
+import definition from './definition.js'
+import { Account, User } from './account.js'
+import { OfflineAccess } from './offlineAccess.js'
+
+definition.event({
+  name: "userDeleted",
+  properties: {
+    user: {
+      type: User,
+      validation: ['nonEmpty']
+    }
+  },
+  async execute({ user }) {
+    const accounts = await Account.indexRangeGet('byUser', user)
+    const offlineAccesses = await OfflineAccess.indexRangeGet('byUser', user)
+    await Promise.all([
+      Promise.all(accounts.map(account => Account.delete(account.to ?? account.id))),
+      Promise.all(offlineAccesses.map(offlineAccess => OfflineAccess.delete(offlineAccess.to ?? offlineAccess.id)))
+    ])
+  }
+})
+
+definition.trigger({
+  name: 'userDeleted',
+  properties: {
+    user: {
+      type: User
+    }
+  },
+  async execute({ user }, { service }, emit) {
+    emit([{
+      type: "userDeleted",
+      user
+    }])
+  }
+})