Merge pull request #157 from Phala-Network/chore/credentials-profiles

feat(cli): multi-profile credentials & switch command

Author: Leechael

cli/src/commands/api/index.ts

@@ -4,7 +4,7 @@ import { fileURLToPath } from "node:url";
 import { createClient } from "@phala/cloud";
 import { defineCommand } from "@/src/core/define-command";
 import type { CommandContext } from "@/src/core/types";
-import { getApiKey } from "@/src/utils/credentials";
+import { resolveAuthForContext } from "@/src/lib/client";
 import { applyJqFilter, formatJqOutput } from "./jq-filter";
 import { apiCommandMeta, apiCommandSchema } from "./command";
 import type { ApiCommandInput } from "./command";
@@ -234,9 +234,9 @@ export async function runApiCommand(
 	input: ApiCommandInput,
 	context: CommandContext,
 ): Promise<number | undefined> {
-	const apiKey = input.apiToken || getApiKey();
+	const auth = resolveAuthForContext(context, { apiToken: input.apiToken });
 
-	if (!apiKey) {
+	if (!auth.apiKey) {
 		context.stderr.write(
 			'Error: Not authenticated. Run "phala login" first.\n',
 		);
@@ -245,7 +245,8 @@ export async function runApiCommand(
 
 	// Create client with User-Agent header
 	const client = createClient({
-		apiKey,
+		apiKey: auth.apiKey,
+		baseURL: auth.baseURL,
 		headers: {
 			"User-Agent": `phala-cli/${CLI_VERSION}`,
 		},

cli/src/commands/auth/login/index.ts

@@ -3,40 +3,40 @@ import { safeGetCurrentUser } from "@phala/cloud";
 import { defineCommand } from "@/src/core/define-command";
 import type { CommandContext } from "@/src/core/types";
 import { getClientWithKey } from "@/src/lib/client";
-import { removeApiKey, saveApiKey } from "@/src/utils/credentials";
+import { DEFAULT_API_PREFIX, upsertProfile } from "@/src/utils/credentials";
 import { CLOUD_URL } from "@/src/utils/constants";
 
 import { logger } from "@/src/utils/logger";
-import type { UserInfoResponse } from "@/src/api/types";
 import { loginCommandMeta, loginCommandSchema } from "./command";
 import type { LoginCommandInput } from "./command";
 
-async function validateAndPersistApiKey(
-	apiKey: string,
-): Promise<UserInfoResponse> {
-	try {
-		await saveApiKey(apiKey);
-		const client = await getClientWithKey(apiKey);
-		const result = await safeGetCurrentUser(client);
-		const userData = result.data as UserInfoResponse;
-
-		if (!result.success || !userData?.username) {
-			await removeApiKey();
-			throw new Error("Invalid API key");
-		}
+type CurrentUserInfo = {
+	username: string;
+	email?: string;
+	team_name?: string;
+};
 
-		return userData;
-	} catch (error) {
-		await removeApiKey();
-		throw error instanceof Error ? error : new Error(String(error));
+async function validateApiKey(options: {
+	apiKey: string;
+	baseURL: string;
+}): Promise<CurrentUserInfo> {
+	const client = await getClientWithKey(options.apiKey, {
+		baseURL: options.baseURL,
+	});
+	const result = await safeGetCurrentUser(client);
+	const userData = result.data as CurrentUserInfo;
+
+	if (!result.success || !userData?.username) {
+		throw new Error("Invalid API key");
 	}
+
+	return userData;
 }
 
-async function promptForApiKey(): Promise<{
-	apiKey: string;
-	user: UserInfoResponse;
-}> {
-	let cachedUser: UserInfoResponse | undefined;
+async function promptForApiKey(options: {
+	baseURL: string;
+}): Promise<{ apiKey: string; user: CurrentUserInfo }> {
+	let cachedUser: CurrentUserInfo | undefined;
 	const response = await prompts({
 		type: "password",
 		name: "apiKey",
@@ -46,7 +46,10 @@ async function promptForApiKey(): Promise<{
 				return "API key cannot be empty";
 			}
 			try {
-				cachedUser = await validateAndPersistApiKey(value);
+				cachedUser = await validateApiKey({
+					apiKey: value,
+					baseURL: options.baseURL,
+				});
 				return true;
 			} catch (error) {
 				return error instanceof Error ? error.message : "Invalid API key";
@@ -59,15 +62,18 @@ async function promptForApiKey(): Promise<{
 	}
 
 	if (!cachedUser) {
-		cachedUser = await validateAndPersistApiKey(response.apiKey);
+		cachedUser = await validateApiKey({
+			apiKey: response.apiKey,
+			baseURL: options.baseURL,
+		});
 	}
 
 	return { apiKey: response.apiKey, user: cachedUser };
 }
 
 async function runLoginCommand(
 	input: LoginCommandInput,
-	_context: CommandContext,
+	context: CommandContext,
 ): Promise<number> {
 	// Show deprecation warning
 	logger.warn(
@@ -77,23 +83,40 @@ async function runLoginCommand(
 	logger.break();
 
 	try {
+		const baseURL = context.env.PHALA_CLOUD_API_PREFIX || DEFAULT_API_PREFIX;
+
 		let apiKey = input.apiKey;
-		let user: UserInfoResponse | undefined;
+		let user: CurrentUserInfo | undefined;
 
 		if (!apiKey) {
-			const result = await promptForApiKey();
+			const result = await promptForApiKey({ baseURL });
 			apiKey = result.apiKey;
 			user = result.user;
 		} else {
-			user = await validateAndPersistApiKey(apiKey);
+			user = await validateApiKey({ apiKey, baseURL });
 		}
 
 		if (!user) {
 			throw new Error("Failed to validate API key");
 		}
 
+		const workspaceName = user.team_name || "default";
+		const profileName = workspaceName;
+
+		upsertProfile({
+			profileName,
+			token: apiKey,
+			apiPrefix: baseURL,
+			workspaceName,
+			user: {
+				username: user.username,
+				email: user.email,
+			},
+			setCurrent: true,
+		});
+
 		logger.success(
-			`Welcome ${user.username}! API key validated and saved successfully`,
+			`Welcome ${user.username}! Credentials saved successfully (profile: ${profileName})`,
 		);
 		logger.break();
 		logger.info(`Open in Web UI at ${CLOUD_URL}/dashboard/`);

cli/src/commands/auth/logout/index.ts

@@ -1,6 +1,6 @@
 import { defineCommand } from "@/src/core/define-command";
 import type { CommandContext } from "@/src/core/types";
-import { removeApiKey } from "@/src/utils/credentials";
+import { loadCredentialsFile, removeProfile } from "@/src/utils/credentials";
 
 import { logger } from "@/src/utils/logger";
 import {
@@ -21,11 +21,17 @@ async function runLogoutCommand(
 	logger.break();
 
 	try {
-		await removeApiKey();
-		logger.success("API key removed successfully");
+		const current = loadCredentialsFile();
+		const profile = current?.current_profile;
+		removeProfile();
+		logger.success(
+			profile
+				? `Credentials removed successfully (profile: ${profile})`
+				: "Credentials removed successfully",
+		);
 		return 0;
 	} catch (error) {
-		logger.error("Failed to remove API key");
+		logger.error("Failed to remove credentials");
 		logger.logDetailedError(error);
 		return 1;
 	}

cli/src/commands/config/command.ts

@@ -4,7 +4,8 @@ export const configGroup: CommandGroup = {
 	path: ["config"],
 	meta: {
 		name: "config",
-		description: "Manage your local configuration",
-		stability: "stable",
+		description:
+			"[DEPRECATED] Manage local CLI state (will be removed in a future version)",
+		stability: "deprecated",
 	},
 };

cli/src/commands/config/get/index.ts

@@ -1,5 +1,5 @@
 import { defineCommand } from "@/src/core/define-command";
-import { getConfigValue } from "@/src/utils/config";
+import { getStateValue } from "@/src/utils/state";
 import { logger } from "@/src/utils/logger";
 
 import type { CommandContext } from "@/src/core/types";
@@ -13,8 +13,11 @@ async function runConfigGet(
 	input: ConfigGetCommandInput,
 	context: CommandContext,
 ): Promise<number> {
+	logger.warn(
+		'The "phala config" commands are deprecated and will be removed in a future version.',
+	);
 	try {
-		const value = getConfigValue(input.key);
+		const value = getStateValue(input.key);
 
 		if (value === undefined) {
 			context.stderr.write(`Configuration key '${input.key}' not found\n`);

cli/src/commands/config/list/index.ts

@@ -1,5 +1,5 @@
 import { defineCommand } from "@/src/core/define-command";
-import { listConfigValues } from "@/src/utils/config";
+import { listStateValues } from "@/src/utils/state";
 
 import { logger, setJsonMode } from "@/src/utils/logger";
 import type { CommandContext } from "@/src/core/types";
@@ -16,8 +16,11 @@ async function runConfigList(
 	// Enable JSON mode if --json flag is set
 	setJsonMode(input.json);
 
+	logger.warn(
+		'The "phala config" commands are deprecated and will be removed in a future version.',
+	);
 	try {
-		const config = listConfigValues();
+		const config = listStateValues();
 
 		if (input.json) {
 			context.success(config);

cli/src/commands/config/set/index.ts

@@ -1,5 +1,5 @@
 import { defineCommand } from "@/src/core/define-command";
-import { setConfigValue } from "@/src/utils/config";
+import { setStateValue } from "@/src/utils/state";
 import { logger } from "@/src/utils/logger";
 
 import type { CommandContext } from "@/src/core/types";
@@ -30,7 +30,10 @@ async function runConfigSet(
 			}
 		}
 
-		setConfigValue(input.key, parsedValue as string | number | boolean);
+		logger.warn(
+			'The "phala config" commands are deprecated and will be removed in a future version.',
+		);
+		setStateValue(input.key, parsedValue as string | number | boolean);
 		context.stdout.write(
 			`Configuration value for '${input.key}' set successfully\n`,
 		);

cli/src/commands/deploy/handler.ts

@@ -1,7 +1,7 @@
 import path from "node:path";
 import os from "node:os";
 import type { CommandContext } from "@/src/core/types";
-import { getApiKey } from "@/src/utils/credentials";
+import { resolveAuthForContext } from "@/src/lib/client";
 import { logger, setJsonMode } from "@/src/utils/logger";
 import {
 	CLOUD_URL,
@@ -194,26 +194,15 @@ async function getApiClient({
 }: Readonly<Pick<Options, "apiToken" | "interactive">>): Promise<
 	Client<typeof API_VERSION>
 > {
-	// Priority 1: Command-line provided API key
-	if (apiToken) {
-		return createClient({ apiKey: apiToken, version: API_VERSION });
-	}
-
-	// Priority 2: Environment variable
-	if (process.env.PHALA_CLOUD_API_KEY) {
+	const resolved = resolveAuthForContext(undefined, { apiToken });
+	if (resolved.apiKey) {
 		return createClient({
-			apiKey: process.env.PHALA_CLOUD_API_KEY,
+			apiKey: resolved.apiKey,
+			baseURL: resolved.baseURL,
 			version: API_VERSION,
 		});
 	}
 
-	// Priority 3: Saved API key from config file
-	const savedApiKey = getApiKey();
-	if (savedApiKey) {
-		return createClient({ apiKey: savedApiKey, version: API_VERSION });
-	}
-
-	// Priority 4: Interactive prompt (only if no API key found)
 	if (interactive) {
 		const { apiToken: promptedToken } = await inquirer.prompt([
 			{
@@ -224,12 +213,15 @@ async function getApiClient({
 					input.trim() ? true : "API token is required",
 			},
 		]);
-		return createClient({ apiKey: promptedToken, version: API_VERSION });
+		return createClient({
+			apiKey: promptedToken,
+			baseURL: resolved.baseURL,
+			version: API_VERSION,
+		});
 	}
 
-	// No API key available
 	throw new Error(
-		"API token is required. Please run 'phala auth login' or set PHALA_CLOUD_API_KEY environment variable",
+		"API token is required. Please run 'phala login' or set PHALA_CLOUD_API_KEY environment variable",
 	);
 }