@live-change/google-authentication-service 0.8.34 → 0.8.35

package/googleClient.js

@@ -33,7 +33,8 @@ export async function getTokensWithCode(code, redirectUri) {
     const response = await axios(options)
     return response.data
   } catch(error) {
-    console.error("OAUTH ERROR", 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
   }
 }

package/offlineAccess.js

@@ -2,22 +2,33 @@ import App from '@live-change/framework'
 const app = App.app()
 import definition from './definition.js'
 import Debug from 'debug'
+import { getTokensWithCode, getUserInfo } from './googleClient.js'
 const debug = Debug('services:googleAuthentication')
 
 export const OfflineAccess = definition.model({
   name: "OfflineAccess",
-  userItem: {
+  userProperty: {
     userReadAccess: () => true
   },
   properties: {
-    scope: {
-      type: String,
+    scopes: {
+      type: Array,
+      of: {
+        type: String,
+        validation: ['nonEmpty']
+      },
       validation: ['nonEmpty']
     },
     refreshToken: {
       type: String,
       validation: ['nonEmpty']
     },
+    accessToken: {
+      type: String
+    },
+    accessTokenExpire: {
+      type: Date
+    },
     lastUse: {
       type: Date
     },
@@ -85,3 +96,38 @@ definition.event({
   }
 })
 
+definition.action({
+  name: 'addOfflineAccessToken',
+  properties: {
+    code: {
+      type: String,
+      validation: ['nonEmpty']
+    },
+    redirectUri: {
+      type: String,
+      validation: ['nonEmpty']
+    },
+    scope: {
+      type: String,
+      validation: ['nonEmpty']
+    }
+  },
+  async execute({ code, redirectUri, scope }, { client, service }, emit) {
+    const user = client.user
+    if(!user) throw 'notAuthorized'
+    const tokens = await getTokensWithCode(code, redirectUri)
+    console.log("TOKENS", tokens)
+    const scopes = tokens.scope.split(' ')
+    if(tokens.token_type !== 'Bearer') throw new Error("Invalid token type "+tokens.token_type)
+    await service.triggerService({ type: 'googleAuthentication_setUserOwnedOfflineAccess', service: definition.name }, {
+      user, scopes,
+      accessToken: tokens.access_token,
+      accessTokenExpire: tokens.expires_in ? new Date(Date.now() + tokens.expires_in * 1000) : null,
+      refreshToken: tokens.refresh_token,
+    })
+
+    return {
+      action: 'addOfflineAccessToken'
+    }
+  }
+})

package/package.json

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