@prisma/cli 3.0.0-dev.93.1 → 3.0.0-dev.97.1

package/dist/adapters/token-storage.js

@@ -11,6 +11,7 @@ const EMPTY_AUTH_CONTEXT = {
 	activeWorkspaceId: null,
 	workspaces: {}
 };
+const UNKNOWN_WORKSPACE_NAME = "Unknown workspace";
 function getAuthContextFilePath(authFilePath) {
 	const extension = path.extname(authFilePath);
 	if (!extension) return `${authFilePath}.context.json`;
@@ -140,7 +141,7 @@ var FileTokenStorage = class {
 		return credentials.map((credential) => storedCredentialToTokens(credential)).filter((tokens) => tokens !== null).map((tokens) => {
 			const cached = context.state.workspaces[tokens.workspaceId];
 			const id = typeof cached?.id === "string" && cached.id.trim().length > 0 ? cached.id.trim() : tokens.workspaceId;
-			const name = typeof cached?.name === "string" && cached.name.trim().length > 0 ? cached.name.trim() : id;
+			const name = typeof cached?.name === "string" && cached.name.trim().length > 0 ? workspaceDisplayName(cached.name.trim(), tokens.workspaceId) : UNKNOWN_WORKSPACE_NAME;
 			const lastSeenAt = typeof cached?.lastSeenAt === "string" && cached.lastSeenAt.trim().length > 0 ? cached.lastSeenAt.trim() : null;
 			return {
 				id,
@@ -151,6 +152,10 @@ var FileTokenStorage = class {
 			};
 		});
 	}
+	async listWorkspaceTokens() {
+		this.signal?.throwIfAborted();
+		return (await this.readCredentialsFromDisk()).map((credential) => storedCredentialToTokens(credential)).filter((tokens) => tokens !== null);
+	}
 	async useWorkspace(workspaceRef) {
 		return this.withRefreshLock(() => this.useWorkspaceUnlocked(workspaceRef));
 	}
@@ -406,5 +411,8 @@ function workspaceMatchesRef(workspace, ref) {
 function stripWorkspacePrefix(value) {
 	return value.startsWith("wksp_") ? value.slice(5) : value;
 }
+function workspaceDisplayName(name, credentialWorkspaceId) {
+	return name === credentialWorkspaceId ? UNKNOWN_WORKSPACE_NAME : name;
+}
 //#endregion
 export { FileTokenStorage, WorkspaceSelectionError };

package/dist/commands/auth/index.js

@@ -1,7 +1,7 @@
 import { attachCommandDescriptor } from "../../shell/command-meta.js";
 import { addCompactGlobalFlags, addGlobalFlags } from "../../shell/global-flags.js";
 import { configureRuntimeCommand } from "../../shell/runtime.js";
-import { runAuthLogin, runAuthLogout, runAuthWhoAmI, runAuthWorkspaceList, runAuthWorkspaceLogout, runAuthWorkspaceSelect, runAuthWorkspaceUse } from "../../controllers/auth.js";
+import { runAuthLogin, runAuthLogout, runAuthWhoAmI, runAuthWorkspaceList, runAuthWorkspaceLogout, runAuthWorkspaceUse } from "../../controllers/auth.js";
 import { runCommand } from "../../shell/command-runner.js";
 import { renderAuthSuccess, renderAuthWorkspaceList, renderAuthWorkspaceLogout, renderAuthWorkspaceUse, serializeAuthWorkspaceList, serializeAuthWorkspaceLogout, serializeAuthWorkspaceUse } from "../../presenters/auth.js";
 import { Command, Option } from "commander";
@@ -54,7 +54,6 @@ function createAuthWorkspaceCommand(runtime) {
 	addCompactGlobalFlags(workspace);
 	workspace.addCommand(createAuthWorkspaceListCommand(runtime));
 	workspace.addCommand(createAuthWorkspaceUseCommand(runtime));
-	workspace.addCommand(createAuthWorkspaceSelectCommand(runtime));
 	workspace.addCommand(createAuthWorkspaceLogoutCommand(runtime));
 	return workspace;
 }
@@ -69,17 +68,6 @@ function createAuthWorkspaceListCommand(runtime) {
 	});
 	return command;
 }
-function createAuthWorkspaceSelectCommand(runtime) {
-	const command = attachCommandDescriptor(configureRuntimeCommand(new Command("select"), runtime), "auth.workspace.select");
-	addGlobalFlags(command);
-	command.action(async (options) => {
-		await runCommand(runtime, "auth.workspace.select", options, (context) => runAuthWorkspaceSelect(context), {
-			renderHuman: (context, descriptor, result) => renderAuthWorkspaceUse(context, descriptor, result),
-			renderJson: (result) => serializeAuthWorkspaceUse(result)
-		});
-	});
-	return command;
-}
 function createAuthWorkspaceLogoutCommand(runtime) {
 	const command = attachCommandDescriptor(configureRuntimeCommand(new Command("logout"), runtime), "auth.workspace.logout");
 	command.argument("<id-or-name>", "Workspace id or exact name");
@@ -94,7 +82,7 @@ function createAuthWorkspaceLogoutCommand(runtime) {
 }
 function createAuthWorkspaceUseCommand(runtime) {
 	const command = attachCommandDescriptor(configureRuntimeCommand(new Command("use"), runtime), "auth.workspace.use");
-	command.argument("<id-or-name>", "Workspace id or exact name");
+	command.argument("[id-or-name]", "Workspace id or exact name");
 	addGlobalFlags(command);
 	command.action(async (workspaceRef, options) => {
 		await runCommand(runtime, "auth.workspace.use", options, (context) => runAuthWorkspaceUse(context, typeof workspaceRef === "string" ? workspaceRef : void 0), {

package/dist/controllers/auth.js

@@ -1,4 +1,4 @@
-import { SERVICE_TOKEN_ENV_VAR } from "../lib/auth/client.js";
+import { CLIENT_ID, SERVICE_TOKEN_ENV_VAR, getApiBaseUrl } from "../lib/auth/client.js";
 import { FileTokenStorage, WorkspaceSelectionError } from "../adapters/token-storage.js";
 import { authRequiredError, usageError, workspaceAmbiguousError, workspaceNotAuthenticatedError, workspaceSwitchUnavailableError } from "../shell/errors.js";
 import { canPrompt } from "../shell/runtime.js";
@@ -6,6 +6,7 @@ import { performLogin, performLogout, readAuthState } from "../lib/auth/auth-ops
 import { createAuthUseCases } from "../use-cases/auth.js";
 import { createCliUseCaseGateways } from "../use-cases/create-cli-gateways.js";
 import { createSelectPromptPort } from "./select-prompt-port.js";
+import { createManagementApiSdk } from "@prisma/management-api-sdk";
 //#region src/controllers/auth.ts
 function isRealMode(context) {
 	return !context.runtime.fixturePath && !context.runtime.env.PRISMA_CLI_MOCK_FIXTURE_PATH;
@@ -42,20 +43,15 @@ async function runAuthWorkspaceList(context) {
 	};
 }
 async function runAuthWorkspaceUse(context, workspaceRef) {
-	if (!workspaceRef?.trim()) throw usageError("Workspace required", "auth workspace use needs a workspace id or cached workspace name.", "Pass a workspace from prisma-cli auth workspace list.", ["prisma-cli auth workspace list"], "auth");
+	const trimmedWorkspaceRef = workspaceRef?.trim();
+	const selectedWorkspaceRef = trimmedWorkspaceRef ? trimmedWorkspaceRef : await selectWorkspaceSession(context);
 	return {
 		command: "auth.workspace.use",
-		result: isRealMode(context) ? await useRealAuthWorkspace(context, workspaceRef) : await createAuthUseCases(createCliUseCaseGateways(context)).useWorkspace(workspaceRef),
+		result: isRealMode(context) ? await useRealAuthWorkspace(context, selectedWorkspaceRef) : await createAuthUseCases(createCliUseCaseGateways(context)).useWorkspace(selectedWorkspaceRef),
 		warnings: [],
 		nextSteps: ["prisma-cli auth whoami", "prisma-cli project list"]
 	};
 }
-async function runAuthWorkspaceSelect(context) {
-	return {
-		...await runAuthWorkspaceUse(context, await selectWorkspaceSession(context)),
-		command: "auth.workspace.select"
-	};
-}
 async function runAuthWorkspaceLogout(context, workspaceRef) {
 	if (!workspaceRef?.trim()) throw usageError("Workspace required", "auth workspace logout needs a workspace id or cached workspace name.", "Pass a workspace from prisma-cli auth workspace list.", ["prisma-cli auth workspace list"], "auth");
 	const result = isRealMode(context) ? await logoutRealAuthWorkspace(context, workspaceRef) : await createAuthUseCases(createCliUseCaseGateways(context)).logoutWorkspace(workspaceRef);
@@ -82,7 +78,8 @@ async function requireAuthenticatedAuthState(context) {
 }
 async function listRealAuthWorkspaces(context) {
 	const rawServiceToken = context.runtime.env[SERVICE_TOKEN_ENV_VAR];
-	const localWorkspaces = await new FileTokenStorage(context.runtime.env, context.runtime.signal).listWorkspaces();
+	const storage = new FileTokenStorage(context.runtime.env, context.runtime.signal);
+	const localWorkspaces = await hydrateLocalAuthWorkspaces(context, storage, await storage.listWorkspaces());
 	if (rawServiceToken !== void 0) {
 		const authState = await readAuthState(context.runtime.env, context.runtime.signal);
 		return {
@@ -122,6 +119,7 @@ async function listRealAuthWorkspaces(context) {
 async function useRealAuthWorkspace(context, workspaceRef) {
 	if (context.runtime.env["PRISMA_SERVICE_TOKEN"] !== void 0) throw workspaceSwitchUnavailableError();
 	const storage = new FileTokenStorage(context.runtime.env, context.runtime.signal);
+	await hydrateLocalAuthWorkspaces(context, storage, await storage.listWorkspaces());
 	try {
 		const result = await storage.useWorkspace(workspaceRef);
 		return {
@@ -142,6 +140,7 @@ async function useRealAuthWorkspace(context, workspaceRef) {
 }
 async function logoutRealAuthWorkspace(context, workspaceRef) {
 	const storage = new FileTokenStorage(context.runtime.env, context.runtime.signal);
+	await hydrateLocalAuthWorkspaces(context, storage, await storage.listWorkspaces());
 	try {
 		const result = await storage.logoutWorkspace(workspaceRef);
 		return {
@@ -167,7 +166,7 @@ async function selectWorkspaceSession(context) {
 	const workspaces = (realMode ? await listRealAuthWorkspaces(context) : await createAuthUseCases(createCliUseCaseGateways(context)).listWorkspaces()).workspaces.filter((workspace) => workspace.switchable);
 	if (workspaces.length === 0) throw usageError("No authenticated workspaces", "There are no local OAuth workspace sessions to select.", "Run prisma-cli auth login and authorize a workspace.", ["prisma-cli auth login"], "auth");
 	if (workspaces.length === 1) return workspaces[0].id;
-	if (!canPrompt(context)) throw usageError("Interactive workspace selection unavailable", "auth workspace select needs an interactive terminal when more than one workspace is available.", "Run prisma-cli auth workspace use <id-or-name> with a workspace from prisma-cli auth workspace list.", ["prisma-cli auth workspace list"], "auth");
+	if (!canPrompt(context)) throw usageError("Interactive workspace selection unavailable", "auth workspace use needs an interactive terminal when no workspace is provided and more than one workspace is available.", "Run prisma-cli auth workspace use <id-or-name> with a workspace from prisma-cli auth workspace list.", ["prisma-cli auth workspace list"], "auth");
 	return (await createSelectPromptPort(context).select({
 		message: "Select a workspace",
 		choices: workspaces.map((workspace) => ({
@@ -176,6 +175,78 @@ async function selectWorkspaceSession(context) {
 		}))
 	})).id;
 }
+async function hydrateLocalAuthWorkspaces(context, storage, workspaces) {
+	const candidates = workspaces.filter(needsWorkspaceMetadataHydration);
+	if (candidates.length === 0) return workspaces;
+	const tokensByCredentialWorkspaceId = new Map((await storage.listWorkspaceTokens()).map((tokens) => [tokens.workspaceId, tokens]));
+	let nextWorkspaces = workspaces;
+	for (const workspace of candidates) {
+		const tokens = tokensByCredentialWorkspaceId.get(workspace.credentialWorkspaceId);
+		if (!tokens) continue;
+		const resolved = await resolveOAuthWorkspaceMetadata(context, tokens);
+		if (!resolved) continue;
+		await rememberResolvedWorkspaceMetadata(context, storage, tokens, resolved);
+		nextWorkspaces = nextWorkspaces.map((candidate) => candidate.credentialWorkspaceId === workspace.credentialWorkspaceId ? {
+			...candidate,
+			id: resolved.id,
+			name: resolved.name,
+			lastSeenAt: (/* @__PURE__ */ new Date()).toISOString()
+		} : candidate);
+	}
+	return nextWorkspaces;
+}
+async function rememberResolvedWorkspaceMetadata(context, storage, tokens, resolved) {
+	try {
+		await storage.rememberWorkspace(tokens.workspaceId, resolved);
+	} catch {
+		context.runtime.signal?.throwIfAborted();
+	}
+}
+function needsWorkspaceMetadataHydration(workspace) {
+	return workspace.id === workspace.credentialWorkspaceId || workspace.name === "Unknown workspace" || workspace.name === workspace.credentialWorkspaceId;
+}
+async function resolveOAuthWorkspaceMetadata(context, tokens) {
+	const sdk = createManagementApiSdk({
+		clientId: CLIENT_ID,
+		redirectUri: "http://localhost:0/auth/callback",
+		tokenStorage: createSingleWorkspaceTokenStorage(new FileTokenStorage(context.runtime.env, context.runtime.signal, { activateOnSetTokens: false }), tokens),
+		apiBaseUrl: getApiBaseUrl(context.runtime.env)
+	});
+	try {
+		const { data } = await sdk.client.GET("/v1/workspaces/{id}", {
+			params: { path: { id: tokens.workspaceId } },
+			signal: context.runtime.signal
+		});
+		const id = stringOrNull(data?.data?.id) ?? tokens.workspaceId;
+		const name = stringOrNull(data?.data?.name) ?? id;
+		if (id === tokens.workspaceId && name === tokens.workspaceId) return null;
+		return {
+			id,
+			name
+		};
+	} catch {
+		context.runtime.signal?.throwIfAborted();
+		return null;
+	}
+}
+function createSingleWorkspaceTokenStorage(storage, initialTokens) {
+	let currentTokens = initialTokens;
+	return {
+		getTokens: async () => currentTokens,
+		setTokens: async (tokens) => {
+			currentTokens = tokens;
+			await storage.setTokens(tokens);
+		},
+		clearTokens: async () => {
+			const tokens = currentTokens;
+			currentTokens = null;
+			if (tokens) await storage.clearTokensIfCurrent(tokens);
+		}
+	};
+}
+function stringOrNull(value) {
+	return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
+}
 function toAuthWorkspace(workspace) {
 	return {
 		id: workspace.id,
@@ -242,4 +313,4 @@ function createAuthSuccess(command, result, nextSteps) {
 	};
 }
 //#endregion
-export { requireAuthenticatedAuthState, runAuthLogin, runAuthLogout, runAuthWhoAmI, runAuthWorkspaceList, runAuthWorkspaceLogout, runAuthWorkspaceSelect, runAuthWorkspaceUse };
+export { requireAuthenticatedAuthState, runAuthLogin, runAuthLogout, runAuthWhoAmI, runAuthWorkspaceList, runAuthWorkspaceLogout, runAuthWorkspaceUse };

package/dist/shell/command-meta.js

@@ -60,7 +60,7 @@ const DESCRIPTORS = [
 		description: "Manage local authenticated workspaces",
 		examples: [
 			"prisma-cli auth workspace list",
-			"prisma-cli auth workspace select",
+			"prisma-cli auth workspace use",
 			"prisma-cli auth workspace use wksp_123",
 			"prisma-cli auth workspace logout wksp_123"
 		]
@@ -85,18 +85,11 @@ const DESCRIPTORS = [
 			"use"
 		],
 		description: "Switch the local CLI workspace",
-		examples: ["prisma-cli auth workspace use wksp_123", "prisma-cli auth workspace use \"Acme Inc\""]
-	},
-	{
-		id: "auth.workspace.select",
-		path: [
-			"prisma",
-			"auth",
-			"workspace",
-			"select"
-		],
-		description: "Interactively select the local CLI workspace",
-		examples: ["prisma-cli auth workspace select"]
+		examples: [
+			"prisma-cli auth workspace use",
+			"prisma-cli auth workspace use wksp_123",
+			"prisma-cli auth workspace use \"Acme Inc\""
+		]
 	},
 	{
 		id: "auth.workspace.logout",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/cli",
-  "version": "3.0.0-dev.93.1",
+  "version": "3.0.0-dev.97.1",
   "description": "Command-line interface for the Prisma Developer Platform.",
   "type": "module",
   "bin": {