@abgov/nx-oc 13.1.0 → 13.2.0-beta.2

package/README.md

@@ -143,8 +143,8 @@ npx nx run my-app:deploy
 
 For rapid iteration, the `sandbox` generator wires a per-app deploy that builds
 the image **locally with podman**, pushes it to a container registry (GHCR), and
-imports it into your OpenShift namespace — no git push or CI wait. The Nx 23 line
-that ships this is on the `@beta` dist-tag.
+imports it into your OpenShift namespace — no git push or CI wait. (Requires the
+Nx 23 line, `@abgov/nx-oc` 13.x.)
 
 ```bash
 # Add the sandbox targets to a project (run once per app)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/nx-oc",
-  "version": "13.1.0",
+  "version": "13.2.0-beta.2",
   "license": "Apache-2.0",
   "main": "src/index.js",
   "description": "Government of Alberta - Nx plugin for OpenShift.",
@@ -14,11 +14,9 @@
     "tslib": "^2.0.0"
   },
   "dependencies": {
+    "@abgov/adsp-cli": "^1.1.1",
     "axios": "^1.16.0",
     "enquirer": "^2.3.6",
-    "express": "^4.18.2",
-    "open": "^8.4.0",
-    "simple-oauth2": "^5.0.0",
     "yaml": "~2.9.0"
   },
   "generators": "./generators.json",

package/src/adsp/adsp-utils.d.ts

@@ -2,12 +2,25 @@ import { Tree } from '@nx/devkit';
 import { AdspConfiguration, AdspOptions } from './adsp';
 import { EnvironmentName } from './environments';
 export declare function hasDependency(host: Tree, dependency: string): boolean;
-export declare function realmLogin(accessServiceUrl: string, realm: string): Promise<string>;
+export declare const ADSP_ADMIN_SCOPE = "adsp-cli-admin";
+/**
+ * Obtain an ADSP access token via @abgov/adsp-cli. Fast path: a cached/refreshed
+ * token from a prior `adsp login` (no browser). If none — and the run is
+ * interactive — drive `adsp login` (browser) once, then read the fresh token.
+ * In a non-interactive run it never opens a browser; it throws with the exact
+ * `adsp login` command to run instead.
+ *
+ * When `scopes` (e.g. the admin scope) can't be satisfied even after a login —
+ * a user who isn't a realm admin — it falls back to a base-scope token so
+ * non-provisioning steps still proceed (provisioning then degrades via 401/403).
+ */
+export declare function ensureAdspToken(options: {
+    env: EnvironmentName;
+    realm?: string;
+    tenant?: string;
+    scopes?: string[];
+}): Promise<string | undefined>;
 export declare function getServiceUrls(directoryUrl: string): Promise<Record<string, string>>;
-export declare function selectTenant(tenantServiceUrl: string, token: string): Promise<{
-    name: string;
-    realm: string;
-}>;
 export declare function getAdspConfiguration(_host: Tree, options: {
     env: EnvironmentName;
     accessToken?: string;

package/src/adsp/adsp-utils.js

@@ -1,94 +1,114 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ADSP_ADMIN_SCOPE = void 0;
 exports.hasDependency = hasDependency;
-exports.realmLogin = realmLogin;
+exports.ensureAdspToken = ensureAdspToken;
 exports.getServiceUrls = getServiceUrls;
-exports.selectTenant = selectTenant;
 exports.getAdspConfiguration = getAdspConfiguration;
 exports.isAdspOptions = isAdspOptions;
 exports.addClientRedirectUris = addClientRedirectUris;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const axios_1 = require("axios");
-const enquirer_1 = require("enquirer");
-const express = require("express");
-const open = require("open");
-const simple_oauth2_1 = require("simple-oauth2");
+const child_process_1 = require("child_process");
+const fs = require("fs");
+const module_1 = require("module");
+const path = require("path");
+const adsp_cli_1 = require("@abgov/adsp-cli");
 const environments_1 = require("./environments");
-const token_cache_1 = require("./token-cache");
 function hasDependency(host, dependency) {
     const { dependencies, devDependencies } = (0, devkit_1.readJson)(host, 'package.json');
     return !!(dependencies === null || dependencies === void 0 ? void 0 : dependencies[dependency]) || !!(devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies[dependency]);
 }
-function realmLogin(accessServiceUrl, realm) {
+// Scope requested for generator work that provisions Keycloak (creating a
+// service's OAuth client/roles, registering redirect URIs). It's an optional
+// client scope on the `adsp-cli` client — only present in a token when a login
+// explicitly requests it, and only effective for users who already have the
+// underlying realm-admin grant. keycloak-admin.ts tolerates the 401/403 for
+// everyone else, so requesting it is always safe.
+exports.ADSP_ADMIN_SCOPE = 'adsp-cli-admin';
+// Mirrors nx-adsp's isNonInteractive (utils/agent.ts) — duplicated because nx-oc
+// is the lower-level package and can't import from nx-adsp. Keep them in sync.
+function isNonInteractive() {
+    const argv = process.argv;
+    const interactiveIdx = argv.indexOf('--interactive');
+    const flagged = argv.includes('--no-interactive') ||
+        argv.includes('--interactive=false') ||
+        (interactiveIdx !== -1 && argv[interactiveIdx + 1] === 'false');
+    return flagged || !process.stdout.isTTY || process.env.CI === 'true';
+}
+/** Resolve the `adsp` binary shipped by the @abgov/adsp-cli dependency. */
+function adspCliBinPath() {
+    var _a, _b;
+    const require = (0, module_1.createRequire)(__filename);
+    const pkgJsonPath = require.resolve('@abgov/adsp-cli/package.json');
+    const binRel = (_b = (_a = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf8')).bin) === null || _a === void 0 ? void 0 : _a.adsp) !== null && _b !== void 0 ? _b : 'src/main.js';
+    return path.join(path.dirname(pkgJsonPath), binRel);
+}
+/** Drive the CLI's interactive browser login as a subprocess (the sanctioned way
+ *  to trigger it — the interactive flow is intentionally not a library export).
+ *  stdio is inherited so the browser-open message and the no-args tenant picker
+ *  are visible to the user, exactly like the previous inline flow. */
+function runAdspLogin(options) {
+    const args = ['login', '--env', options.env];
+    if (options.realm)
+        args.push('--realm', options.realm);
+    else if (options.tenant)
+        args.push('--tenant', options.tenant);
+    for (const scope of options.scopes)
+        args.push('--scope', scope);
+    (0, child_process_1.spawnSync)(process.execPath, [adspCliBinPath(), ...args], { stdio: 'inherit' });
+}
+/**
+ * Obtain an ADSP access token via @abgov/adsp-cli. Fast path: a cached/refreshed
+ * token from a prior `adsp login` (no browser). If none — and the run is
+ * interactive — drive `adsp login` (browser) once, then read the fresh token.
+ * In a non-interactive run it never opens a browser; it throws with the exact
+ * `adsp login` command to run instead.
+ *
+ * When `scopes` (e.g. the admin scope) can't be satisfied even after a login —
+ * a user who isn't a realm admin — it falls back to a base-scope token so
+ * non-provisioning steps still proceed (provisioning then degrades via 401/403).
+ */
+function ensureAdspToken(options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const client = new simple_oauth2_1.AuthorizationCode({
-            client: {
-                id: 'nx-adsp-cli',
-                secret: '',
-            },
-            auth: {
-                tokenHost: accessServiceUrl,
-                tokenPath: `/auth/realms/${realm}/protocol/openid-connect/token`,
-                authorizePath: `/auth/realms/${realm}/protocol/openid-connect/auth`,
-            },
+        const { env, realm, tenant, scopes = [] } = options;
+        // Force the CLI to talk to the generator's target environment. Note: we set
+        // ADSP_ENV, never ADSP_TENANT_REALM — the latter would make getStatus() drop
+        // the persisted tenantName (it can't trust a name against an overridden realm).
+        // Default to 'test' (UAT), never 'prod' — matches every generator's schema
+        // default and avoids an accidental production hit if env is ever unset.
+        process.env.ADSP_ENV = env || process.env.ADSP_ENV || 'test';
+        const fetchToken = () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const result = yield (0, adsp_cli_1.getAccessToken)(scopes.length ? { scopes } : undefined);
+            return result.status === 'ok' ? result.token : undefined;
         });
-        // Core realm is only used to fetch the tenant list — not worth caching.
-        if (realm !== 'core') {
-            const cached = (0, token_cache_1.getCachedToken)(accessServiceUrl, realm);
-            if (cached) {
-                if (!(0, token_cache_1.isExpired)(cached)) {
-                    return cached.accessToken;
-                }
-                if (cached.refreshToken) {
-                    try {
-                        const { token } = yield client
-                            .createToken({ access_token: cached.accessToken, refresh_token: cached.refreshToken })
-                            .refresh();
-                        const expiresIn = (_a = token['expires_in']) !== null && _a !== void 0 ? _a : 300;
-                        (0, token_cache_1.setCachedToken)(accessServiceUrl, realm, token['access_token'], token['refresh_token'], expiresIn);
-                        return token['access_token'];
-                    }
-                    catch (_c) {
-                        // Refresh failed — fall through to browser login.
-                    }
-                }
-            }
+        let token = yield fetchToken();
+        if (token)
+            return token;
+        if (isNonInteractive()) {
+            const loginCmd = [
+                'npx @abgov/adsp-cli login',
+                `--env ${env}`,
+                tenant ? `--tenant "${tenant}"` : realm ? `--realm ${realm}` : '',
+                ...scopes.map((s) => `--scope ${s}`),
+            ]
+                .filter(Boolean)
+                .join(' ');
+            throw new Error(`Not signed in to ADSP (non-interactive run). Sign in first with:\n  ${loginCmd}`);
         }
-        const redirect_uri = 'http://localhost:3000/callback';
-        const authorizationUri = client.authorizeURL({
-            redirect_uri,
-            scope: 'email',
-        });
-        const app = express();
-        const tokenPromise = new Promise((resolve, reject) => {
-            app.get('/callback', function (req, res) {
-                const { code, error } = req.query;
-                if (error) {
-                    res.send('Login failed.');
-                    reject(new Error(`Error encountered during login. ${error}`));
-                }
-                else {
-                    res.send('Successfully signed in. You can close this browser tab or window.');
-                    resolve(client.getToken({
-                        code: code,
-                        redirect_uri,
-                    }));
-                }
-            });
-        });
-        const server = app.listen(3000);
-        open(authorizationUri);
-        const { token } = yield Promise.race([
-            tokenPromise,
-            new Promise((_, reject) => setTimeout(() => reject(new Error('Timed out waiting for login.')), 120000)),
-        ]).finally(() => server.close());
-        if (realm !== 'core') {
-            const expiresIn = (_b = token['expires_in']) !== null && _b !== void 0 ? _b : 300;
-            (0, token_cache_1.setCachedToken)(accessServiceUrl, realm, token['access_token'], token['refresh_token'], expiresIn);
+        runAdspLogin({ env, realm, tenant, scopes });
+        token = yield fetchToken();
+        if (token)
+            return token;
+        // The requested scope wasn't granted (e.g. non-admin user). Fall back to a
+        // base-scope token so the rest of generation still works.
+        if (scopes.length) {
+            const base = yield (0, adsp_cli_1.getAccessToken)();
+            if (base.status === 'ok')
+                return base.token;
         }
-        return token['access_token'];
+        return undefined;
     });
 }
 function getServiceUrls(directoryUrl) {
@@ -98,46 +118,29 @@ function getServiceUrls(directoryUrl) {
         return urls;
     });
 }
-function selectTenant(tenantServiceUrl, token) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { data: tenants } = yield axios_1.default.get(new URL('v2/tenants', tenantServiceUrl).href, {
-            headers: { Authorization: `Bearer ${token}` },
-        });
-        const choices = tenants.results
-            .map((r) => r.name)
-            .sort((a, b) => a.localeCompare(b));
-        const result = yield (0, enquirer_1.prompt)({
-            type: 'autocomplete',
-            name: 'tenant',
-            message: 'Which tenant is the application or service for?',
-            choices,
-        });
-        const tenant = tenants.results.find((r) => r.name === result.tenant);
-        return tenant;
-    });
-}
 function getAdspConfiguration(_host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const { env, accessToken } = options;
-        const environment = environments_1.environments[env || 'prod'];
+        const environment = environments_1.environments[env || 'test'];
         if (isAdspOptions(options)) {
             // Adsp configuration already resolved — return it directly.
             return options.adsp;
         }
-        const urls = yield getServiceUrls(environment.directoryServiceUrl);
-        const tenantServiceUrl = urls['urn:ads:platform:tenant-service:v2'];
         if (options.tenant) {
-            // --tenant <name>: look up the realm anonymously, then do a single login
-            // to that realm. The resulting token works for both ADSP configuration
-            // access and the agent-service (which requires a tenant-realm token).
+            // --tenant <name>: resolve the realm anonymously (no token needed), then get
+            // a token for that realm via the CLI. The token works for ADSP configuration
+            // access, the agent-service (agent-user role), and — with the admin scope —
+            // Keycloak client provisioning.
+            const urls = yield getServiceUrls(environment.directoryServiceUrl);
+            const tenantServiceUrl = urls['urn:ads:platform:tenant-service:v2'];
             const { data } = yield axios_1.default.get(new URL('v2/tenants', tenantServiceUrl).href, { params: { name: options.tenant } });
             const found = data.results[0];
             if (!found) {
                 throw new Error(`Tenant '${options.tenant}' not found.`);
             }
             const realm = (_a = options.tenantRealm) !== null && _a !== void 0 ? _a : found.realm;
-            const token = accessToken || (yield realmLogin(environment.accessServiceUrl, realm));
+            const token = accessToken !== null && accessToken !== void 0 ? accessToken : (yield ensureAdspToken({ env, realm, tenant: options.tenant, scopes: [exports.ADSP_ADMIN_SCOPE] }));
             return {
                 tenant: (0, devkit_1.names)(found.name).fileName,
                 tenantRealm: realm,
@@ -146,17 +149,22 @@ function getAdspConfiguration(_host, options) {
                 accessToken: token,
             };
         }
-        else {
-            // Interactive flow: login to core realm, then let the user pick a tenant.
-            const token = accessToken || (yield realmLogin(environment.accessServiceUrl, 'core'));
-            const tenant = yield selectTenant(tenantServiceUrl, token);
-            return {
-                tenant: (0, devkit_1.names)(tenant.name).fileName,
-                tenantRealm: tenant.realm,
-                accessServiceUrl: environment.accessServiceUrl,
-                directoryServiceUrl: environment.directoryServiceUrl,
-            };
+        // No tenant given: let the CLI resolve the tenant (its no-args login lists
+        // tenants and prompts), then read the resolved realm + tenant name back from
+        // its persisted context via getStatus() — no token-passing, no config-file
+        // spelunking.
+        const token = accessToken !== null && accessToken !== void 0 ? accessToken : (yield ensureAdspToken({ env, scopes: [exports.ADSP_ADMIN_SCOPE] }));
+        const status = (0, adsp_cli_1.getStatus)();
+        if (!status.realm) {
+            throw new Error('Could not determine the ADSP tenant. Run `npx @abgov/adsp-cli login` and retry.');
         }
+        return {
+            tenant: (0, devkit_1.names)((_b = status.tenantName) !== null && _b !== void 0 ? _b : status.realm).fileName,
+            tenantRealm: status.realm,
+            accessServiceUrl: environment.accessServiceUrl,
+            directoryServiceUrl: environment.directoryServiceUrl,
+            accessToken: token,
+        };
     });
 }
 function isAdspOptions(options) {

package/src/adsp/adsp-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"adsp-utils.js","sourceRoot":"","sources":["../../../../../packages/nx-oc/src/adsp/adsp-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"adsp-utils.js","sourceRoot":"","sources":["../../../../../packages/nx-oc/src/adsp/adsp-utils.ts"],"names":[],"mappings":"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"}

package/src/adsp/token-cache.d.ts

@@ -1,9 +0,0 @@
-export interface CacheEntry {
-    accessToken: string;
-    refreshToken?: string;
-    expiresAt: string;
-}
-export declare function getCacheFilePath(): string;
-export declare function isExpired(entry: CacheEntry): boolean;
-export declare function getCachedToken(accessServiceUrl: string, realm: string): CacheEntry | null;
-export declare function setCachedToken(accessServiceUrl: string, realm: string, accessToken: string, refreshToken: string | undefined, expiresIn: number): void;

package/src/adsp/token-cache.js

@@ -1,49 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCacheFilePath = getCacheFilePath;
-exports.isExpired = isExpired;
-exports.getCachedToken = getCachedToken;
-exports.setCachedToken = setCachedToken;
-const fs = require("fs");
-const os = require("os");
-const path = require("path");
-const EXPIRY_BUFFER_MS = 60000;
-function getCacheFilePath() {
-    return path.join(os.homedir(), '.nx-adsp', 'token-cache.json');
-}
-function readCache() {
-    try {
-        return JSON.parse(fs.readFileSync(getCacheFilePath(), 'utf-8'));
-    }
-    catch (_a) {
-        return {};
-    }
-}
-function writeCache(cache) {
-    const filePath = getCacheFilePath();
-    const dir = path.dirname(filePath);
-    if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
-    }
-    fs.writeFileSync(filePath, JSON.stringify(cache, null, 2), { mode: 0o600, encoding: 'utf-8' });
-}
-function cacheKey(accessServiceUrl, realm) {
-    return `${accessServiceUrl}::${realm}`;
-}
-function isExpired(entry) {
-    return new Date(entry.expiresAt).getTime() - EXPIRY_BUFFER_MS < Date.now();
-}
-function getCachedToken(accessServiceUrl, realm) {
-    var _a;
-    return (_a = readCache()[cacheKey(accessServiceUrl, realm)]) !== null && _a !== void 0 ? _a : null;
-}
-function setCachedToken(accessServiceUrl, realm, accessToken, refreshToken, expiresIn) {
-    const cache = readCache();
-    cache[cacheKey(accessServiceUrl, realm)] = {
-        accessToken,
-        refreshToken,
-        expiresAt: new Date(Date.now() + expiresIn * 1000).toISOString(),
-    };
-    writeCache(cache);
-}
-//# sourceMappingURL=token-cache.js.map

package/src/adsp/token-cache.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"token-cache.js","sourceRoot":"","sources":["../../../../../packages/nx-oc/src/adsp/token-cache.ts"],"names":[],"mappings":";;AAcA,4CAEC;AAuBD,8BAEC;AAED,wCAEC;AAED,wCAcC;AA7DD,yBAAyB;AACzB,yBAAyB;AACzB,6BAA6B;AAU7B,MAAM,gBAAgB,GAAG,KAAM,CAAC;AAEhC,SAAgB,gBAAgB;IAC9B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,SAAS;IAChB,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,gBAAgB,EAAE,EAAE,OAAO,CAAC,CAAe,CAAC;IAChF,CAAC;IAAC,WAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,KAAiB;IACnC,MAAM,QAAQ,GAAG,gBAAgB,EAAE,CAAC;IACpC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACxB,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACtD,CAAC;IACD,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;AACjG,CAAC;AAED,SAAS,QAAQ,CAAC,gBAAwB,EAAE,KAAa;IACvD,OAAO,GAAG,gBAAgB,KAAK,KAAK,EAAE,CAAC;AACzC,CAAC;AAED,SAAgB,SAAS,CAAC,KAAiB;IACzC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,GAAG,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;AAC7E,CAAC;AAED,SAAgB,cAAc,CAAC,gBAAwB,EAAE,KAAa;;IACpE,OAAO,MAAA,SAAS,EAAE,CAAC,QAAQ,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC,mCAAI,IAAI,CAAC;AAChE,CAAC;AAED,SAAgB,cAAc,CAC5B,gBAAwB,EACxB,KAAa,EACb,WAAmB,EACnB,YAAgC,EAChC,SAAiB;IAEjB,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC;IAC1B,KAAK,CAAC,QAAQ,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC,GAAG;QACzC,WAAW;QACX,YAAY;QACZ,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,IAAI,CAAC,CAAC,WAAW,EAAE;KACjE,CAAC;IACF,UAAU,CAAC,KAAK,CAAC,CAAC;AACpB,CAAC"}

package/src/adsp/token-cache.spec.ts

@@ -1,117 +0,0 @@
-import * as fs from 'fs';
-import * as os from 'os';
-import * as path from 'path';
-import { getCacheFilePath, getCachedToken, isExpired, setCachedToken, CacheEntry } from './token-cache';
-
-jest.mock('fs');
-jest.mock('os');
-
-const mockedFs = jest.mocked(fs);
-const mockedOs = jest.mocked(os);
-
-const FAKE_HOME = '/home/testuser';
-const CACHE_PATH = path.join(FAKE_HOME, '.nx-adsp', 'token-cache.json');
-
-const ACCESS_URL = 'https://access.example.com/auth';
-const REALM = 'my-tenant';
-
-function futureIso(secondsFromNow: number): string {
-  return new Date(Date.now() + secondsFromNow * 1000).toISOString();
-}
-
-function pastIso(secondsAgo: number): string {
-  return new Date(Date.now() - secondsAgo * 1000).toISOString();
-}
-
-describe('getCacheFilePath', () => {
-  it('returns path under home directory', () => {
-    mockedOs.homedir.mockReturnValue(FAKE_HOME);
-    expect(getCacheFilePath()).toBe(CACHE_PATH);
-  });
-});
-
-describe('isExpired', () => {
-  it('returns false when token expires in the future (beyond buffer)', () => {
-    const entry: CacheEntry = { accessToken: 'tok', expiresAt: futureIso(120) };
-    expect(isExpired(entry)).toBe(false);
-  });
-
-  it('returns true when token is past its expiry', () => {
-    const entry: CacheEntry = { accessToken: 'tok', expiresAt: pastIso(10) };
-    expect(isExpired(entry)).toBe(true);
-  });
-
-  it('returns true when token expires within the 60-second buffer', () => {
-    const entry: CacheEntry = { accessToken: 'tok', expiresAt: futureIso(30) };
-    expect(isExpired(entry)).toBe(true);
-  });
-});
-
-describe('getCachedToken', () => {
-  beforeEach(() => {
-    mockedOs.homedir.mockReturnValue(FAKE_HOME);
-  });
-
-  it('returns null when cache file does not exist', () => {
-    mockedFs.readFileSync.mockImplementation(() => { throw new Error('ENOENT'); });
-    expect(getCachedToken(ACCESS_URL, REALM)).toBeNull();
-  });
-
-  it('returns null when realm is not in cache', () => {
-    mockedFs.readFileSync.mockReturnValue(JSON.stringify({ 'other::realm': { accessToken: 'x', expiresAt: futureIso(3600) } }));
-    expect(getCachedToken(ACCESS_URL, REALM)).toBeNull();
-  });
-
-  it('returns the cached entry when present', () => {
-    const entry: CacheEntry = { accessToken: 'abc', refreshToken: 'ref', expiresAt: futureIso(3600) };
-    const key = `${ACCESS_URL}::${REALM}`;
-    mockedFs.readFileSync.mockReturnValue(JSON.stringify({ [key]: entry }));
-
-    expect(getCachedToken(ACCESS_URL, REALM)).toEqual(entry);
-  });
-});
-
-describe('setCachedToken', () => {
-  beforeEach(() => {
-    mockedOs.homedir.mockReturnValue(FAKE_HOME);
-    mockedFs.existsSync.mockReturnValue(true);
-    mockedFs.readFileSync.mockImplementation(() => { throw new Error('ENOENT'); });
-    (mockedFs.writeFileSync as jest.Mock).mockReset();
-    (mockedFs.mkdirSync as jest.Mock).mockReset();
-  });
-
-  it('writes a new entry with correct fields', () => {
-    setCachedToken(ACCESS_URL, REALM, 'access-tok', 'refresh-tok', 3600);
-
-    expect(mockedFs.writeFileSync).toHaveBeenCalledWith(
-      CACHE_PATH,
-      expect.stringContaining('"accessToken": "access-tok"'),
-      expect.objectContaining({ mode: 0o600 })
-    );
-
-    const written = JSON.parse((mockedFs.writeFileSync as jest.Mock).mock.calls[0][1] as string);
-    const entry = written[`${ACCESS_URL}::${REALM}`];
-    expect(entry.accessToken).toBe('access-tok');
-    expect(entry.refreshToken).toBe('refresh-tok');
-    expect(new Date(entry.expiresAt).getTime()).toBeGreaterThan(Date.now() + 3590 * 1000);
-  });
-
-  it('writes without refreshToken when not provided', () => {
-    setCachedToken(ACCESS_URL, REALM, 'access-tok', undefined, 3600);
-
-    const written = JSON.parse((mockedFs.writeFileSync as jest.Mock).mock.calls[0][1] as string);
-    const entry = written[`${ACCESS_URL}::${REALM}`];
-    expect(entry.refreshToken).toBeUndefined();
-  });
-
-  it('creates the cache directory if it does not exist', () => {
-    mockedFs.existsSync.mockReturnValue(false);
-
-    setCachedToken(ACCESS_URL, REALM, 'tok', undefined, 300);
-
-    expect(mockedFs.mkdirSync).toHaveBeenCalledWith(
-      path.dirname(CACHE_PATH),
-      expect.objectContaining({ recursive: true, mode: 0o700 })
-    );
-  });
-});