@base44-preview/cli 0.0.1-pr.10.0e28f2b → 0.0.1-pr.10.1d6afbb

package/dist/cli/index.js

@@ -108,6 +108,51 @@ const authClient = ky.create({
 });
 var authClient_default = authClient;
 
+//#endregion
+//#region src/core/auth/api.ts
+async function generateDeviceCode() {
+	const response = await authClient_default.post("oauth/device/code", {
+		json: {
+			client_id: AUTH_CLIENT_ID,
+			scope: "apps:read apps:write"
+		},
+		throwHttpErrors: false
+	});
+	if (!response.ok) throw new AuthApiError(`Failed to generate device code: ${response.status} ${response.statusText}`);
+	const result = DeviceCodeResponseSchema.safeParse(await response.json());
+	if (!result.success) throw new AuthValidationError(`Invalid device code response from server: ${result.error.message}`);
+	return result.data;
+}
+async function getTokenFromDeviceCode(deviceCode) {
+	const searchParams = new URLSearchParams();
+	searchParams.set("grant_type", "urn:ietf:params:oauth:grant-type:device_code");
+	searchParams.set("device_code", deviceCode);
+	searchParams.set("client_id", AUTH_CLIENT_ID);
+	const response = await authClient_default.post("oauth/token", {
+		body: searchParams.toString(),
+		headers: { "Content-Type": "application/x-www-form-urlencoded" },
+		throwHttpErrors: false
+	});
+	const json = await response.json();
+	if (!response.ok) {
+		const errorResult = OAuthErrorSchema.safeParse(json);
+		if (!errorResult.success) throw new AuthValidationError(`Token request failed: ${errorResult.error.message}`);
+		const { error, error_description } = errorResult.data;
+		if (error === "authorization_pending" || error === "slow_down") return null;
+		throw new AuthApiError(error_description ?? `OAuth error: ${error}`);
+	}
+	const result = TokenResponseSchema.safeParse(json);
+	if (!result.success) throw new AuthValidationError(`Invalid token response from server: ${result.error.message}`);
+	return result.data;
+}
+async function getUserInfo(accessToken) {
+	const response = await authClient_default.get("oauth/userinfo", { headers: { Authorization: `Bearer ${accessToken}` } });
+	if (!response.ok) throw new AuthApiError(`Failed to fetch user info: ${response.status}`);
+	const result = UserInfoSchema.safeParse(await response.json());
+	if (!result.success) throw new AuthValidationError(`Invalid UserInfo response from server: ${result.error.message}`);
+	return result.data;
+}
+
 //#endregion
 //#region src/core/utils/fs.ts
 function pathExists(path) {
@@ -150,7 +195,6 @@ async function deleteFile(filePath) {
 //#endregion
 //#region src/core/auth/config.ts
 const TOKEN_REFRESH_BUFFER_MS = 60 * 1e3;
-let refreshPromise = null;
 async function readAuth() {
 	try {
 		const parsed = await readJsonFile(getAuthFilePath());
@@ -179,143 +223,6 @@ async function deleteAuth() {
 		throw new Error(`Failed to delete authentication file: ${error instanceof Error ? error.message : "Unknown error"}`);
 	}
 }
-/**
-* Checks if the access token is expired or about to expire.
-*/
-function isTokenExpired(auth) {
-	return Date.now() >= auth.expiresAt - TOKEN_REFRESH_BUFFER_MS;
-}
-/**
-* Refreshes the access token and saves the new tokens.
-* Returns the new access token, or null if refresh failed.
-* Uses a lock to prevent concurrent refresh requests.
-*/
-async function refreshAndSaveTokens() {
-	if (refreshPromise) return refreshPromise;
-	refreshPromise = (async () => {
-		try {
-			const auth = await readAuth();
-			const tokenResponse = await renewAccessToken(auth.refreshToken);
-			await writeAuth({
-				...auth,
-				accessToken: tokenResponse.accessToken,
-				refreshToken: tokenResponse.refreshToken,
-				expiresAt: Date.now() + tokenResponse.expiresIn * 1e3
-			});
-			return tokenResponse.accessToken;
-		} catch {
-			await deleteAuth();
-			return null;
-		} finally {
-			refreshPromise = null;
-		}
-	})();
-	return refreshPromise;
-}
-
-//#endregion
-//#region src/core/utils/httpClient.ts
-const retriedRequests = /* @__PURE__ */ new WeakSet();
-/**
-* Handles 401 responses by refreshing the token and retrying the request.
-* Only retries once per request to prevent infinite loops.
-*/
-async function handleUnauthorized(request, _options, response) {
-	if (response.status !== 401) return;
-	if (retriedRequests.has(request)) return;
-	const newAccessToken = await refreshAndSaveTokens();
-	if (!newAccessToken) return;
-	retriedRequests.add(request);
-	request.headers.set("Authorization", `Bearer ${newAccessToken}`);
-	return ky(request);
-}
-const httpClient = ky.create({
-	prefixUrl: getBase44ApiUrl(),
-	headers: { "User-Agent": "Base44 CLI" },
-	hooks: {
-		beforeRequest: [async (request) => {
-			try {
-				const auth = await readAuth();
-				if (isTokenExpired(auth)) {
-					const newAccessToken = await refreshAndSaveTokens();
-					if (newAccessToken) {
-						request.headers.set("Authorization", `Bearer ${newAccessToken}`);
-						return;
-					}
-				}
-				request.headers.set("Authorization", `Bearer ${auth.accessToken}`);
-			} catch {}
-		}],
-		afterResponse: [handleUnauthorized]
-	}
-});
-var httpClient_default = httpClient;
-
-//#endregion
-//#region src/core/auth/api.ts
-async function generateDeviceCode() {
-	const response = await authClient_default.post("oauth/device/code", {
-		json: {
-			client_id: AUTH_CLIENT_ID,
-			scope: "apps:read apps:write"
-		},
-		throwHttpErrors: false
-	});
-	if (!response.ok) throw new AuthApiError(`Failed to generate device code: ${response.status} ${response.statusText}`);
-	const result = DeviceCodeResponseSchema.safeParse(await response.json());
-	if (!result.success) throw new AuthValidationError(`Invalid device code response from server: ${result.error.message}`);
-	return result.data;
-}
-async function getTokenFromDeviceCode(deviceCode) {
-	const searchParams = new URLSearchParams();
-	searchParams.set("grant_type", "urn:ietf:params:oauth:grant-type:device_code");
-	searchParams.set("device_code", deviceCode);
-	searchParams.set("client_id", AUTH_CLIENT_ID);
-	const response = await authClient_default.post("oauth/token", {
-		body: searchParams.toString(),
-		headers: { "Content-Type": "application/x-www-form-urlencoded" },
-		throwHttpErrors: false
-	});
-	const json = await response.json();
-	if (!response.ok) {
-		const errorResult = OAuthErrorSchema.safeParse(json);
-		if (!errorResult.success) throw new AuthValidationError(`Token request failed: ${errorResult.error.message}`);
-		const { error, error_description } = errorResult.data;
-		if (error === "authorization_pending" || error === "slow_down") return null;
-		throw new AuthApiError(error_description ?? `OAuth error: ${error}`);
-	}
-	const result = TokenResponseSchema.safeParse(json);
-	if (!result.success) throw new AuthValidationError(`Invalid token response from server: ${result.error.message}`);
-	return result.data;
-}
-async function renewAccessToken(refreshToken) {
-	const searchParams = new URLSearchParams();
-	searchParams.set("grant_type", "refresh_token");
-	searchParams.set("refresh_token", refreshToken);
-	searchParams.set("client_id", AUTH_CLIENT_ID);
-	const response = await authClient_default.post("oauth/token", {
-		body: searchParams.toString(),
-		headers: { "Content-Type": "application/x-www-form-urlencoded" },
-		throwHttpErrors: false
-	});
-	const json = await response.json();
-	if (!response.ok) {
-		const errorResult = OAuthErrorSchema.safeParse(json);
-		if (!errorResult.success) throw new AuthApiError(`Token refresh failed: ${response.statusText}`);
-		const { error, error_description } = errorResult.data;
-		throw new AuthApiError(error_description ?? `OAuth error: ${error}`);
-	}
-	const result = TokenResponseSchema.safeParse(json);
-	if (!result.success) throw new AuthValidationError(`Invalid token response from server: ${result.error.message}`);
-	return result.data;
-}
-async function getUserInfo() {
-	const response = await httpClient_default.get("oauth/userinfo");
-	if (!response.ok) throw new AuthApiError(`Failed to fetch user info: ${response.status}`);
-	const result = UserInfoSchema.safeParse(await response.json());
-	if (!result.success) throw new AuthValidationError(`Invalid UserInfo response from server: ${result.error.message}`);
-	return result.data;
-}
 
 //#endregion
 //#region src/cli/utils/runCommand.ts
@@ -412,9 +319,9 @@ async function saveAuthData(response, userInfo) {
 async function login() {
 	const deviceCodeResponse = await generateAndDisplayDeviceCode();
 	const token = await waitForAuthentication(deviceCodeResponse.deviceCode, deviceCodeResponse.expiresIn, deviceCodeResponse.interval);
-	const userInfo = await getUserInfo();
+	const userInfo = await getUserInfo(token.accessToken);
 	await saveAuthData(token, userInfo);
-	log.success(`Successfully logged as ${chalk.bold(userInfo.email)}`);
+	log.success(`Successfully logged in as ${chalk.bold(userInfo.email)}`);
 }
 const loginCommand = new Command("login").description("Authenticate with Base44").action(async () => {
 	await runCommand(login);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@base44-preview/cli",
-  "version": "0.0.1-pr.10.0e28f2b",
+  "version": "0.0.1-pr.10.1d6afbb",
   "description": "Base44 CLI - Unified interface for managing Base44 applications",
   "type": "module",
   "main": "./dist/cli/index.js",