latchkey 3.14.0 → 3.16.0

package/dist/tests/plugins.test.js

@@ -0,0 +1,506 @@
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { execFileSync } from 'node:child_process';
+import { mkdirSync, mkdtempSync, rmSync, symlinkSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { PluginLoadError, combineWithPluginApiCredentialsTypes, combineWithPluginServices, isLatchkeyVersionSupported, loadPlugins, } from '../src/plugins.js';
+import { createLatchkeySdk } from '../src/pluginSdk.js';
+import { AuthorizationBearer } from '../src/apiCredentials/base.js';
+import { BUILTIN_API_CREDENTIALS_TYPES } from '../src/apiCredentials/serialization.js';
+import { Service } from '../src/services/core/base.js';
+import { SLACK } from '../src/services/index.js';
+import { VERSION } from '../src/version.js';
+const SDK_VERSION = '3.15.2';
+const SDK = createLatchkeySdk(SDK_VERSION);
+const SUPPORTED_VERSION_RANGE = '^3.15.0';
+function pluginSource(serviceNames, options = {}) {
+    const latchkeyVersion = JSON.stringify(options.latchkeyVersion ?? SUPPORTED_VERSION_RANGE);
+    const services = serviceNames.map((name) => `new PluginService(${JSON.stringify(name)})`);
+    const factory = options.asyncFactory === true ? 'async (sdk)' : '(sdk)';
+    return `
+    export default ${factory} => {
+      class PluginService extends sdk.Service {
+        constructor(name) {
+          super();
+          this.name = name;
+          this.displayName = name;
+          this.baseApiUrls = [\`https://\${name}.example.com/\`];
+          this.loginUrl = '';
+          this.info = \`Plugin service \${name}, loaded by Latchkey \${sdk.latchkeyVersion}.\`;
+          this.credentialCheckCurlArguments = [];
+        }
+        setCredentialsExample(serviceName) {
+          return \`latchkey auth set \${serviceName} -H "Authorization: Bearer <token>"\`;
+        }
+      }
+      return {
+        latchkeyVersion: ${latchkeyVersion},
+        services: [${services.join(', ')}],
+        ${options.apiCredentialsTypes === undefined ? '' : `apiCredentialsTypes: ${options.apiCredentialsTypes},`}
+      };
+    };
+  `;
+}
+function writePlugin(pluginsDirectory, pluginName, files) {
+    const pluginDirectory = join(pluginsDirectory, pluginName);
+    for (const [relativePath, content] of Object.entries(files)) {
+        const filePath = join(pluginDirectory, relativePath);
+        mkdirSync(dirname(filePath), { recursive: true });
+        writeFileSync(filePath, content, 'utf-8');
+    }
+    return pluginDirectory;
+}
+function serviceNames(plugin) {
+    return plugin.services.map((service) => service.name);
+}
+async function expectLoadError(pluginsDirectory, messagePart) {
+    const loading = loadPlugins(pluginsDirectory, SDK);
+    await expect(loading).rejects.toBeInstanceOf(PluginLoadError);
+    await expect(loading).rejects.toThrow(messagePart);
+}
+describe('loadPlugins', () => {
+    let tempDir;
+    let pluginsDirectory;
+    beforeEach(() => {
+        tempDir = mkdtempSync(join(tmpdir(), 'latchkey-plugins-test-'));
+        pluginsDirectory = join(tempDir, 'plugins');
+        mkdirSync(pluginsDirectory);
+    });
+    afterEach(() => {
+        rmSync(tempDir, { recursive: true, force: true });
+    });
+    it('returns no plugins when the directory does not exist', async () => {
+        expect(await loadPlugins(join(tempDir, 'nonexistent'), SDK)).toEqual([]);
+    });
+    it('returns no plugins when the path is a file', async () => {
+        const filePath = join(tempDir, 'not-a-directory');
+        writeFileSync(filePath, '', 'utf-8');
+        expect(await loadPlugins(filePath, SDK)).toEqual([]);
+    });
+    it('loads a plugin from its index.js and hands its factory the sdk', async () => {
+        const pluginDirectory = writePlugin(pluginsDirectory, 'foo', {
+            'index.js': pluginSource(['foo', 'foo-admin']),
+        });
+        const plugins = await loadPlugins(pluginsDirectory, SDK);
+        expect(plugins).toHaveLength(1);
+        expect(plugins[0].name).toBe('foo');
+        expect(plugins[0].directory).toBe(pluginDirectory);
+        expect(serviceNames(plugins[0])).toEqual(['foo', 'foo-admin']);
+        expect(plugins[0].services[0]).toBeInstanceOf(Service);
+        expect(plugins[0].services[0].info).toContain(`loaded by Latchkey ${SDK_VERSION}`);
+    });
+    it('loads plugins in alphabetical order and ignores what is not a plugin directory', async () => {
+        writePlugin(pluginsDirectory, 'zeta', { 'index.js': pluginSource(['zeta']) });
+        writePlugin(pluginsDirectory, 'alpha', { 'index.js': pluginSource(['alpha']) });
+        writePlugin(pluginsDirectory, '.hidden', { 'index.js': pluginSource(['hidden']) });
+        writePlugin(pluginsDirectory, 'node_modules', { 'index.js': pluginSource(['dependency']) });
+        writeFileSync(join(pluginsDirectory, 'stray.js'), pluginSource(['stray']), 'utf-8');
+        const plugins = await loadPlugins(pluginsDirectory, SDK);
+        expect(plugins.map((plugin) => plugin.name)).toEqual(['alpha', 'zeta']);
+    });
+    it('follows a symlink to a plugin checkout elsewhere', async () => {
+        const checkout = join(tempDir, 'checkout');
+        writePlugin(tempDir, 'checkout', { 'index.js': pluginSource(['linked']) });
+        symlinkSync(checkout, join(pluginsDirectory, 'linked'));
+        const plugins = await loadPlugins(pluginsDirectory, SDK);
+        expect(plugins.map((plugin) => plugin.name)).toEqual(['linked']);
+        expect(serviceNames(plugins[0])).toEqual(['linked']);
+    });
+    it('supports an asynchronous factory', async () => {
+        writePlugin(pluginsDirectory, 'foo', {
+            'index.js': pluginSource(['foo'], { asyncFactory: true }),
+        });
+        const plugins = await loadPlugins(pluginsDirectory, SDK);
+        expect(serviceNames(plugins[0])).toEqual(['foo']);
+    });
+    it('loads a plugin without credentials types as contributing none', async () => {
+        writePlugin(pluginsDirectory, 'foo', { 'index.js': pluginSource(['foo']) });
+        const plugins = await loadPlugins(pluginsDirectory, SDK);
+        expect(plugins[0].apiCredentialsTypes).toEqual([]);
+    });
+    it('loads the credentials classes a plugin defines', async () => {
+        writePlugin(pluginsDirectory, 'foo', {
+            'index.js': pluginSource(['foo'], {
+                apiCredentialsTypes: `[
+          class FooToken extends sdk.AuthorizationBearer {
+            static objectType = 'fooToken';
+            static fromJSON(data) {
+              return new FooToken(data.token);
+            }
+          },
+        ]`,
+            }),
+        });
+        const plugins = await loadPlugins(pluginsDirectory, SDK);
+        const [type] = plugins[0].apiCredentialsTypes;
+        expect(type.objectType).toBe('fooToken');
+        expect(type.fromJSON({ objectType: 'fooToken', token: 't' })).toBeInstanceOf(AuthorizationBearer);
+    });
+    describe('entry file', () => {
+        it('honors the main field of package.json', async () => {
+            writePlugin(pluginsDirectory, 'foo', {
+                'package.json': JSON.stringify({ type: 'module', main: 'dist/plugin.js' }),
+                'dist/plugin.js': pluginSource(['foo']),
+                'index.js': 'throw new Error("index.js must not be loaded");',
+            });
+            const plugins = await loadPlugins(pluginsDirectory, SDK);
+            expect(serviceNames(plugins[0])).toEqual(['foo']);
+        });
+        it.each([
+            ['a string', './dist/plugin.js'],
+            ['a root subpath', { '.': './dist/plugin.js' }],
+            ['conditions', { import: './dist/plugin.js', require: './dist/plugin.cjs' }],
+            [
+                'a root subpath with conditions',
+                { '.': { types: './x.d.ts', default: './dist/plugin.js' } },
+            ],
+        ])('honors an exports field of package.json that is %s', async (_description, exportsField) => {
+            writePlugin(pluginsDirectory, 'foo', {
+                'package.json': JSON.stringify({ type: 'module', main: 'wrong.js', exports: exportsField }),
+                'dist/plugin.js': pluginSource(['foo']),
+            });
+            const plugins = await loadPlugins(pluginsDirectory, SDK);
+            expect(serviceNames(plugins[0])).toEqual(['foo']);
+        });
+        it('falls back from an exports field without a usable entry to main', async () => {
+            writePlugin(pluginsDirectory, 'foo', {
+                'package.json': JSON.stringify({
+                    type: 'module',
+                    main: 'dist/plugin.js',
+                    exports: { './helpers': './dist/helpers.js' },
+                }),
+                'dist/plugin.js': pluginSource(['foo']),
+            });
+            const plugins = await loadPlugins(pluginsDirectory, SDK);
+            expect(serviceNames(plugins[0])).toEqual(['foo']);
+        });
+        it('rejects a plugin whose package.json is not valid JSON', async () => {
+            writePlugin(pluginsDirectory, 'foo', {
+                'package.json': '{ not json',
+                'index.js': pluginSource(['foo']),
+            });
+            await expectLoadError(pluginsDirectory, "Failed to load plugin 'foo': invalid package.json");
+        });
+        it('rejects a plugin whose entry file is missing, hinting at an unbuilt checkout', async () => {
+            writePlugin(pluginsDirectory, 'foo', {
+                'package.json': JSON.stringify({ type: 'module', main: 'dist/index.js' }),
+                'src/index.ts': 'export default () => ({ latchkeyVersion: "^3.15.0", services: [] });',
+            });
+            await expectLoadError(pluginsDirectory, 'has to be built first');
+        });
+    });
+    describe('validation', () => {
+        it('rejects a plugin that fails to import', async () => {
+            writePlugin(pluginsDirectory, 'foo', { 'index.js': 'export default (' });
+            await expectLoadError(pluginsDirectory, "Failed to load plugin 'foo': could not import");
+        });
+        it('rejects a plugin without a default export', async () => {
+            writePlugin(pluginsDirectory, 'foo', { 'index.js': 'export const services = [];' });
+            await expectLoadError(pluginsDirectory, 'must have a default export that is a function');
+        });
+        it('rejects a plugin whose default export is not a function', async () => {
+            writePlugin(pluginsDirectory, 'foo', {
+                'index.js': 'export default { latchkeyVersion: "^3.15.0", services: [] };',
+            });
+            await expectLoadError(pluginsDirectory, 'must have a default export that is a function');
+        });
+        it('rejects a plugin whose factory throws', async () => {
+            writePlugin(pluginsDirectory, 'foo', {
+                'index.js': 'export default () => { throw new Error("no network"); };',
+            });
+            await expectLoadError(pluginsDirectory, 'the plugin factory threw: no network');
+        });
+        it('rejects a plugin whose factory does not return an object', async () => {
+            writePlugin(pluginsDirectory, 'foo', { 'index.js': 'export default () => undefined;' });
+            await expectLoadError(pluginsDirectory, 'did not return an object');
+        });
+        it('rejects a plugin that does not declare the Latchkey versions it supports', async () => {
+            writePlugin(pluginsDirectory, 'foo', {
+                'index.js': 'export default () => ({ services: [] });',
+            });
+            await expectLoadError(pluginsDirectory, "'latchkeyVersion' must be a string");
+        });
+        it('rejects a plugin declaring the Latchkey version as a number', async () => {
+            writePlugin(pluginsDirectory, 'foo', {
+                'index.js': pluginSource(['foo'], { latchkeyVersion: 3 }),
+            });
+            await expectLoadError(pluginsDirectory, "'latchkeyVersion' must be a string");
+        });
+        it('rejects a plugin declaring an invalid version range', async () => {
+            writePlugin(pluginsDirectory, 'foo', {
+                'index.js': pluginSource(['foo'], { latchkeyVersion: 'latest and greatest' }),
+            });
+            await expectLoadError(pluginsDirectory, "'latest and greatest' is not a valid version range for 'latchkeyVersion'");
+        });
+        it.each(['^4.0.0', '^3.16.0', '~3.14.0', '<3.15.2', '2.x'])('rejects a plugin whose version range %s excludes this Latchkey', async (latchkeyVersion) => {
+            writePlugin(pluginsDirectory, 'foo', {
+                'index.js': pluginSource(['foo'], { latchkeyVersion }),
+            });
+            await expectLoadError(pluginsDirectory, `it supports Latchkey ${latchkeyVersion}, but this is Latchkey ${SDK_VERSION}.`);
+        });
+        it.each(['^3.15.0', '^3.0.0', '~3.15.0', '3.15.2', '3.x', '>=3.15.0 <4', '*'])('accepts a plugin whose version range %s includes this Latchkey', async (latchkeyVersion) => {
+            writePlugin(pluginsDirectory, 'foo', {
+                'index.js': pluginSource(['foo'], { latchkeyVersion }),
+            });
+            const plugins = await loadPlugins(pluginsDirectory, SDK);
+            expect(serviceNames(plugins[0])).toEqual(['foo']);
+        });
+        it('rejects a plugin without a services array', async () => {
+            writePlugin(pluginsDirectory, 'foo', {
+                'index.js': 'export default () => ({ latchkeyVersion: "^3.15.0", services: {} });',
+            });
+            await expectLoadError(pluginsDirectory, "'services' must be an array");
+        });
+        it('rejects a service that does not extend the Service class', async () => {
+            writePlugin(pluginsDirectory, 'foo', {
+                'index.js': `export default () => ({
+          latchkeyVersion: '^3.15.0',
+          services: [{ name: 'foo', displayName: 'Foo', baseApiUrls: [], loginUrl: '', info: '' }],
+        });`,
+            });
+            await expectLoadError(pluginsDirectory, 'must extend the Service class');
+        });
+        it('rejects a service extending a Service class other than the one in the sdk', async () => {
+            // What a second, separately installed copy of latchkey would produce.
+            writePlugin(pluginsDirectory, 'foo', {
+                'index.js': `
+          class Service {}
+          class Foo extends Service { name = 'foo'; }
+          export default () => ({ latchkeyVersion: '^3.15.0', services: [new Foo()] });
+        `,
+            });
+            await expectLoadError(pluginsDirectory, 'separately installed latchkey');
+        });
+        it('rejects credentials types that are not an array', async () => {
+            writePlugin(pluginsDirectory, 'foo', {
+                'index.js': pluginSource(['foo'], { apiCredentialsTypes: '{}' }),
+            });
+            await expectLoadError(pluginsDirectory, "'apiCredentialsTypes' must be an array");
+        });
+        it('rejects a credentials class without a static fromJSON', async () => {
+            writePlugin(pluginsDirectory, 'foo', {
+                'index.js': pluginSource(['foo'], {
+                    apiCredentialsTypes: "[class FooToken { static objectType = 'fooToken'; }]",
+                }),
+            });
+            await expectLoadError(pluginsDirectory, "every entry of 'apiCredentialsTypes' must be a credentials class with a static " +
+                "'objectType' and a static 'fromJSON'.");
+        });
+        it('reports the first broken plugin and loads none', async () => {
+            writePlugin(pluginsDirectory, 'a-fine', { 'index.js': pluginSource(['fine']) });
+            writePlugin(pluginsDirectory, 'b-broken', { 'index.js': 'export default 42;' });
+            await expectLoadError(pluginsDirectory, "Failed to load plugin 'b-broken'");
+        });
+    });
+});
+describe('isLatchkeyVersionSupported', () => {
+    it('accepts a release within the range', () => {
+        expect(isLatchkeyVersionSupported('^3.15.0', '3.15.0')).toBe(true);
+        expect(isLatchkeyVersionSupported('^3.15.0', '3.99.1')).toBe(true);
+    });
+    it('rejects a release outside the range', () => {
+        expect(isLatchkeyVersionSupported('^3.15.0', '3.14.9')).toBe(false);
+        expect(isLatchkeyVersionSupported('^3.15.0', '4.0.0')).toBe(false);
+    });
+    it('accepts a prerelease of a version within the range', () => {
+        expect(isLatchkeyVersionSupported('^3.15.0', '3.16.0-dev.1')).toBe(true);
+    });
+    it('rejects a prerelease of a version outside the range', () => {
+        expect(isLatchkeyVersionSupported('^3.15.0', '3.15.0-dev.1')).toBe(false);
+        expect(isLatchkeyVersionSupported('^3.15.0', '4.0.0-rc.1')).toBe(false);
+    });
+});
+describe('combineWithPluginServices', () => {
+    function loadedPlugin(name, services, apiCredentialsTypes = []) {
+        return { name, directory: `/plugins/${name}`, services, apiCredentialsTypes };
+    }
+    class NamedService extends Service {
+        name;
+        displayName;
+        baseApiUrls = [];
+        loginUrl = '';
+        info = '';
+        credentialCheckCurlArguments = [];
+        constructor(name) {
+            super();
+            this.name = name;
+            this.displayName = name;
+        }
+        setCredentialsExample(serviceName) {
+            return `latchkey auth set ${serviceName}`;
+        }
+    }
+    it('appends plugin services after the built-in ones, in plugin order', () => {
+        const foo = new NamedService('foo');
+        const bar = new NamedService('bar');
+        const combined = combineWithPluginServices([SLACK], [loadedPlugin('a', [foo]), loadedPlugin('b', [bar])]);
+        expect(combined).toEqual([SLACK, foo, bar]);
+    });
+    it('refuses a plugin service named like a built-in one', () => {
+        expect(() => combineWithPluginServices([SLACK], [loadedPlugin('a', [new NamedService('slack')])])).toThrow("Failed to load plugin 'a': service 'slack' is already provided by Latchkey itself.");
+    });
+    it('refuses a plugin service named like one from an earlier plugin', () => {
+        expect(() => combineWithPluginServices([], [loadedPlugin('a', [new NamedService('foo')]), loadedPlugin('b', [new NamedService('foo')])])).toThrow("Failed to load plugin 'b': service 'foo' is already provided by plugin 'a'.");
+    });
+});
+describe('combineWithPluginApiCredentialsTypes', () => {
+    function loadedPlugin(name, apiCredentialsTypes) {
+        return { name, directory: `/plugins/${name}`, services: [], apiCredentialsTypes };
+    }
+    function namedType(objectType) {
+        return { objectType, fromJSON: () => new AuthorizationBearer('') };
+    }
+    it('appends plugin credentials types after the built-in ones, in plugin order', () => {
+        const foo = namedType('foo');
+        const bar = namedType('bar');
+        const combined = combineWithPluginApiCredentialsTypes(BUILTIN_API_CREDENTIALS_TYPES, [
+            loadedPlugin('a', [foo]),
+            loadedPlugin('b', [bar]),
+        ]);
+        expect(combined).toEqual([...BUILTIN_API_CREDENTIALS_TYPES, foo, bar]);
+    });
+    it('refuses a plugin credentials type named like a built-in one', () => {
+        expect(() => combineWithPluginApiCredentialsTypes(BUILTIN_API_CREDENTIALS_TYPES, [
+            loadedPlugin('a', [namedType('oauth')]),
+        ])).toThrow("Failed to load plugin 'a': credentials type 'oauth' is already provided by Latchkey itself.");
+    });
+    it('refuses a plugin credentials type named like one from an earlier plugin', () => {
+        expect(() => combineWithPluginApiCredentialsTypes([], [loadedPlugin('a', [namedType('foo')]), loadedPlugin('b', [namedType('foo')])])).toThrow("Failed to load plugin 'b': credentials type 'foo' is already provided by plugin 'a'.");
+    });
+});
+// ─── End to end: a plugin served by the real CLI ──────────────────────────────
+const TEST_ENCRYPTION_KEY = 'dGVzdGtleXRlc3RrZXl0ZXN0a2V5dGVzdGtleXRlc3Q=';
+const projectRoot = join(dirname(fileURLToPath(import.meta.url)), '..');
+const devShimPath = join(projectRoot, 'scripts', 'latchkey');
+/**
+ * What a real plugin looks like: an ES module package with nothing installed
+ * in its own node_modules, taking everything, zod included, from the sdk. It
+ * also brings a credentials class of its own, which the sdk lets it register.
+ */
+const REAL_PLUGIN_SOURCE = `
+  export default (sdk) => {
+    const { Service, AuthorizationBearer, buildPreparedCredentials, z } = sdk;
+
+    const ExampleTokenSchema = z.object({ objectType: z.literal('exampleToken'), token: z.string() });
+
+    class ExampleToken {
+      static objectType = 'exampleToken';
+      objectType = ExampleToken.objectType;
+      constructor(token) {
+        this.token = token;
+      }
+      static fromJSON(data) {
+        return new ExampleToken(ExampleTokenSchema.parse(data).token);
+      }
+      injectIntoCurlCall(curlArguments) {
+        return Promise.resolve(['-H', \`X-Example-Token: \${this.token}\`, ...curlArguments]);
+      }
+      isExpired() {
+        return undefined;
+      }
+      toJSON() {
+        return { objectType: this.objectType, token: this.token };
+      }
+    }
+
+    class Example extends Service {
+      name = 'example';
+      displayName = 'Example';
+      baseApiUrls = ['https://api.example.com/'];
+      loginUrl = 'https://example.com/login';
+      info = 'Example plugin service.';
+      credentialCheckCurlArguments = ['https://api.example.com/me'];
+
+      setCredentialsExample(serviceName) {
+        return \`latchkey auth set \${serviceName} -H "Authorization: Bearer <token>"\`;
+      }
+
+      prepareFromJson(parsedJson) {
+        return buildPreparedCredentials(
+          this.name,
+          z.object({ token: z.string() }),
+          parsedJson,
+          (input) => new AuthorizationBearer(input.token)
+        );
+      }
+
+      getCredentialsNoCurl(noCurlArguments) {
+        return new ExampleToken(noCurlArguments[0]);
+      }
+    }
+
+    return {
+      latchkeyVersion: ${JSON.stringify(`^${VERSION}`)},
+      services: [new Example()],
+      apiCredentialsTypes: [ExampleToken],
+    };
+  };
+`;
+function runCli(latchkeyDirectory, args) {
+    try {
+        const stdout = execFileSync(devShimPath, args, {
+            cwd: projectRoot,
+            encoding: 'utf-8',
+            env: {
+                ...process.env,
+                LATCHKEY_DIRECTORY: latchkeyDirectory,
+                LATCHKEY_ENCRYPTION_KEY: TEST_ENCRYPTION_KEY,
+                LATCHKEY_DISABLE_COUNTING: '1',
+            },
+            stdio: ['pipe', 'pipe', 'pipe'],
+        });
+        return { exitCode: 0, stdout, stderr: '' };
+    }
+    catch (error) {
+        const failure = error;
+        return { exitCode: failure.status ?? 1, stdout: failure.stdout, stderr: failure.stderr };
+    }
+}
+describe('plugins loaded by the CLI', () => {
+    let latchkeyDirectory;
+    beforeEach(() => {
+        latchkeyDirectory = mkdtempSync(join(tmpdir(), 'latchkey-plugins-cli-test-'));
+        writePlugin(join(latchkeyDirectory, 'plugins'), 'latchkey-plugin-example', {
+            'package.json': JSON.stringify({ name: 'latchkey-plugin-example', type: 'module' }),
+            'index.js': REAL_PLUGIN_SOURCE,
+        });
+    });
+    afterEach(() => {
+        rmSync(latchkeyDirectory, { recursive: true, force: true });
+    });
+    it('serves a plugin service built from the sdk, zod included, like a built-in one', () => {
+        const preparation = runCli(latchkeyDirectory, ['auth', 'prepare', 'example', '{"token":"t"}']);
+        expect(preparation.stderr).toBe('');
+        expect(preparation.exitCode).toBe(0);
+        const info = runCli(latchkeyDirectory, ['services', 'info', 'example', '--offline']);
+        expect(info.stderr).toBe('');
+        expect(info.exitCode).toBe(0);
+        const parsedInfo = JSON.parse(info.stdout);
+        expect(parsedInfo.type).toBe('built-in');
+        expect(parsedInfo.developerNotes).toBe('Example plugin service.');
+    }, 60_000);
+    it('stores and reads back credentials of a class the plugin defines', () => {
+        const setting = runCli(latchkeyDirectory, ['auth', 'set-nocurl', 'example', 't0ken']);
+        expect(setting.stderr).toBe('');
+        expect(setting.exitCode).toBe(0);
+        const info = runCli(latchkeyDirectory, ['services', 'info', 'example', '--offline']);
+        expect(info.stderr).toBe('');
+        expect(info.exitCode).toBe(0);
+        const parsedInfo = JSON.parse(info.stdout);
+        expect(Object.values(parsedInfo.credentials)).toEqual([
+            { credentialStatus: 'unknown', credentialType: 'exampleToken' },
+        ]);
+    }, 60_000);
+    it('refuses to start with a broken plugin and names it', () => {
+        writePlugin(join(latchkeyDirectory, 'plugins'), 'broken', {
+            'package.json': JSON.stringify({ type: 'module' }),
+            'index.js': 'export default () => ({ latchkeyVersion: "^1.0.0", services: [] });',
+        });
+        const result = runCli(latchkeyDirectory, ['services', 'list', '--builtin']);
+        expect(result.exitCode).toBe(1);
+        expect(result.stderr).toContain("Error: Failed to load plugin 'broken'");
+        expect(result.stderr).toContain(`it supports Latchkey ^1.0.0, but this is Latchkey ${VERSION}.`);
+    }, 60_000);
+});
+//# sourceMappingURL=plugins.test.js.map

package/dist/tests/plugins.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugins.test.js","sourceRoot":"","sources":["../../tests/plugins.test.ts"],"names":[],"mappings":"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"}

package/dist/tests/sharedOperations.test.js

@@ -10,6 +10,7 @@ import { PrepareInputInvalidError, PrepareNotSupportedError, } from '../src/serv
 import { MockService } from './mockService.js';
 import { GOOGLE_GMAIL } from '../src/services/google/gmail.js';
 import { NOTION_MCP } from '../src/services/notion-mcp.js';
+import { FASTMAIL } from '../src/services/fastmail.js';
 import { RegisteredService } from '../src/services/core/registered.js';
 import { ServiceRegistry } from '../src/serviceRegistry.js';
 import { saveBrowserConfig } from '../src/configDataStore.js';
@@ -755,12 +756,72 @@ describe('operations', () => {
             expect(() => prepareService(registry, store, 'notion-mcp', JSON.stringify({ clientId: 'a', clientSecret: 'b' }))).toThrow(PrepareInputInvalidError);
             expect(store.getPreparation('notion-mcp')).toBeNull();
         });
-        it('rejects notion-mcp input missing clientId', () => {
+        it('stores a prepared redirect URI alongside the client for a Google service', () => {
+            const registry = new ServiceRegistry([GOOGLE_GMAIL]);
+            const store = createApiCredentialStore();
+            prepareService(registry, store, 'google-gmail', JSON.stringify({
+                clientId: 'cid',
+                clientSecret: 'csecret',
+                redirectUri: 'https://example.com/oauth-callback/',
+            }));
+            expect(store.getPreparation('google-gmail').redirectUri).toBe('https://example.com/oauth-callback/');
+        });
+        it('stores a prepared redirect URI for notion-mcp', () => {
+            const registry = new ServiceRegistry([NOTION_MCP]);
+            const store = createApiCredentialStore();
+            prepareService(registry, store, 'notion-mcp', JSON.stringify({
+                clientId: 'notion-client-id',
+                redirectUri: 'https://example.com/oauth-callback/',
+            }));
+            expect(store.getPreparation('notion-mcp').redirectUri).toBe('https://example.com/oauth-callback/');
+        });
+        it('leaves the redirect URI unset when the preparation omits it', () => {
+            const registry = new ServiceRegistry([NOTION_MCP]);
+            const store = createApiCredentialStore();
+            prepareService(registry, store, 'notion-mcp', JSON.stringify({ clientId: 'notion-client' }));
+            expect(store.getPreparation('notion-mcp').redirectUri).toBeUndefined();
+        });
+        it('rejects a redirect URI that is not a URL, storing nothing', () => {
+            const registry = new ServiceRegistry([NOTION_MCP]);
+            const store = createApiCredentialStore();
+            expect(() => prepareService(registry, store, 'notion-mcp', JSON.stringify({ clientId: 'notion-client', redirectUri: 'example.com/callback' }))).toThrow(PrepareInputInvalidError);
+            expect(store.getPreparation('notion-mcp')).toBeNull();
+        });
+        it('rejects a redirect URI that is not http(s)', () => {
             const registry = new ServiceRegistry([NOTION_MCP]);
             const store = createApiCredentialStore();
-            expect(() => prepareService(registry, store, 'notion-mcp', '{}')).toThrow(PrepareInputInvalidError);
+            expect(() => prepareService(registry, store, 'notion-mcp', JSON.stringify({ clientId: 'notion-client', redirectUri: 'mailto:someone@example.com' }))).toThrow(PrepareInputInvalidError);
             expect(store.getPreparation('notion-mcp')).toBeNull();
         });
+        it('rejects notion-mcp input with neither clientId nor redirectUri', () => {
+            const registry = new ServiceRegistry([NOTION_MCP]);
+            const store = createApiCredentialStore();
+            expect(() => prepareService(registry, store, 'notion-mcp', '{}')).toThrow(/at least one of clientId or redirectUri/);
+            expect(store.getPreparation('notion-mcp')).toBeNull();
+        });
+        it('rejects an empty notion-mcp clientId', () => {
+            const registry = new ServiceRegistry([NOTION_MCP]);
+            const store = createApiCredentialStore();
+            expect(() => prepareService(registry, store, 'notion-mcp', JSON.stringify({ clientId: '' }))).toThrow(PrepareInputInvalidError);
+            expect(store.getPreparation('notion-mcp')).toBeNull();
+        });
+        // Given only a redirect URI, login still registers a client dynamically —
+        // an empty client id is how the preparation says so — but with that
+        // redirect URI instead of the loopback one.
+        it.each([
+            ['notion-mcp', NOTION_MCP],
+            ['fastmail', FASTMAIL],
+        ])('stores a redirect URI without a client id for %s', (serviceName, service) => {
+            const registry = new ServiceRegistry([service]);
+            const store = createApiCredentialStore();
+            prepareService(registry, store, serviceName, JSON.stringify({ redirectUri: 'https://example.com/oauth-callback/' }));
+            const preparation = store.getPreparation(serviceName);
+            expect(preparation).toBeInstanceOf(OAuthCredentials);
+            expect(preparation.clientId).toBe('');
+            expect(preparation.clientSecret).toBe('');
+            expect(preparation.redirectUri).toBe('https://example.com/oauth-callback/');
+            expect(preparation.accessToken).toBeUndefined();
+        });
     });
 });
 //# sourceMappingURL=sharedOperations.test.js.map