@commandable/integration-data 0.0.1 → 0.0.4

package/integrations/google-calendar/__tests__/get_handlers.test.ts

@@ -2,11 +2,9 @@ import { beforeAll, describe, expect, it } from 'vitest'
 import { IntegrationProxy } from '../../../../server/src/integrations/proxy.js'
 import { loadIntegrationTools } from '../../../../server/src/integrations/dataLoader.js'
 
-// LIVE Google Calendar read tests using managed OAuth
+// LIVE Google Calendar read tests using credentials
 // Required env vars:
-// - COMMANDABLE_MANAGED_OAUTH_BASE_URL
-// - COMMANDABLE_MANAGED_OAUTH_SECRET_KEY
-// - GCAL_TEST_CONNECTION_ID (managed OAuth connection for provider 'google-calendar')
+// - Either GOOGLE_TOKEN, OR (GOOGLE_SERVICE_ACCOUNT_JSON + GOOGLE_IMPERSONATE_SUBJECT)
 
 interface Ctx {
   calendarId?: string
@@ -16,10 +14,9 @@ interface Ctx {
 const env = process.env as Record<string, string>
 const hasEnv = (...keys: string[]) => keys.every(k => !!env[k] && env[k].trim().length > 0)
 const suite = hasEnv(
-  'COMMANDABLE_MANAGED_OAUTH_BASE_URL',
-  'COMMANDABLE_MANAGED_OAUTH_SECRET_KEY',
-  'GCAL_TEST_CONNECTION_ID',
+  'GOOGLE_TOKEN',
 )
+  || hasEnv('GOOGLE_SERVICE_ACCOUNT_JSON', 'GOOGLE_IMPERSONATE_SUBJECT')
   ? describe
   : describe.skip
 
@@ -28,13 +25,24 @@ suite('google-calendar read handlers (live)', () => {
   let buildHandler: (name: string) => ((input: any) => Promise<any>)
 
   beforeAll(async () => {
-    const { COMMANDABLE_MANAGED_OAUTH_BASE_URL, COMMANDABLE_MANAGED_OAUTH_SECRET_KEY, GCAL_TEST_CONNECTION_ID } = env
+    const credentialStore = {
+      getCredentials: async () => ({
+        token: env.GOOGLE_TOKEN || '',
+        serviceAccountJson: env.GOOGLE_SERVICE_ACCOUNT_JSON || '',
+        subject: env.GOOGLE_IMPERSONATE_SUBJECT || '',
+      }),
+    }
 
-    const proxy = new IntegrationProxy({
-      managedOAuthBaseUrl: COMMANDABLE_MANAGED_OAUTH_BASE_URL,
-      managedOAuthSecretKey: COMMANDABLE_MANAGED_OAUTH_SECRET_KEY,
-    })
-    const integrationNode = { id: 'node-gcal', type: 'google-calendar', label: 'Google Calendar', connectionId: GCAL_TEST_CONNECTION_ID } as any
+    const proxy = new IntegrationProxy({ credentialStore })
+    const integrationNode = {
+      spaceId: 'ci',
+      id: 'node-gcal',
+      referenceId: 'node-gcal',
+      type: 'google-calendar',
+      label: 'Google Calendar',
+      connectionMethod: 'credentials',
+      credentialId: 'google-calendar-creds',
+    } as any
 
     const tools = loadIntegrationTools('google-calendar')
     expect(tools).toBeTruthy()

package/integrations/google-calendar/__tests__/usage_parity.test.ts

@@ -1,34 +1,9 @@
-import { existsSync, readdirSync, readFileSync } from 'node:fs'
-import { resolve } from 'node:path'
-import { fileURLToPath } from 'node:url'
 import { describe, expect, it } from 'vitest'
-import { loadIntegrationManifest } from '../../../src/integrations/dataLoader.js'
-
-function escapeRegExp(str: string): string {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-}
+import { getMissingToolUsages } from '../../__tests__/usageParity.js'
 
 describe('google-calendar static usage parity', () => {
-  it('every manifest tool is referenced in tests via build*(name)', () => {
-    const manifest = loadIntegrationManifest('google-calendar')!
-    const toolNames = (manifest.tools as any[]).map(t => t.name)
-
-    const testsDir = fileURLToPath(new URL('.', import.meta.url))
-    expect(existsSync(testsDir)).toBe(true)
-    const testFiles = readdirSync(testsDir)
-      .filter(f => /\.test\.(t|j)s$/.test(f) && !f.includes('usage_parity.test'))
-      .map(f => resolve(testsDir, f))
-
-    const fileContents = testFiles.map(f => readFileSync(f, 'utf8'))
-
-    const missing: string[] = []
-    for (const name of toolNames) {
-      const nameRe = new RegExp(`build(?:Read|Write|Admin|Handler)\\(\\s*['\"\`]${escapeRegExp(name)}['\"\`]\\s*\\)`, 'm')
-      const found = fileContents.some(src => nameRe.test(src))
-      if (!found)
-        missing.push(name)
-    }
-
+  it('every manifest tool is referenced in tests', () => {
+    const missing = getMissingToolUsages({ integrationName: 'google-calendar', importMetaUrl: import.meta.url })
     expect(missing, `Missing handler usages in tests: ${missing.join(', ')}`).toEqual([])
   })
 })

package/integrations/google-calendar/__tests__/write_and_admin_handlers.test.ts

@@ -1,12 +1,10 @@
 import { beforeAll, describe, expect, it } from 'vitest'
-import { IntegrationProxy } from '../../../src/integrations/proxy.js'
-import { loadIntegrationTools } from '../../../src/integrations/dataLoader.js'
+import { IntegrationProxy } from '../../../../server/src/integrations/proxy.js'
+import { loadIntegrationTools } from '../../../../server/src/integrations/dataLoader.js'
 
-// LIVE Google Calendar write/admin tests using managed OAuth
+// LIVE Google Calendar write/admin tests using credentials
 // Required env vars:
-// - COMMANDABLE_MANAGED_OAUTH_BASE_URL
-// - COMMANDABLE_MANAGED_OAUTH_SECRET_KEY
-// - GCAL_TEST_CONNECTION_ID (managed OAuth connection for provider 'google-calendar')
+// - Either GOOGLE_TOKEN, OR (GOOGLE_SERVICE_ACCOUNT_JSON + GOOGLE_IMPERSONATE_SUBJECT)
 // Optional:
 // - GCAL_TEST_CALENDAR_ID (defaults to 'primary')
 
@@ -18,11 +16,7 @@ interface Ctx {
 
 const env = process.env as Record<string, string>
 const hasEnv = (...keys: string[]) => keys.every(k => !!env[k] && env[k].trim().length > 0)
-const suite = hasEnv(
-  'COMMANDABLE_MANAGED_OAUTH_BASE_URL',
-  'COMMANDABLE_MANAGED_OAUTH_SECRET_KEY',
-  'GCAL_TEST_CONNECTION_ID',
-)
+const suite = hasEnv('GOOGLE_TOKEN') || hasEnv('GOOGLE_SERVICE_ACCOUNT_JSON', 'GOOGLE_IMPERSONATE_SUBJECT')
   ? describe
   : describe.skip
 
@@ -33,15 +27,28 @@ suite('google-calendar write & admin handlers (live)', () => {
   let buildAdmin: (name: string) => ((input: any) => Promise<any>)
 
   beforeAll(async () => {
-    const { COMMANDABLE_MANAGED_OAUTH_BASE_URL, COMMANDABLE_MANAGED_OAUTH_SECRET_KEY, GCAL_TEST_CONNECTION_ID, GCAL_TEST_CALENDAR_ID } = env
+    const { GCAL_TEST_CALENDAR_ID } = env
 
     ctx.calendarId = GCAL_TEST_CALENDAR_ID || 'primary'
 
-    const proxy = new IntegrationProxy({
-      managedOAuthBaseUrl: COMMANDABLE_MANAGED_OAUTH_BASE_URL,
-      managedOAuthSecretKey: COMMANDABLE_MANAGED_OAUTH_SECRET_KEY,
-    })
-    const integrationNode = { id: 'node-gcal', type: 'google-calendar', label: 'Google Calendar', connectionId: GCAL_TEST_CONNECTION_ID } as any
+    const credentialStore = {
+      getCredentials: async () => ({
+        token: env.GOOGLE_TOKEN || '',
+        serviceAccountJson: env.GOOGLE_SERVICE_ACCOUNT_JSON || '',
+        subject: env.GOOGLE_IMPERSONATE_SUBJECT || '',
+      }),
+    }
+
+    const proxy = new IntegrationProxy({ credentialStore })
+    const integrationNode = {
+      spaceId: 'ci',
+      id: 'node-gcal',
+      referenceId: 'node-gcal',
+      type: 'google-calendar',
+      label: 'Google Calendar',
+      connectionMethod: 'credentials',
+      credentialId: 'google-calendar-creds',
+    } as any
 
     const tools = loadIntegrationTools('google-calendar')
     expect(tools).toBeTruthy()

package/integrations/google-calendar/credentials.json

@@ -1,36 +1,57 @@
 {
-  "schema": {
-    "type": "object",
-    "properties": {
-      "token": {
-        "type": "string",
-        "title": "OAuth Access Token (optional)",
-        "description": "Google OAuth access token to use as a Bearer token (typically short-lived)."
+  "variants": {
+    "service_account": {
+      "label": "Service Account (recommended)",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "serviceAccountJson": {
+            "type": "string",
+            "title": "Service Account JSON",
+            "description": "Full service account key JSON (contents of the downloaded JSON file from Google Cloud)."
+          },
+          "subject": {
+            "type": "string",
+            "title": "Subject / impersonated user (optional)",
+            "description": "User email to impersonate via Google Workspace domain-wide delegation. Required for most Calendar operations."
+          },
+          "scopes": {
+            "type": "array",
+            "title": "OAuth scopes (optional)",
+            "description": "Optional override for OAuth scopes. Defaults to calendar.",
+            "items": { "type": "string" }
+          }
+        },
+        "required": ["serviceAccountJson"],
+        "additionalProperties": false
       },
-      "serviceAccountJson": {
-        "type": "string",
-        "title": "Service Account JSON (recommended)",
-        "description": "Full service account key JSON (contents of the downloaded JSON file)."
+      "injection": {
+        "headers": {
+          "Authorization": "Bearer {{token}}"
+        }
       },
-      "subject": {
-        "type": "string",
-        "title": "Subject / impersonated user (optional)",
-        "description": "Optional user email to impersonate when using Google Workspace domain-wide delegation."
+      "preprocess": "google_service_account"
+    },
+    "oauth_token": {
+      "label": "OAuth Access Token (short-lived)",
+      "schema": {
+        "type": "object",
+        "properties": {
+          "token": {
+            "type": "string",
+            "title": "OAuth Access Token",
+            "description": "Short-lived Google OAuth access token with calendar scope."
+          }
+        },
+        "required": ["token"],
+        "additionalProperties": false
       },
-      "scopes": {
-        "type": "array",
-        "title": "OAuth scopes (optional)",
-        "description": "Optional override for OAuth scopes.",
-        "items": { "type": "string" }
+      "injection": {
+        "headers": {
+          "Authorization": "Bearer {{token}}"
+        }
       }
-    },
-    "required": [],
-    "additionalProperties": false
-  },
-  "injection": {
-    "headers": {
-      "Authorization": "Bearer {{token}}"
     }
-  }
+  },
+  "default": "service_account"
 }
-

package/integrations/google-calendar/credentials_hint_oauth_token.md

@@ -0,0 +1,8 @@
+Obtain a short-lived Google OAuth access token:
+
+1. Use the Google OAuth 2.0 Playground (`https://developers.google.com/oauthplayground/`) or your own OAuth flow
+2. Select the scope: `https://www.googleapis.com/auth/calendar`
+3. Exchange the authorization code for an access token
+4. Paste the access token here
+
+Note: OAuth access tokens are short-lived (typically 1 hour). For long-running use, prefer the Service Account variant.

package/integrations/google-calendar/credentials_hint_service_account.md

@@ -0,0 +1,10 @@
+Set up a Google Cloud Service Account:
+
+1. Open the [Google Cloud Console](https://console.cloud.google.com/)
+2. Enable the **Google Calendar API** for your project
+3. Go to **IAM & Admin → Service Accounts** and create a new service account
+4. Under **Keys**, click **Add Key → Create new key → JSON** and download the file
+5. Paste the full contents of the JSON file here
+
+For Google Workspace users: Calendar access typically requires domain-wide delegation.
+Configure it in the Google Admin console, then set `subject` to the calendar owner's email.

package/integrations/google-docs/__tests__/get_handlers.test.ts

@@ -1,72 +1,98 @@
-import { beforeAll, describe, expect, it } from 'vitest'
-import { IntegrationProxy } from '../../../src/integrations/proxy.js'
-import { loadIntegrationTools } from '../../../src/integrations/dataLoader.js'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
+import { createCredentialStore, createIntegrationNode, createProxy, createToolbox, hasEnv, safeCleanup } from '../../__tests__/liveHarness.js'
 
-// LIVE Google Docs read tests using managed OAuth
-// Required env vars:
-// - COMMANDABLE_MANAGED_OAUTH_BASE_URL
-// - COMMANDABLE_MANAGED_OAUTH_SECRET_KEY
-// - GDOCS_TEST_CONNECTION_ID (managed OAuth connection for provider 'google-docs')
-// - GDOCS_TEST_DOCUMENT_ID (an accessible document ID)
+// LIVE Google Docs read tests -- runs once per available credential variant.
+// Required env vars (at least one):
+// - GOOGLE_SERVICE_ACCOUNT_JSON  (service_account variant)
+// - GOOGLE_TOKEN                 (oauth_token variant)
 
-const env = process.env as Record<string, string>
-const hasEnv = (...keys: string[]) => keys.every(k => !!env[k] && env[k].trim().length > 0)
-const suite = hasEnv(
-  'COMMANDABLE_MANAGED_OAUTH_BASE_URL',
-  'COMMANDABLE_MANAGED_OAUTH_SECRET_KEY',
-  'GDOCS_TEST_CONNECTION_ID',
-)
-  ? describe
-  : describe.skip
+const env = process.env as Record<string, string | undefined>
 
-suite('google-docs read handlers (live)', () => {
-  let buildReadHandler: (name: string) => ((input: any) => Promise<any>)
+interface VariantConfig {
+  key: string
+  credentials: () => Record<string, string>
+}
 
-  beforeAll(async () => {
-    const { COMMANDABLE_MANAGED_OAUTH_BASE_URL, COMMANDABLE_MANAGED_OAUTH_SECRET_KEY, GDOCS_TEST_CONNECTION_ID } = env
+const variants: VariantConfig[] = [
+  {
+    key: 'service_account',
+    credentials: () => ({ serviceAccountJson: env.GOOGLE_SERVICE_ACCOUNT_JSON || '' }),
+  },
+  {
+    key: 'oauth_token',
+    credentials: () => ({ token: env.GOOGLE_TOKEN || '' }),
+  },
+].filter(v => Object.values(v.credentials()).some(val => val.trim().length > 0))
 
-    const proxy = new IntegrationProxy({
-      managedOAuthBaseUrl: COMMANDABLE_MANAGED_OAUTH_BASE_URL,
-      managedOAuthSecretKey: COMMANDABLE_MANAGED_OAUTH_SECRET_KEY,
-    })
-    const integrationNode = { id: 'node-gdocs', type: 'google-docs', label: 'Google Docs', connectionId: GDOCS_TEST_CONNECTION_ID } as any
+const suiteOrSkip = variants.length > 0 ? describe : describe.skip
+
+suiteOrSkip('google-docs read handlers (live)', () => {
+  for (const variant of variants) {
+    describe(`variant: ${variant.key}`, () => {
+      let docs: ReturnType<typeof createToolbox>
+      let drive: ReturnType<typeof createToolbox>
+      let folderId: string | undefined
+      let documentId: string | undefined
+
+      beforeAll(async () => {
+        const credentialStore = createCredentialStore(async () => variant.credentials())
+        const proxy = createProxy(credentialStore)
+        docs = createToolbox(
+          'google-docs',
+          proxy,
+          createIntegrationNode('google-docs', { label: 'Google Docs', credentialId: 'google-docs-creds', credentialVariant: variant.key }),
+          variant.key,
+        )
+        drive = createToolbox(
+          'google-drive',
+          proxy,
+          createIntegrationNode('google-drive', { label: 'Google Drive', credentialId: 'google-drive-creds', credentialVariant: variant.key }),
+          variant.key,
+        )
 
-    const tools = loadIntegrationTools('google-docs')
-    expect(tools).toBeTruthy()
+        const folder = await drive.write('create_folder')({ name: `CmdTest Docs ${Date.now()}` })
+        folderId = folder?.id
+        expect(folderId).toBeTruthy()
 
-    buildReadHandler = (name: string) => {
-      const tool = tools!.read.find(t => t.name === name)
-      expect(tool, `read tool ${name} exists`).toBeTruthy()
-      const integration = { fetch: (path: string, init?: RequestInit) => proxy.call(integrationNode, path, init) }
-      const build = new Function('integration', `return (${tool!.handlerCode});`)
-      return build(integration) as (input: any) => Promise<any>
-    }
-  }, 60000)
+        const created = await drive.write('create_file')({
+          name: `CmdTest Doc ${Date.now()}`,
+          mimeType: 'application/vnd.google-apps.document',
+          parentId: folderId,
+        })
+        documentId = created?.id
+        expect(documentId).toBeTruthy()
+      }, 60000)
 
-  it('get_document returns metadata/content', async () => {
-    const documentId = env.GDOCS_TEST_DOCUMENT_ID
-    if (!documentId)
-      return expect(true).toBe(true)
-    const handler = buildReadHandler('get_document')
-    const result = await handler({ documentId })
-    expect(result?.documentId || result?.body?.content || result?.title).toBeTruthy()
-  }, 30000)
+      afterAll(async () => {
+        if (!folderId)
+          return
+        await safeCleanup(async () => documentId ? drive.write('delete_file')({ fileId: documentId }) : Promise.resolve())
+        await safeCleanup(async () => drive.write('delete_file')({ fileId: folderId }))
+      }, 60000)
 
-  it('get_document_text returns plain text', async () => {
-    const documentId = env.GDOCS_TEST_DOCUMENT_ID
-    if (!documentId)
-      return expect(true).toBe(true)
-    const handler = buildReadHandler('get_document_text')
-    const result = await handler({ documentId })
-    expect(typeof result?.text === 'string').toBe(true)
-  }, 30000)
+      it('get_document returns metadata/content', async () => {
+        if (!documentId)
+          return expect(true).toBe(true)
+        const handler = docs.read('get_document')
+        const result = await handler({ documentId })
+        expect(result?.documentId || result?.body?.content || result?.title).toBeTruthy()
+      }, 30000)
 
-  it('get_document_structured returns body JSON', async () => {
-    const documentId = env.GDOCS_TEST_DOCUMENT_ID
-    if (!documentId)
-      return expect(true).toBe(true)
-    const handler = buildReadHandler('get_document_structured')
-    const result = await handler({ documentId })
-    expect(result?.body || result?.documentId).toBeTruthy()
-  }, 30000)
+      it('get_document_text returns plain text', async () => {
+        if (!documentId)
+          return expect(true).toBe(true)
+        const handler = docs.read('get_document_text')
+        const result = await handler({ documentId })
+        expect(typeof result?.text === 'string').toBe(true)
+      }, 30000)
+
+      it('get_document_structured returns body JSON', async () => {
+        if (!documentId)
+          return expect(true).toBe(true)
+        const handler = docs.read('get_document_structured')
+        const result = await handler({ documentId })
+        expect(result?.body || result?.documentId).toBeTruthy()
+      }, 30000)
+    })
+  }
 })

package/integrations/google-docs/__tests__/usage_parity.test.ts

@@ -1,34 +1,9 @@
-import { existsSync, readdirSync, readFileSync } from 'node:fs'
-import { resolve } from 'node:path'
-import { fileURLToPath } from 'node:url'
 import { describe, expect, it } from 'vitest'
-import { loadIntegrationManifest } from '../../../src/integrations/dataLoader.js'
-
-function escapeRegExp(str: string): string {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-}
+import { getMissingToolUsages } from '../../__tests__/usageParity.js'
 
 describe('google-docs static usage parity', () => {
-  it('every manifest tool is referenced in tests via build*(name)', () => {
-    const manifest = loadIntegrationManifest('google-docs')!
-    const toolNames = (manifest.tools as any[]).map(t => t.name)
-
-    const testsDir = fileURLToPath(new URL('.', import.meta.url))
-    expect(existsSync(testsDir)).toBe(true)
-    const testFiles = readdirSync(testsDir)
-      .filter(f => /\.test\.(t|j)s$/.test(f) && !f.includes('usage_parity.test'))
-      .map(f => resolve(testsDir, f))
-
-    const fileContents = testFiles.map(f => readFileSync(f, 'utf8'))
-
-    const missing: string[] = []
-    for (const name of toolNames) {
-      const nameRe = new RegExp(`build(?:Read|Write|Admin)?(?:Handler)?\\(\\s*['\"\`]${escapeRegExp(name)}['\"\`]\\s*\\)`, 'm')
-      const found = fileContents.some(src => nameRe.test(src))
-      if (!found)
-        missing.push(name)
-    }
-
+  it('every manifest tool is referenced in tests', () => {
+    const missing = getMissingToolUsages({ integrationName: 'google-docs', importMetaUrl: import.meta.url })
     expect(missing, `Missing handler usages in tests: ${missing.join(', ')}`).toEqual([])
   })
 })