@mcpher/gas-fakes 2.0.1 → 2.0.4

package/package.json

@@ -33,7 +33,7 @@
   },
   "name": "@mcpher/gas-fakes",
   "author": "bruce mcpherson",
-  "version": "2.0.1",
+  "version": "2.0.4",
   "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/cli/setup.js

@@ -153,7 +153,7 @@ export async function initializeConfiguration(options = {}) {
       name: "GOOGLE_CLOUD_PROJECT",
       message: "Enter your GCP Project ID",
       initial:
-        existingConfig.GCP_PROJECT_ID || process.env.GOOGLE_CLOUD_PROJECT,
+        existingConfig.GOOGLE_CLOUD_PROJECT || process.env.GOOGLE_CLOUD_PROJECT || existingConfig.GCP_PROJECT_ID,
     },
     {
       type: "text",

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

@@ -85,8 +85,22 @@ export const sxInit = async ({ manifestPath, claspPath, settingsPath, cachePath,
   // get the required scopes and set them
   const scopes = manifest.oauthScopes || []
 
+  // Force mandatory scopes for DWD if not already present
+  // These are required to get user identity information when using Domain-Wide Delegation
+  const mandatoryScopes = [
+    "openid",
+    "https://www.googleapis.com/auth/userinfo.email",
+    "https://www.googleapis.com/auth/cloud-platform"
+  ]
+
+  const scopeSet = new Set(scopes)
+  mandatoryScopes.forEach(scope => scopeSet.add(scope))
+  const finalScopes = Array.from(scopeSet)
+
+  syncLog(`...using scopes: ${finalScopes.join(', ')}`)
+
   // Initialize auth. 
-  const auth = await Auth.setAuth(scopes);
+  const auth = await Auth.setAuth(finalScopes);
 
   // static things we need to get into the main thread we can do now
   const projectId = Auth.getProjectId();
@@ -99,12 +113,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
   }