@prisma/cli 3.0.0-dev.33.1 → 3.0.0-dev.37.1

package/dist/lib/auth/auth-ops.js

@@ -42,41 +42,52 @@ async function readAuthState(env) {
 		authenticated: false,
 		provider: null,
 		user: null,
-		workspace: null
+		workspace: null,
+		credential: null
 	};
+	const client = await requireComputeAuth(env);
+	const currentPrincipal = await readCurrentPrincipalAuthState(client);
+	if (currentPrincipal) return currentPrincipal;
 	const claims = decodeJwtPayload(tokens.accessToken);
 	return buildAuthState({
 		workspaceIdFromCredential: tokens.workspaceId,
 		claims,
-		env
+		env,
+		client
 	});
 }
 async function readServiceTokenAuthState(token, env) {
+	const client = await requireComputeAuth(env);
+	const currentPrincipal = await readCurrentPrincipalAuthState(client);
+	if (currentPrincipal) return currentPrincipal;
 	const claims = decodeJwtPayload(token);
 	const workspaceId = workspaceIdFromClaims(claims);
 	if (!workspaceId) return {
 		authenticated: false,
 		provider: null,
 		user: null,
-		workspace: null
+		workspace: null,
+		credential: null
 	};
 	return buildAuthState({
 		workspaceIdFromCredential: workspaceId,
 		claims,
-		env
+		env,
+		client
 	});
 }
-async function buildAuthState({ workspaceIdFromCredential, claims, env }) {
+async function buildAuthState({ workspaceIdFromCredential, claims, env, client }) {
 	let workspaceId = workspaceIdFromCredential;
 	let workspaceName = workspaceIdFromCredential;
-	const client = await requireComputeAuth(env);
+	client ??= await requireComputeAuth(env);
 	if (client) try {
 		const { data, response } = await client.GET("/v1/workspaces/{id}", { params: { path: { id: workspaceIdFromCredential } } });
 		if (response?.status === 401) return {
 			authenticated: false,
 			provider: null,
 			user: null,
-			workspace: null
+			workspace: null,
+			credential: null
 		};
 		if (data?.data?.id) {
 			workspaceId = data.data.id;
@@ -92,9 +103,39 @@ async function buildAuthState({ workspaceIdFromCredential, claims, env }) {
 		workspace: {
 			id: workspaceId,
 			name: workspaceName
-		}
+		},
+		credential: null
 	};
 }
+async function readCurrentPrincipalAuthState(client) {
+	if (!client) return null;
+	try {
+		const { data, response } = await client.GET("/v1/me");
+		if (response?.status === 401) return {
+			authenticated: false,
+			provider: null,
+			user: null,
+			workspace: null,
+			credential: null
+		};
+		const principal = data?.data;
+		if (!principal) return null;
+		if (!principal.credential) return null;
+		return {
+			authenticated: true,
+			provider: null,
+			user: principal.user ? {
+				id: principal.user.id,
+				email: principal.user.email,
+				name: principal.user.name
+			} : null,
+			workspace: principal.workspace,
+			credential: principal.credential
+		};
+	} catch {
+		return null;
+	}
+}
 async function performLogout(env) {
 	await new FileTokenStorage(env).clearTokens();
 }

package/dist/presenters/auth.js

@@ -7,9 +7,10 @@ function renderAuthSuccess(context, descriptor, command, result) {
 			key: "provider",
 			value: providerLabel(result.provider)
 		});
-		if (result.user) rows.push({
+		const userLabel = authUserLabel(result);
+		if (userLabel) rows.push({
 			key: "user",
-			value: result.user.email
+			value: userLabel
 		});
 		if (result.workspace?.name) rows.push({
 			key: "workspace",
@@ -45,10 +46,7 @@ function renderAuthSuccess(context, descriptor, command, result) {
 				value: "signed in",
 				tone: "success"
 			},
-			...result.user ? [{
-				key: "user",
-				value: result.user.email
-			}] : [],
+			...authUserRows(result),
 			...result.provider ? [{
 				key: "provider",
 				value: providerLabel(result.provider)
@@ -69,5 +67,20 @@ function providerLabel(provider) {
 	if (provider === "google") return "Google";
 	return "";
 }
+function authUserLabel(result) {
+	return result.user?.email ?? credentialUserLabel(result);
+}
+function authUserRows(result) {
+	const userLabel = authUserLabel(result);
+	return userLabel ? [{
+		key: "user",
+		value: userLabel
+	}] : [];
+}
+function credentialUserLabel(result) {
+	if (result.credential?.type === "service_token") return result.credential.name ? `<service token: ${result.credential.name}>` : "<service token>";
+	if (result.credential?.type === "management_token") return result.credential.name ? `<management token: ${result.credential.name}>` : "<management token>";
+	return null;
+}
 //#endregion
 export { renderAuthSuccess };

package/dist/use-cases/auth.js

@@ -45,7 +45,8 @@ async function resolveCurrentAuthState(dependencies) {
 		authenticated: false,
 		provider: null,
 		user: null,
-		workspace: null
+		workspace: null,
+		credential: null
 	};
 	const provider = dependencies.identityGateway.getProvider(session.provider);
 	const user = dependencies.identityGateway.getUser(session.userId);
@@ -54,13 +55,23 @@ async function resolveCurrentAuthState(dependencies) {
 		authenticated: false,
 		provider: null,
 		user: null,
-		workspace: null
+		workspace: null,
+		credential: null
 	};
 	return {
 		authenticated: true,
 		provider: provider.id,
-		user: { email: user.email },
-		workspace
+		user: {
+			id: user.id,
+			email: user.email,
+			name: user.name
+		},
+		workspace,
+		credential: {
+			type: "oauth",
+			id: null,
+			name: null
+		}
 	};
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/cli",
-  "version": "3.0.0-dev.33.1",
+  "version": "3.0.0-dev.37.1",
   "description": "Command-line interface for the Prisma Developer Platform.",
   "type": "module",
   "bin": {
@@ -39,7 +39,7 @@
     "@prisma/compute-sdk": "^0.19.0",
     "c12": "4.0.0-beta.4",
     "@prisma/credentials-store": "^7.7.0",
-    "@prisma/management-api-sdk": "^1.33.1",
+    "@prisma/management-api-sdk": "^1.34.0",
     "colorette": "^2.0.20",
     "commander": "^12.1.0",
     "magicast": "^0.3.5",