@mcpher/gas-fakes 2.0.0 → 2.0.2

package/package.json

@@ -33,7 +33,7 @@
   },
   "name": "@mcpher/gas-fakes",
   "author": "bruce mcpherson",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "license": "MIT",
   "main": "main.js",
   "description": "An implementation of the Google Workspace Apps Script runtime: Run native App Script Code on Node and Cloud Run",

package/src/services/scriptapp/app.js

@@ -133,7 +133,8 @@ if (typeof globalThis[name] === typeof undefined) {
           FULL: 'FULL'
         },
         __behavior: newFakeBehavior(),
-        __newCacheDropin: newCacheDropin
+        __newCacheDropin: newCacheDropin,
+        __proxies: Proxies
       }
 
 

package/src/support/auth.js

@@ -132,7 +132,9 @@ const setAuth = async (scopes = [], mcpLoading = false) => {
       mayLog(`...attempting to use service account: ${targetPrincipal}`)
 
       /// _sourceClient is the identity of the person/thing running the code
-      _sourceClient = await _auth.getClient()
+      // we'll try to get the openid and email scopes for the source client too if they are in the manifest
+      const sourceScopes = scopes.filter(s => s === 'openid' || s === 'https://www.googleapis.com/auth/userinfo.email')
+      _sourceClient = await _auth.getClient(sourceScopes.length > 0 ? { scopes: sourceScopes } : {})
 
       // now to get who the real user is
       const { tokenInfo: userInfo } = await getSourceAccessTokenInfo()

package/src/support/sxauth.js

@@ -99,12 +99,12 @@ export const sxInit = async ({ manifestPath, claspPath, settingsPath, cachePath,
   /// these all jst exist in this sub process so we need to send them back to parent process
   /// we'll send back the token, but it should be refreshed dynamically to handle expiry
   const activeUser = {
-    id: activeInfo.tokenInfo.sub,
+    id: activeInfo.tokenInfo.sub || activeInfo.tokenInfo.email || activeInfo.tokenInfo.user_id || 'unknown-active-user',
     email: activeInfo.tokenInfo.email,
     token: activeInfo.token
   }
   const effectiveUser = {
-    id: effectiveInfo.tokenInfo.sub,
+    id: effectiveInfo.tokenInfo.sub || effectiveInfo.tokenInfo.email || effectiveInfo.tokenInfo.user_id || 'unknown-effective-user',
     email: effectiveInfo.tokenInfo.email,
     token: effectiveInfo.token
   }

package/testlib.sh

@@ -1,2 +1,2 @@
-node ./gas-fakes.js -l bmFiddler@13EWG4-lPrEf34itxQhAQ7b9JEbmCBfO8uE4Mhr99CHi3Pw65oxXtq-rU \
+gas-fakes -l bmFiddler@13EWG4-lPrEf34itxQhAQ7b9JEbmCBfO8uE4Mhr99CHi3Pw65oxXtq-rU \
 -s "const sheet=SpreadsheetApp.openById('1h9IGIShgVBVUrUjjawk5MaCEQte_7t32XeEP1Z5jXKQ').getSheets()[0];const fiddler = new bmFiddler.Fiddler(sheet);console.log (fiddler.getData().slice(0, 5));"