doomain 0.1.3 → 0.1.5

package/dist/commands/wizard.js

@@ -12,7 +12,6 @@ import { listGlobalVercelTokens } from '../lib/vercel-auth.js';
 import { createVercelClient } from '../lib/vercel.js';
 const PERSONAL_ACCOUNT = '__personal__';
 const NEW_TOKEN = '__new_token__';
-const SAVED_TOKEN = '__saved_token__';
 function cancelIfNeeded(value) {
     if (p.isCancel(value)) {
         p.cancel('Cancelled');
@@ -111,23 +110,21 @@ function teamLabel(team) {
 function globalTokenLabel(token) {
     return token.source === 'environment' ? `Use ${token.label}` : `Use ${token.label} token`;
 }
-async function promptVercelToken(globalTokens, savedToken) {
+function isVercelAuthError(error) {
+    return error instanceof DoomainError && error.code === 'VERCEL_AUTH_FAILED';
+}
+async function promptVercelToken(globalTokens) {
     if (globalTokens.length > 0) {
         const selected = await p.select({
             message: 'Vercel token',
             options: [
                 ...globalTokens.map((token, index) => ({ label: globalTokenLabel(token), value: String(index), hint: maskSecret(token.token) })),
-                ...(savedToken && !globalTokens.some((token) => token.token === savedToken)
-                    ? [{ label: 'Use saved Doomain token', value: SAVED_TOKEN, hint: maskSecret(savedToken) }]
-                    : []),
                 { label: 'Enter a new token', value: NEW_TOKEN },
             ],
         });
         const resolved = cancelIfNeeded(selected);
         if (resolved === null)
             return null;
-        if (resolved === SAVED_TOKEN)
-            return savedToken ?? null;
         if (resolved !== NEW_TOKEN)
             return globalTokens[Number(resolved)]?.token ?? null;
     }
@@ -156,39 +153,58 @@ export default class Wizard extends Command {
             const config = await loadConfig();
             const providerDefinitions = listProviderDefinitions();
             const localProject = detectLocalVercelProject();
-            const globalVercelTokens = await listGlobalVercelTokens();
             let vercelToken = config.vercel?.token;
             let vercelTeamId = process.env.VERCEL_TEAM_ID || localProject?.orgId || config.vercel?.teamId;
             const defaultProvider = process.env.DOOMAIN_PROVIDER || config.defaults?.provider;
             const defaultDomain = process.env.DOOMAIN_DOMAIN || config.defaults?.domain;
-            if (globalVercelTokens.length > 0 || !vercelToken) {
-                vercelToken = (await promptVercelToken(globalVercelTokens, vercelToken)) ?? undefined;
+            let globalVercelTokens = [];
+            if (!vercelToken) {
+                globalVercelTokens = await listGlobalVercelTokens();
+                vercelToken = (await promptVercelToken(globalVercelTokens)) ?? undefined;
                 if (!vercelToken)
                     return;
             }
-            const teamSpinner = p.spinner();
             let teams = [];
-            if (process.env.VERCEL_TEAM_ID) {
-                p.log.info(`Using Vercel team ${vercelTeamId} from VERCEL_TEAM_ID.`);
-            }
-            else {
-                activeSpinner = teamSpinner;
-                teamSpinner.start('Loading Vercel teams');
-                teams = await createVercelClient({ token: vercelToken }).listTeams();
-                teamSpinner.stop(`Loaded ${teams.length} Vercel team${teams.length === 1 ? '' : 's'}`);
-                activeSpinner = undefined;
-                const selected = await p.select({
-                    message: 'Select Vercel account/team',
-                    initialValue: vercelTeamId ?? localProject?.orgId ?? PERSONAL_ACCOUNT,
-                    options: [
-                        { label: 'Personal account', value: PERSONAL_ACCOUNT, hint: 'No team id' },
-                        ...teams.map((team) => ({ label: teamLabel(team), value: team.id, hint: team.role ?? team.slug })),
-                    ],
-                });
-                const resolved = cancelIfNeeded(selected);
-                if (resolved === null)
-                    return;
-                vercelTeamId = resolved === PERSONAL_ACCOUNT ? undefined : resolved;
+            while (true) {
+                const teamSpinner = p.spinner();
+                try {
+                    if (process.env.VERCEL_TEAM_ID) {
+                        p.log.info(`Using Vercel team ${vercelTeamId} from VERCEL_TEAM_ID.`);
+                    }
+                    else {
+                        activeSpinner = teamSpinner;
+                        teamSpinner.start('Loading Vercel teams');
+                        teams = await createVercelClient({ token: vercelToken }).listTeams();
+                        teamSpinner.stop(`Loaded ${teams.length} Vercel team${teams.length === 1 ? '' : 's'}`);
+                        activeSpinner = undefined;
+                        const selected = await p.select({
+                            message: 'Select Vercel account/team',
+                            initialValue: vercelTeamId ?? localProject?.orgId ?? PERSONAL_ACCOUNT,
+                            options: [
+                                { label: 'Personal account', value: PERSONAL_ACCOUNT, hint: 'No team id' },
+                                ...teams.map((team) => ({ label: teamLabel(team), value: team.id, hint: team.role ?? team.slug })),
+                            ],
+                        });
+                        const resolved = cancelIfNeeded(selected);
+                        if (resolved === null)
+                            return;
+                        vercelTeamId = resolved === PERSONAL_ACCOUNT ? undefined : resolved;
+                    }
+                    break;
+                }
+                catch (error) {
+                    if (!isVercelAuthError(error) || process.env.VERCEL_TOKEN)
+                        throw error;
+                    activeSpinner?.error('Vercel authorization failed');
+                    activeSpinner = undefined;
+                    p.log.warning(error instanceof Error ? error.message : String(error));
+                    if (globalVercelTokens.length === 0)
+                        globalVercelTokens = await listGlobalVercelTokens();
+                    globalVercelTokens = globalVercelTokens.filter((token) => token.token !== vercelToken);
+                    vercelToken = (await promptVercelToken(globalVercelTokens)) ?? undefined;
+                    if (!vercelToken)
+                        return;
+                }
             }
             const selectedTeam = teams.find((team) => team.id === vercelTeamId);
             const teamDisplay = vercelTeamId ? teamLabel(selectedTeam ?? { id: vercelTeamId, name: null, role: null, slug: vercelTeamId }) : 'Personal account';

package/dist/lib/errors.d.ts

@@ -1,4 +1,4 @@
-export type DoomainErrorCode = 'CONFIG_NOT_FOUND' | 'DOMAIN_LINK_FAILED' | 'DOMAIN_ALREADY_ASSIGNED' | 'DOMAIN_VERIFY_FAILED' | 'INVALID_INPUT' | 'MISSING_ARGUMENT' | 'MISSING_CREDENTIALS' | 'PROVIDER_API_ERROR' | 'PROVIDER_AUTH_FAILED' | 'PROVIDER_PERMISSION_DENIED' | 'PROVIDER_NOT_FOUND' | 'PROVIDER_RATE_LIMITED' | 'PROVIDER_RECORD_CONFLICT' | 'PROVIDER_UNSUPPORTED_RECORD' | 'PROVIDER_ZONE_AMBIGUOUS' | 'PROVIDER_ZONE_NOT_FOUND' | 'PROJECT_NOT_FOUND' | 'VERCEL_PROJECT_NOT_LINKED';
+export type DoomainErrorCode = 'CONFIG_NOT_FOUND' | 'DOMAIN_LINK_FAILED' | 'DOMAIN_ALREADY_ASSIGNED' | 'DOMAIN_VERIFY_FAILED' | 'INVALID_INPUT' | 'MISSING_ARGUMENT' | 'MISSING_CREDENTIALS' | 'PROVIDER_API_ERROR' | 'PROVIDER_AUTH_FAILED' | 'PROVIDER_PERMISSION_DENIED' | 'PROVIDER_NOT_FOUND' | 'PROVIDER_RATE_LIMITED' | 'PROVIDER_RECORD_CONFLICT' | 'PROVIDER_UNSUPPORTED_RECORD' | 'PROVIDER_ZONE_AMBIGUOUS' | 'PROVIDER_ZONE_NOT_FOUND' | 'PROJECT_NOT_FOUND' | 'VERCEL_AUTH_FAILED' | 'VERCEL_PROJECT_NOT_LINKED';
 export declare class DoomainError extends Error {
     readonly code: DoomainErrorCode;
     readonly details?: unknown;

package/dist/lib/vercel.js

@@ -22,6 +22,13 @@ function appendTeam(path, teamId) {
 function apiErrorMessage(status, body) {
     return body?.error?.message ?? `Vercel API error (${status}).`;
 }
+function vercelAuthErrorMessage(body) {
+    const message = body?.error?.message;
+    if (!message || message.toLowerCase() === 'not authorized') {
+        return 'Vercel token is not authorized. Run `vercel login` again or enter a token from https://vercel.com/account/tokens.';
+    }
+    return `Vercel authorization failed: ${message}`;
+}
 function isDomainConflictError(error) {
     if (!(error instanceof DoomainError))
         return false;
@@ -52,6 +59,9 @@ export function createVercelClient(config) {
         });
         if (!response.ok) {
             const body = (await response.json().catch(() => undefined));
+            if (response.status === 401 || response.status === 403) {
+                throw new DoomainError('VERCEL_AUTH_FAILED', vercelAuthErrorMessage(body), body);
+            }
             throw new DoomainError('DOMAIN_LINK_FAILED', apiErrorMessage(response.status, body), body);
         }
         if (response.status === 204)

package/oclif.manifest.json

@@ -335,6 +335,39 @@
         "list.js"
       ]
     },
+    "auth:logout:vercel": {
+      "aliases": [],
+      "args": {},
+      "description": "Remove saved Vercel credentials locally.",
+      "examples": [
+        "<%= config.bin %> <%= command.id %>",
+        "<%= config.bin %> <%= command.id %> --json"
+      ],
+      "flags": {
+        "json": {
+          "description": "Output a single JSON object and never prompt.",
+          "name": "json",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "auth:logout:vercel",
+      "pluginAlias": "doomain",
+      "pluginName": "doomain",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": true,
+      "relativePath": [
+        "dist",
+        "commands",
+        "auth",
+        "logout",
+        "vercel.js"
+      ]
+    },
     "providers:add": {
       "aliases": [],
       "args": {
@@ -594,40 +627,7 @@
         "providers",
         "verify.js"
       ]
-    },
-    "auth:logout:vercel": {
-      "aliases": [],
-      "args": {},
-      "description": "Remove saved Vercel credentials locally.",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>",
-        "<%= config.bin %> <%= command.id %> --json"
-      ],
-      "flags": {
-        "json": {
-          "description": "Output a single JSON object and never prompt.",
-          "name": "json",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "auth:logout:vercel",
-      "pluginAlias": "doomain",
-      "pluginName": "doomain",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "auth",
-        "logout",
-        "vercel.js"
-      ]
     }
   },
-  "version": "0.1.3"
+  "version": "0.1.5"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "doomain",
   "description": "Link your vercel project and domain in seconds",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "author": "Crafter Station",
   "packageManager": "bun@1.3.13",
   "bin": {