Merge pull request #1614 from appwrite/fix/cli-cloud-push-oauth-regions

Fix CLI cloud push flows

Author: ChiragAgg5k

templates/cli/lib/auth/login.ts

@@ -1,6 +1,6 @@
 import inquirer from "inquirer";
 import { Account, type Models } from "@appwrite.io/console";
-import { sdkForConsole } from "../sdks.js";
+import { getValidAccessToken, sdkForConsole } from "../sdks.js";
 import { globalConfig, normalizeCloudConsoleEndpoint } from "../config.js";
 import {
   EXECUTABLE_NAME,
@@ -138,6 +138,18 @@ export const getCurrentAccount = async (): Promise<Models.User | null> => {
     return account;
   } catch (err) {
     if (isGuestUnauthorizedError(err)) {
+      try {
+        await getValidAccessToken(globalConfig.getEndpoint(), {
+          forceRefresh: true,
+        });
+        const refreshedClient = await sdkForConsole();
+        const refreshedAccount = await new Account(refreshedClient).get();
+        globalConfig.setEmail(refreshedAccount.email);
+        return refreshedAccount;
+      } catch (_refreshError) {
+        // Fall through to local cleanup only after refresh recovery fails.
+      }
+
       removeCurrentSession();
     }
     return null;

templates/cli/lib/commands/config.ts

@@ -120,9 +120,9 @@ const SettingsSchema = z
         security: z
           .object({
             duration: z.union([z.number(), z.bigint()]).optional(),
-            limit: z.union([z.number(), z.bigint()]).optional(),
-            sessionsLimit: z.union([z.number(), z.bigint()]).optional(),
-            passwordHistory: z.union([z.number(), z.bigint()]).optional(),
+            limit: z.union([z.number(), z.bigint()]).nullable().optional(),
+            sessionsLimit: z.union([z.number(), z.bigint()]).nullable().optional(),
+            passwordHistory: z.union([z.number(), z.bigint()]).nullable().optional(),
             passwordDictionary: z.boolean().optional(),
             personalDataCheck: z.boolean().optional(),
             sessionAlerts: z.boolean().optional(),

templates/cli/lib/commands/init.ts

@@ -123,6 +123,12 @@ const getExistingProjectSummary = async (
   };
 };
 
+const getRegionalCloudEndpoint = (region: string): string => {
+  const url = new URL(globalConfig.getEndpoint() || DEFAULT_ENDPOINT);
+  url.hostname = `${region}.${url.hostname}`;
+  return url.toString().replace(/\/$/, "");
+};
+
 const printInitProjectSuccess = (message: string): void => {
   console.log(`${chalk.green.bold("✓")} ${chalk.green(message)}`);
 };
@@ -359,7 +365,6 @@ const initProject = async ({
   }
 
   localConfig.clear(); // Clear the config to avoid any conflicts
-  const url = new URL(DEFAULT_ENDPOINT);
 
   if (answers.start === "new") {
     let projectIdToCreate;
@@ -394,9 +399,7 @@ const initProject = async ({
     localConfig.setProject(response["$id"], response.name ?? "");
     localConfig.setOrganizationId(answers.organization);
     if (answers.region) {
-      localConfig.setEndpoint(
-        `https://${answers.region}.${url.host}${url.pathname}`,
-      );
+      localConfig.setEndpoint(getRegionalCloudEndpoint(answers.region));
     }
   } else {
     let selectedProject;
@@ -417,9 +420,7 @@ const initProject = async ({
     localConfig.setOrganizationId(answers.organization);
 
     if (isCloud() && selectedProject.region) {
-      localConfig.setEndpoint(
-        `https://${selectedProject.region}.${url.host}${url.pathname}`,
-      );
+      localConfig.setEndpoint(getRegionalCloudEndpoint(selectedProject.region));
     }
   }