@vellumai/assistant 0.5.11 → 0.5.13

package/src/cli/commands/oauth/__tests__/connect.test.ts

@@ -27,10 +27,6 @@ let mockOrchestrateOAuthConnect: (
   grantedScopes: [],
 });
 
-let mockGetProviderBehavior: (
-  key: string,
-) => Record<string, unknown> | undefined = () => undefined;
-
 let mockGetSecureKeyViaDaemon: (
   account: string,
 ) => Promise<string | undefined> = async () => undefined;
@@ -80,20 +76,6 @@ mock.module("../../../../oauth/oauth-store.js", () => ({
   deleteConnection: () => false,
 }));
 
-mock.module("../../../../oauth/provider-behaviors.js", () => ({
-  resolveService: (service: string) => {
-    const aliases: Record<string, string> = {
-      gmail: "integration:google",
-      google: "integration:google",
-      slack: "integration:slack",
-    };
-    if (aliases[service]) return aliases[service];
-    if (!service.includes(":")) return `integration:${service}`;
-    return service;
-  },
-  getProviderBehavior: (key: string) => mockGetProviderBehavior(key),
-}));
-
 mock.module("../../../../oauth/connect-orchestrator.js", () => ({
   orchestrateOAuthConnect: (opts: Record<string, unknown>) =>
     mockOrchestrateOAuthConnect(opts),
@@ -134,16 +116,6 @@ mock.module("../../../lib/daemon-credential-client.js", () => ({
 
 // Mock shared.js helpers to control managed vs BYO mode routing
 mock.module("../shared.js", () => ({
-  resolveService: (service: string) => {
-    const aliases: Record<string, string> = {
-      gmail: "integration:google",
-      google: "integration:google",
-      slack: "integration:slack",
-    };
-    if (aliases[service]) return aliases[service];
-    if (!service.includes(":")) return `integration:${service}`;
-    return service;
-  },
   isManagedMode: (key: string) => mockIsManagedMode(key),
   requirePlatformClient: async (_cmd: Command) => {
     if (
@@ -193,10 +165,6 @@ mock.module("../shared.js", () => ({
     if (!result.ok) return null;
     return result.body as Array<Record<string, unknown>>;
   },
-  toBareProvider: (provider: string): string =>
-    provider.startsWith("integration:")
-      ? provider.slice("integration:".length)
-      : provider,
 }));
 
 // ---------------------------------------------------------------------------
@@ -262,7 +230,6 @@ describe("assistant oauth connect", () => {
       deferred: false,
       grantedScopes: [],
     });
-    mockGetProviderBehavior = () => undefined;
     mockGetSecureKeyViaDaemon = async () => undefined;
     mockOpenInBrowserCalls = [];
     mockPlatformClientResult = null;
@@ -291,50 +258,13 @@ describe("assistant oauth connect", () => {
     expect(parsed.error).toContain("providers list");
   });
 
-  // -------------------------------------------------------------------------
-  // Provider alias resolution
-  // -------------------------------------------------------------------------
-
-  test("provider alias 'gmail' resolves to integration:google", async () => {
-    let capturedProviderKey: string | undefined;
-
-    mockGetProvider = (key: string) => {
-      capturedProviderKey = key;
-      return {
-        providerKey: key,
-        authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
-        tokenUrl: "https://oauth2.googleapis.com/token",
-        managedServiceConfigKey: null,
-      };
-    };
-
-    mockGetMostRecentAppByProvider = () => ({
-      id: "app-1",
-      clientId: "test-id",
-      clientSecretCredentialPath: "oauth_app/app-1/client_secret",
-      providerKey: "integration:google",
-      createdAt: 0,
-      updatedAt: 0,
-    });
-
-    mockOrchestrateOAuthConnect = async () => ({
-      success: true,
-      deferred: false,
-      grantedScopes: ["read"],
-      accountInfo: "user@example.com",
-    });
-
-    await runCommand(["connect", "gmail", "--json"]);
-    expect(capturedProviderKey).toBe("integration:google");
-  });
-
   // -------------------------------------------------------------------------
   // Managed mode: prints connect URL without --open-browser
   // -------------------------------------------------------------------------
 
   test("managed mode: prints connect URL without --open-browser", async () => {
     mockGetProvider = () => ({
-      providerKey: "integration:google",
+      providerKey: "google",
       authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
       tokenUrl: "https://oauth2.googleapis.com/token",
       managedServiceConfigKey: "google-oauth",
@@ -361,7 +291,7 @@ describe("assistant oauth connect", () => {
     expect(parsed.connectUrl).toBe(
       "https://platform.example.com/oauth/connect",
     );
-    expect(parsed.provider).toBe("integration:google");
+    expect(parsed.provider).toBe("google");
   });
 
   // -------------------------------------------------------------------------
@@ -370,7 +300,7 @@ describe("assistant oauth connect", () => {
 
   test("managed mode with --open-browser: opens browser and polls for new connection", async () => {
     mockGetProvider = () => ({
-      providerKey: "integration:google",
+      providerKey: "google",
       authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
       tokenUrl: "https://oauth2.googleapis.com/token",
       managedServiceConfigKey: "google-oauth",
@@ -427,7 +357,7 @@ describe("assistant oauth connect", () => {
 
   test("BYO mode: prints auth URL without --open-browser", async () => {
     mockGetProvider = () => ({
-      providerKey: "integration:google",
+      providerKey: "google",
       authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
       tokenUrl: "https://oauth2.googleapis.com/token",
       managedServiceConfigKey: null,
@@ -438,7 +368,7 @@ describe("assistant oauth connect", () => {
       id: "app-1",
       clientId: "byo-client-id",
       clientSecretCredentialPath: "oauth_app/app-1/client_secret",
-      providerKey: "integration:google",
+      providerKey: "google",
       createdAt: 0,
       updatedAt: 0,
     });
@@ -448,12 +378,12 @@ describe("assistant oauth connect", () => {
       deferred: true,
       authUrl: "https://accounts.google.com/o/oauth2/v2/auth?state=abc",
       state: "abc",
-      service: "integration:google",
+      service: "google",
     });
 
     const { exitCode, stdout } = await runCommand([
       "connect",
-      "integration:google",
+      "google",
       "--json",
     ]);
     expect(exitCode).toBe(0);
@@ -463,7 +393,7 @@ describe("assistant oauth connect", () => {
     expect(parsed.authUrl).toBe(
       "https://accounts.google.com/o/oauth2/v2/auth?state=abc",
     );
-    expect(parsed.service).toBe("integration:google");
+    expect(parsed.service).toBe("google");
   });
 
   // -------------------------------------------------------------------------
@@ -472,7 +402,7 @@ describe("assistant oauth connect", () => {
 
   test("BYO mode with --open-browser calls orchestrator with isInteractive: true", async () => {
     mockGetProvider = () => ({
-      providerKey: "integration:google",
+      providerKey: "google",
       authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
       tokenUrl: "https://oauth2.googleapis.com/token",
       managedServiceConfigKey: null,
@@ -483,7 +413,7 @@ describe("assistant oauth connect", () => {
       id: "app-1",
       clientId: "test-id",
       clientSecretCredentialPath: "oauth_app/app-1/client_secret",
-      providerKey: "integration:google",
+      providerKey: "google",
       createdAt: 0,
       updatedAt: 0,
     });
@@ -501,7 +431,7 @@ describe("assistant oauth connect", () => {
 
     const { exitCode, stdout } = await runCommand([
       "connect",
-      "integration:google",
+      "google",
       "--client-id",
       "test-id",
       "--open-browser",
@@ -525,7 +455,7 @@ describe("assistant oauth connect", () => {
 
   test("BYO mode: missing app with --client-id returns error with hint", async () => {
     mockGetProvider = () => ({
-      providerKey: "integration:google",
+      providerKey: "google",
       authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
       tokenUrl: "https://oauth2.googleapis.com/token",
       managedServiceConfigKey: null,
@@ -535,7 +465,7 @@ describe("assistant oauth connect", () => {
 
     const { exitCode, stdout } = await runCommand([
       "connect",
-      "integration:google",
+      "google",
       "--client-id",
       "nonexistent-id",
       "--json",
@@ -553,7 +483,7 @@ describe("assistant oauth connect", () => {
 
   test("BYO mode: no client_id found returns error with hint", async () => {
     mockGetProvider = () => ({
-      providerKey: "integration:google",
+      providerKey: "google",
       authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
       tokenUrl: "https://oauth2.googleapis.com/token",
       managedServiceConfigKey: null,
@@ -563,7 +493,7 @@ describe("assistant oauth connect", () => {
 
     const { exitCode, stdout } = await runCommand([
       "connect",
-      "integration:google",
+      "google",
       "--json",
     ]);
     expect(exitCode).toBe(1);
@@ -579,7 +509,7 @@ describe("assistant oauth connect", () => {
 
   test("--client-id is silently ignored in managed mode", async () => {
     mockGetProvider = () => ({
-      providerKey: "integration:google",
+      providerKey: "google",
       authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
       tokenUrl: "https://oauth2.googleapis.com/token",
       managedServiceConfigKey: "google-oauth",
@@ -616,7 +546,7 @@ describe("assistant oauth connect", () => {
 
   test("JSON output for deferred case includes ok, deferred, authUrl, service", async () => {
     mockGetProvider = () => ({
-      providerKey: "integration:slack",
+      providerKey: "slack",
       authUrl: "https://slack.com/oauth/v2/authorize",
       tokenUrl: "https://slack.com/api/oauth.v2.access",
       managedServiceConfigKey: null,
@@ -627,7 +557,7 @@ describe("assistant oauth connect", () => {
       id: "app-slack",
       clientId: "slack-client-id",
       clientSecretCredentialPath: "oauth_app/app-slack/client_secret",
-      providerKey: "integration:slack",
+      providerKey: "slack",
       createdAt: 0,
       updatedAt: 0,
     });
@@ -637,7 +567,7 @@ describe("assistant oauth connect", () => {
       deferred: true,
       authUrl: "https://slack.com/oauth/v2/authorize?state=xyz",
       state: "xyz",
-      service: "integration:slack",
+      service: "slack",
     });
 
     const { exitCode, stdout } = await runCommand([
@@ -650,7 +580,7 @@ describe("assistant oauth connect", () => {
     expect(parsed).toHaveProperty("ok", true);
     expect(parsed).toHaveProperty("deferred", true);
     expect(parsed).toHaveProperty("authUrl");
-    expect(parsed).toHaveProperty("service", "integration:slack");
+    expect(parsed).toHaveProperty("service", "slack");
   });
 
   // -------------------------------------------------------------------------
@@ -659,7 +589,7 @@ describe("assistant oauth connect", () => {
 
   test("JSON output for completed case includes ok, grantedScopes, accountInfo", async () => {
     mockGetProvider = () => ({
-      providerKey: "integration:google",
+      providerKey: "google",
       authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
       tokenUrl: "https://oauth2.googleapis.com/token",
       managedServiceConfigKey: null,
@@ -670,7 +600,7 @@ describe("assistant oauth connect", () => {
       id: "app-1",
       clientId: "completed-client-id",
       clientSecretCredentialPath: "oauth_app/app-1/client_secret",
-      providerKey: "integration:google",
+      providerKey: "google",
       createdAt: 0,
       updatedAt: 0,
     });
@@ -703,11 +633,12 @@ describe("assistant oauth connect", () => {
 
   test("BYO mode: client_secret required but missing returns error with hint", async () => {
     mockGetProvider = () => ({
-      providerKey: "integration:google",
+      providerKey: "google",
       authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
       tokenUrl: "https://oauth2.googleapis.com/token",
       tokenEndpointAuthMethod: "client_secret_post",
       managedServiceConfigKey: null,
+      requiresClientSecret: 1,
     });
     mockIsManagedMode = () => false;
 
@@ -715,7 +646,7 @@ describe("assistant oauth connect", () => {
       id: "app-1",
       clientId: "test-id",
       clientSecretCredentialPath: "oauth_app/app-1/client_secret",
-      providerKey: "integration:google",
+      providerKey: "google",
       createdAt: 0,
       updatedAt: 0,
     });
@@ -723,19 +654,9 @@ describe("assistant oauth connect", () => {
     // No secret stored
     mockGetSecureKeyViaDaemon = async () => undefined;
 
-    // Provider behavior says secret is required
-    mockGetProviderBehavior = () => ({
-      setup: {
-        requiresClientSecret: true,
-        displayName: "Google",
-        dashboardUrl: "https://console.cloud.google.com",
-        appType: "Desktop app",
-      },
-    });
-
     const { exitCode, stdout } = await runCommand([
       "connect",
-      "integration:google",
+      "google",
       "--json",
     ]);
     expect(exitCode).toBe(1);
@@ -751,7 +672,7 @@ describe("assistant oauth connect", () => {
 
   test("BYO mode: orchestrator error propagates correctly", async () => {
     mockGetProvider = () => ({
-      providerKey: "integration:google",
+      providerKey: "google",
       authUrl: "https://accounts.google.com/o/oauth2/v2/auth",
       tokenUrl: "https://oauth2.googleapis.com/token",
       managedServiceConfigKey: null,
@@ -762,7 +683,7 @@ describe("assistant oauth connect", () => {
       id: "app-1",
       clientId: "client-id",
       clientSecretCredentialPath: "oauth_app/app-1/client_secret",
-      providerKey: "integration:google",
+      providerKey: "google",
       createdAt: 0,
       updatedAt: 0,
     });
@@ -774,7 +695,7 @@ describe("assistant oauth connect", () => {
 
     const { exitCode, stdout } = await runCommand([
       "connect",
-      "integration:google",
+      "google",
       "--json",
     ]);
     expect(exitCode).toBe(1);

package/src/cli/commands/oauth/__tests__/disconnect.test.ts

@@ -97,20 +97,6 @@ mock.module("../../../../oauth/oauth-store.js", () => ({
   deleteConnection: () => false,
 }));
 
-mock.module("../../../../oauth/provider-behaviors.js", () => ({
-  resolveService: (service: string) => {
-    const aliases: Record<string, string> = {
-      gmail: "integration:google",
-      google: "integration:google",
-      slack: "integration:slack",
-    };
-    if (aliases[service]) return aliases[service];
-    if (!service.includes(":")) return `integration:${service}`;
-    return service;
-  },
-  getProviderBehavior: () => undefined,
-}));
-
 mock.module("../../../../oauth/connect-orchestrator.js", () => ({
   orchestrateOAuthConnect: async () => ({
     success: true,
@@ -165,16 +151,6 @@ mock.module("../../../lib/daemon-credential-client.js", () => ({
 
 // Mock shared.js helpers to control managed vs BYO mode routing
 mock.module("../shared.js", () => ({
-  resolveService: (service: string) => {
-    const aliases: Record<string, string> = {
-      gmail: "integration:google",
-      google: "integration:google",
-      slack: "integration:slack",
-    };
-    if (aliases[service]) return aliases[service];
-    if (!service.includes(":")) return `integration:${service}`;
-    return service;
-  },
   isManagedMode: (key: string) => mockIsManagedMode(key),
   requirePlatformClient: async (_cmd: Command) => {
     if (
@@ -222,10 +198,6 @@ mock.module("../shared.js", () => ({
     if (!result.ok) return null;
     return result.body as Array<Record<string, unknown>>;
   },
-  toBareProvider: (provider: string): string =>
-    provider.startsWith("integration:")
-      ? provider.slice("integration:".length)
-      : provider,
 }));
 
 // ---------------------------------------------------------------------------
@@ -323,7 +295,7 @@ describe("assistant oauth disconnect", () => {
 
   test("both --account and --connection-id returns error", async () => {
     mockGetProvider = () => ({
-      providerKey: "integration:google",
+      providerKey: "google",
       managedServiceConfigKey: null,
     });
 
@@ -351,7 +323,7 @@ describe("assistant oauth disconnect", () => {
   describe("managed mode", () => {
     beforeEach(() => {
       mockGetProvider = () => ({
-        providerKey: "integration:google",
+        providerKey: "google",
         managedServiceConfigKey: "google-oauth",
       });
       mockIsManagedMode = () => true;
@@ -384,7 +356,7 @@ describe("assistant oauth disconnect", () => {
       expect(exitCode).toBe(0);
       const parsed = JSON.parse(stdout);
       expect(parsed.ok).toBe(true);
-      expect(parsed.provider).toBe("integration:google");
+      expect(parsed.provider).toBe("google");
       expect(parsed.connectionId).toBe("conn-1");
       expect(parsed.account).toBe("user@gmail.com");
     });
@@ -512,7 +484,7 @@ describe("assistant oauth disconnect", () => {
   describe("BYO mode", () => {
     beforeEach(() => {
       mockGetProvider = () => ({
-        providerKey: "integration:google",
+        providerKey: "google",
         managedServiceConfigKey: null,
       });
       mockIsManagedMode = () => false;
@@ -522,7 +494,7 @@ describe("assistant oauth disconnect", () => {
       mockListActiveConnectionsByProvider = () => [
         {
           id: "conn-1",
-          providerKey: "integration:google",
+          providerKey: "google",
           accountInfo: "user@gmail.com",
           status: "active",
         },
@@ -536,68 +508,22 @@ describe("assistant oauth disconnect", () => {
       expect(exitCode).toBe(0);
       const parsed = JSON.parse(stdout);
       expect(parsed.ok).toBe(true);
-      expect(parsed.provider).toBe("integration:google");
+      expect(parsed.provider).toBe("google");
       expect(parsed.connectionId).toBe("conn-1");
       expect(parsed.account).toBe("user@gmail.com");
 
       // Verify disconnectOAuthProvider was called
       expect(mockDisconnectOAuthProviderCalls).toHaveLength(1);
-      expect(mockDisconnectOAuthProviderCalls[0].providerKey).toBe(
-        "integration:google",
-      );
+      expect(mockDisconnectOAuthProviderCalls[0].providerKey).toBe("google");
       expect(mockDisconnectOAuthProviderCalls[0].connectionId).toBe("conn-1");
     });
 
-    test("single connection also cleans up legacy credential keys", async () => {
-      mockListActiveConnectionsByProvider = () => [
-        {
-          id: "conn-1",
-          providerKey: "integration:google",
-          accountInfo: "user@gmail.com",
-          status: "active",
-        },
-      ];
-
-      await runCommand(["disconnect", "google", "--json"]);
-
-      // Should have attempted to delete legacy keys
-      const expectedFields = [
-        "access_token",
-        "refresh_token",
-        "client_id",
-        "client_secret",
-      ];
-      expect(mockDeleteSecureKeyViaDaemonCalls.length).toBe(
-        expectedFields.length,
-      );
-      for (const field of expectedFields) {
-        expect(
-          mockDeleteSecureKeyViaDaemonCalls.some(
-            (c) =>
-              c.type === "credential" &&
-              c.name === `integration:google:${field}`,
-          ),
-        ).toBe(true);
-      }
-
-      expect(mockDeleteCredentialMetadataCalls.length).toBe(
-        expectedFields.length,
-      );
-      for (const field of expectedFields) {
-        expect(
-          mockDeleteCredentialMetadataCalls.some(
-            (c) => c.service === "integration:google" && c.field === field,
-          ),
-        ).toBe(true);
-      }
-    });
-
     test("--account matches accountInfo", async () => {
       mockGetActiveConnection = (providerKey, opts) => {
         if (opts?.account === "user@gmail.com") {
           return {
             id: "conn-1",
-            providerKey: "integration:google",
+            providerKey: "google",
             accountInfo: "user@gmail.com",
             status: "active",
           };
@@ -641,7 +567,7 @@ describe("assistant oauth disconnect", () => {
         if (id === "conn-123") {
           return {
             id: "conn-123",
-            providerKey: "integration:google",
+            providerKey: "google",
             accountInfo: "user@gmail.com",
             status: "active",
           };
@@ -667,7 +593,7 @@ describe("assistant oauth disconnect", () => {
         if (id === "conn-slack") {
           return {
             id: "conn-slack",
-            providerKey: "integration:slack",
+            providerKey: "slack",
             accountInfo: null,
             status: "active",
           };
@@ -693,13 +619,13 @@ describe("assistant oauth disconnect", () => {
       mockListActiveConnectionsByProvider = () => [
         {
           id: "conn-1",
-          providerKey: "integration:google",
+          providerKey: "google",
           accountInfo: "user1@gmail.com",
           status: "active",
         },
         {
           id: "conn-2",
-          providerKey: "integration:google",
+          providerKey: "google",
           accountInfo: "user2@gmail.com",
           status: "active",
         },
@@ -740,7 +666,7 @@ describe("assistant oauth disconnect", () => {
       mockListActiveConnectionsByProvider = () => [
         {
           id: "conn-1",
-          providerKey: "integration:google",
+          providerKey: "google",
           accountInfo: null,
           status: "active",
         },