@strapi/cloud-cli 0.0.0-experimental.f77206734629a2b88793a7a8abca40388843c656 → 0.0.0-next.48485bcb4aa83c14d6d2cb99cbd47676d0d31b97

package/dist/index.mjs

@@ -1,11 +1,12 @@
 import crypto$1 from "crypto";
-import * as fs from "fs";
-import fs__default from "fs";
+import fse from "fs-extra";
 import * as path from "path";
 import path__default from "path";
+import chalk from "chalk";
 import axios, { AxiosError } from "axios";
 import * as crypto from "node:crypto";
 import { env } from "@strapi/utils";
+import * as fs from "fs";
 import * as tar from "tar";
 import { minimatch } from "minimatch";
 import inquirer from "inquirer";
@@ -14,7 +15,6 @@ import os from "os";
 import XDGAppPaths from "xdg-app-paths";
 import jwksClient from "jwks-rsa";
 import jwt from "jsonwebtoken";
-import chalk from "chalk";
 import stringify from "fast-safe-stringify";
 import ora from "ora";
 import * as cliProgress from "cli-progress";
@@ -23,7 +23,8 @@ import fs$1 from "fs/promises";
 import pkgUp from "pkg-up";
 import * as yup from "yup";
 const apiConfig = {
-  apiBaseUrl: env("STRAPI_CLI_CLOUD_API", "https://cli.cloud.strapi.io")
+  apiBaseUrl: env("STRAPI_CLI_CLOUD_API", "https://cloud-cli-api.strapi.io"),
+  dashboardBaseUrl: env("STRAPI_CLI_CLOUD_DASHBOARD", "https://cloud.strapi.io")
 };
 const IGNORED_PATTERNS = [
   "**/.git/**",
@@ -78,7 +79,7 @@ const readGitignore = (folderPath) => {
   if (!fs.existsSync(gitignorePath))
     return [];
   const gitignoreContent = fs.readFileSync(gitignorePath, "utf8");
-  return gitignoreContent.split("\n").filter((line) => Boolean(line.trim()) && !line.startsWith("#"));
+  return gitignoreContent.split(/\r?\n/).filter((line) => Boolean(line.trim()) && !line.startsWith("#"));
 };
 const compressFilesToTar = async (storagePath, folderToCompress, filename) => {
   const ignorePatterns = readGitignore(folderToCompress);
@@ -93,48 +94,45 @@ const compressFilesToTar = async (storagePath, folderToCompress, filename) => {
 };
 const APP_FOLDER_NAME = "com.strapi.cli";
 const CONFIG_FILENAME = "config.json";
-function checkDirectoryExists(directoryPath) {
+async function checkDirectoryExists(directoryPath) {
   try {
-    return fs__default.lstatSync(directoryPath).isDirectory();
+    const fsStat = await fse.lstat(directoryPath);
+    return fsStat.isDirectory();
   } catch (e) {
     return false;
   }
 }
-function getTmpStoragePath() {
+async function getTmpStoragePath() {
   const storagePath = path__default.join(os.tmpdir(), APP_FOLDER_NAME);
-  if (!checkDirectoryExists(storagePath)) {
-    fs__default.mkdirSync(storagePath, { recursive: true });
-  }
+  await fse.ensureDir(storagePath);
   return storagePath;
 }
-function getConfigPath() {
+async function getConfigPath() {
   const configDirs = XDGAppPaths(APP_FOLDER_NAME).configDirs();
   const configPath = configDirs.find(checkDirectoryExists);
   if (!configPath) {
-    fs__default.mkdirSync(configDirs[0], { recursive: true });
+    await fse.ensureDir(configDirs[0]);
     return configDirs[0];
   }
   return configPath;
 }
-function getLocalConfig() {
-  const configPath = getConfigPath();
+async function getLocalConfig() {
+  const configPath = await getConfigPath();
   const configFilePath = path__default.join(configPath, CONFIG_FILENAME);
-  if (!fs__default.existsSync(configFilePath)) {
-    return {};
-  }
+  await fse.ensureFile(configFilePath);
   try {
-    return JSON.parse(fs__default.readFileSync(configFilePath, "utf8"));
+    return await fse.readJSON(configFilePath, { encoding: "utf8", throws: true });
   } catch (e) {
     return {};
   }
 }
-function saveLocalConfig(data) {
-  const configPath = getConfigPath();
+async function saveLocalConfig(data) {
+  const configPath = await getConfigPath();
   const configFilePath = path__default.join(configPath, CONFIG_FILENAME);
-  fs__default.writeFileSync(configFilePath, JSON.stringify(data), { encoding: "utf8", mode: 384 });
+  await fse.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
 }
 const name = "@strapi/cloud-cli";
-const version = "4.24.3";
+const version = "4.25.1";
 const description = "Commands to interact with the Strapi Cloud";
 const keywords = [
   "strapi",
@@ -178,13 +176,14 @@ const scripts = {
   watch: "pack-up watch"
 };
 const dependencies = {
-  "@strapi/utils": "4.24.3",
+  "@strapi/utils": "4.25.1",
   axios: "1.6.0",
   chalk: "4.1.2",
   "cli-progress": "3.12.0",
   commander: "8.3.0",
   eventsource: "2.0.2",
   "fast-safe-stringify": "2.1.1",
+  "fs-extra": "10.0.0",
   inquirer: "8.2.5",
   jsonwebtoken: "9.0.0",
   "jwks-rsa": "3.1.0",
@@ -202,8 +201,8 @@ const devDependencies = {
   "@types/cli-progress": "3.11.5",
   "@types/eventsource": "1.1.15",
   "@types/lodash": "^4.14.191",
-  "eslint-config-custom": "4.24.3",
-  tsconfig: "4.24.3"
+  "eslint-config-custom": "4.25.1",
+  tsconfig: "4.25.1"
 };
 const engines = {
   node: ">=18.0.0 <=20.x.x",
@@ -232,8 +231,8 @@ const packageJson = {
   engines
 };
 const VERSION = "v1";
-function cloudApiFactory(token) {
-  const localConfig = getLocalConfig();
+async function cloudApiFactory({ logger }, token) {
+  const localConfig = await getLocalConfig();
   const customHeaders = {
     "x-device-id": localConfig.deviceId,
     "x-app-version": packageJson.version,
@@ -256,7 +255,7 @@ function cloudApiFactory(token) {
     deploy({ filePath, project }, { onUploadProgress }) {
       return axiosCloudAPI.post(
         `/deploy/${project.name}`,
-        { file: fs.createReadStream(filePath) },
+        { file: fse.createReadStream(filePath) },
         {
           headers: {
             "Content-Type": "multipart/form-data"
@@ -285,8 +284,19 @@ function cloudApiFactory(token) {
     getUserInfo() {
       return axiosCloudAPI.get("/user");
     },
-    config() {
-      return axiosCloudAPI.get("/config");
+    async config() {
+      try {
+        const response = await axiosCloudAPI.get("/config");
+        if (response.status !== 200) {
+          throw new Error("Error fetching cloud CLI config from the server.");
+        }
+        return response;
+      } catch (error) {
+        logger.debug(
+          "🥲 Oops! Couldn't retrieve the cloud CLI config from the server. Please try again."
+        );
+        throw error;
+      }
     },
     listProjects() {
       return axiosCloudAPI.get("/projects");
@@ -300,53 +310,48 @@ function cloudApiFactory(token) {
   };
 }
 const LOCAL_SAVE_FILENAME = ".strapi-cloud.json";
-function save(data, { directoryPath } = {}) {
-  const storedData = { ...retrieve(), ...data };
+async function save(data, { directoryPath } = {}) {
+  const alreadyInFileData = await retrieve({ directoryPath });
+  const storedData = { ...alreadyInFileData, ...data };
   const pathToFile = path__default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
-  if (!fs__default.existsSync(path__default.dirname(pathToFile))) {
-    fs__default.mkdirSync(path__default.dirname(pathToFile), { recursive: true });
-  }
-  fs__default.writeFileSync(pathToFile, JSON.stringify(storedData), "utf8");
+  await fse.ensureDir(path__default.dirname(pathToFile));
+  await fse.writeJson(pathToFile, storedData, { encoding: "utf8" });
 }
-function retrieve({ directoryPath } = {}) {
+async function retrieve({
+  directoryPath
+} = {}) {
   const pathToFile = path__default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
-  if (!fs__default.existsSync(pathToFile)) {
+  const pathExists = await fse.pathExists(pathToFile);
+  if (!pathExists) {
     return {};
   }
-  return JSON.parse(fs__default.readFileSync(pathToFile, "utf8"));
-}
-function erase({ directoryPath } = {}) {
-  const pathToFile = path__default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
-  if (fs__default.existsSync(pathToFile)) {
-    fs__default.unlinkSync(pathToFile);
-  }
+  return fse.readJSON(pathToFile, { encoding: "utf8" });
 }
 const strapiInfoSave = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   LOCAL_SAVE_FILENAME,
-  erase,
   retrieve,
   save
 }, Symbol.toStringTag, { value: "Module" }));
-const cloudApiService = cloudApiFactory();
 let cliConfig;
-function tokenServiceFactory({ logger }) {
-  function saveToken(str) {
-    const appConfig = getLocalConfig();
+async function tokenServiceFactory({ logger }) {
+  const cloudApiService = await cloudApiFactory({ logger });
+  async function saveToken(str) {
+    const appConfig = await getLocalConfig();
     if (!appConfig) {
       logger.error("There was a problem saving your token. Please try again.");
       return;
     }
     appConfig.token = str;
     try {
-      saveLocalConfig(appConfig);
-    } catch (error) {
-      logger.debug(error);
+      await saveLocalConfig(appConfig);
+    } catch (e) {
+      logger.debug(e);
       logger.error("There was a problem saving your token. Please try again.");
     }
   }
   async function retrieveToken() {
-    const appConfig = getLocalConfig();
+    const appConfig = await getLocalConfig();
     if (appConfig.token) {
       if (await isTokenValid(appConfig.token)) {
         return appConfig.token;
@@ -359,9 +364,9 @@ function tokenServiceFactory({ logger }) {
       jwksUri: jwksUrl
     });
     const getKey = (header, callback) => {
-      client.getSigningKey(header.kid, (err, key) => {
-        if (err) {
-          callback(err);
+      client.getSigningKey(header.kid, (e, key) => {
+        if (e) {
+          callback(e);
         } else if (key) {
           const publicKey = "publicKey" in key ? key.publicKey : key.rsaPublicKey;
           callback(null, publicKey);
@@ -379,14 +384,17 @@ function tokenServiceFactory({ logger }) {
           "There seems to be a problem with your login information. Please try logging in again."
         );
       }
+      return Promise.reject(new Error("Invalid token"));
     }
     return new Promise((resolve, reject) => {
       jwt.verify(idToken, getKey, (err) => {
         if (err) {
           reject(err);
-        } else {
-          resolve();
         }
+        if (decodedToken.payload.exp < Math.floor(Date.now() / 1e3)) {
+          reject(new Error("Token is expired"));
+        }
+        resolve();
       });
     });
   }
@@ -399,35 +407,36 @@ function tokenServiceFactory({ logger }) {
         return true;
       }
       return false;
-    } catch (error) {
-      logger.debug(error);
+    } catch (e) {
+      logger.debug(e);
       return false;
     }
   }
-  function eraseToken() {
-    const appConfig = getLocalConfig();
+  async function eraseToken() {
+    const appConfig = await getLocalConfig();
     if (!appConfig) {
       return;
     }
     delete appConfig.token;
     try {
-      saveLocalConfig(appConfig);
-    } catch (error) {
-      logger.debug(error);
+      await saveLocalConfig(appConfig);
+    } catch (e) {
+      logger.debug(e);
       logger.error(
         "There was an issue removing your login information. Please try logging out again."
       );
+      throw e;
     }
   }
-  async function getValidToken() {
-    const token = await retrieveToken();
-    if (!token) {
-      logger.log("No token found. Please login first.");
-      return null;
-    }
-    if (!await isTokenValid(token)) {
-      logger.log("Unable to proceed: Token is expired or not valid. Please login again.");
-      return null;
+  async function getValidToken(ctx, loginAction2) {
+    let token = await retrieveToken();
+    while (!token || !await isTokenValid(token)) {
+      logger.log(
+        token ? "Oops! Your token seems expired or invalid. Please login again." : "We couldn't find a valid token. You need to be logged in to use this feature."
+      );
+      if (!await loginAction2(ctx))
+        return null;
+      token = await retrieveToken();
     }
     return token;
   }
@@ -561,57 +570,246 @@ const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
   local: strapiInfoSave,
   tokenServiceFactory
 }, Symbol.toStringTag, { value: "Module" }));
-function handleError(ctx, error) {
-  const tokenService = tokenServiceFactory(ctx);
+const openModule$1 = import("open");
+async function promptLogin(ctx) {
+  const response = await inquirer.prompt([
+    {
+      type: "confirm",
+      name: "login",
+      message: "Would you like to login?"
+    }
+  ]);
+  if (response.login) {
+    const loginSuccessful = await loginAction(ctx);
+    return loginSuccessful;
+  }
+  return false;
+}
+async function loginAction(ctx) {
+  const { logger } = ctx;
+  const tokenService = await tokenServiceFactory(ctx);
+  const existingToken = await tokenService.retrieveToken();
+  const cloudApiService = await cloudApiFactory(ctx, existingToken || void 0);
+  const trackFailedLogin = async () => {
+    try {
+      await cloudApiService.track("didNotLogin", { loginMethod: "cli" });
+    } catch (e) {
+      logger.debug("Failed to track failed login", e);
+    }
+  };
+  if (existingToken) {
+    const isTokenValid = await tokenService.isTokenValid(existingToken);
+    if (isTokenValid) {
+      try {
+        const userInfo = await cloudApiService.getUserInfo();
+        const { email } = userInfo.data.data;
+        if (email) {
+          logger.log(`You are already logged into your account (${email}).`);
+        } else {
+          logger.log("You are already logged in.");
+        }
+        logger.log(
+          "To access your dashboard, please copy and paste the following URL into your web browser:"
+        );
+        logger.log(chalk.underline(`${apiConfig.dashboardBaseUrl}/projects`));
+        return true;
+      } catch (e) {
+        logger.debug("Failed to fetch user info", e);
+      }
+    }
+  }
+  let cliConfig2;
+  try {
+    logger.info("🔌 Connecting to the Strapi Cloud API...");
+    const config = await cloudApiService.config();
+    cliConfig2 = config.data;
+  } catch (e) {
+    logger.error("🥲 Oops! Something went wrong while logging you in. Please try again.");
+    logger.debug(e);
+    return false;
+  }
+  try {
+    await cloudApiService.track("willLoginAttempt", {});
+  } catch (e) {
+    logger.debug("Failed to track login attempt", e);
+  }
+  logger.debug("🔐 Creating device authentication request...", {
+    client_id: cliConfig2.clientId,
+    scope: cliConfig2.scope,
+    audience: cliConfig2.audience
+  });
+  const deviceAuthResponse = await axios.post(cliConfig2.deviceCodeAuthUrl, {
+    client_id: cliConfig2.clientId,
+    scope: cliConfig2.scope,
+    audience: cliConfig2.audience
+  }).catch((e) => {
+    logger.error("There was an issue with the authentication process. Please try again.");
+    if (e.message) {
+      logger.debug(e.message, e);
+    } else {
+      logger.debug(e);
+    }
+  });
+  openModule$1.then((open) => {
+    open.default(deviceAuthResponse.data.verification_uri_complete).catch((e) => {
+      logger.error("We encountered an issue opening the browser. Please try again later.");
+      logger.debug(e.message, e);
+    });
+  });
+  logger.log("If a browser tab does not open automatically, please follow the next steps:");
+  logger.log(
+    `1. Open this url in your device: ${deviceAuthResponse.data.verification_uri_complete}`
+  );
+  logger.log(
+    `2. Enter the following code: ${deviceAuthResponse.data.user_code} and confirm to login.
+`
+  );
+  const tokenPayload = {
+    grant_type: "urn:ietf:params:oauth:grant-type:device_code",
+    device_code: deviceAuthResponse.data.device_code,
+    client_id: cliConfig2.clientId
+  };
+  let isAuthenticated = false;
+  const authenticate = async () => {
+    const spinner = logger.spinner("Waiting for authentication");
+    spinner.start();
+    const spinnerFail = () => spinner.fail("Authentication failed!");
+    while (!isAuthenticated) {
+      try {
+        const tokenResponse = await axios.post(cliConfig2.tokenUrl, tokenPayload);
+        const authTokenData = tokenResponse.data;
+        if (tokenResponse.status === 200) {
+          try {
+            logger.debug("🔐 Validating token...");
+            await tokenService.validateToken(authTokenData.id_token, cliConfig2.jwksUrl);
+            logger.debug("🔐 Token validation successful!");
+          } catch (e) {
+            logger.debug(e);
+            spinnerFail();
+            throw new Error("Unable to proceed: Token validation failed");
+          }
+          logger.debug("🔍 Fetching user information...");
+          const cloudApiServiceWithToken = await cloudApiFactory(ctx, authTokenData.access_token);
+          await cloudApiServiceWithToken.getUserInfo();
+          logger.debug("🔍 User information fetched successfully!");
+          try {
+            logger.debug("📝 Saving login information...");
+            await tokenService.saveToken(authTokenData.access_token);
+            logger.debug("📝 Login information saved successfully!");
+            isAuthenticated = true;
+          } catch (e) {
+            logger.error(
+              "There was a problem saving your login information. Please try logging in again."
+            );
+            logger.debug(e);
+            spinnerFail();
+            return false;
+          }
+        }
+      } catch (e) {
+        if (e.message === "Unable to proceed: Token validation failed") {
+          logger.error(
+            "There seems to be a problem with your login information. Please try logging in again."
+          );
+          spinnerFail();
+          await trackFailedLogin();
+          return false;
+        }
+        if (e.response?.data.error && !["authorization_pending", "slow_down"].includes(e.response.data.error)) {
+          logger.debug(e);
+          spinnerFail();
+          await trackFailedLogin();
+          return false;
+        }
+        await new Promise((resolve) => {
+          setTimeout(resolve, deviceAuthResponse.data.interval * 1e3);
+        });
+      }
+    }
+    spinner.succeed("Authentication successful!");
+    logger.log("You are now logged into Strapi Cloud.");
+    logger.log(
+      "To access your dashboard, please copy and paste the following URL into your web browser:"
+    );
+    logger.log(chalk.underline(`${apiConfig.dashboardBaseUrl}/projects`));
+    try {
+      await cloudApiService.track("didLogin", { loginMethod: "cli" });
+    } catch (e) {
+      logger.debug("Failed to track login", e);
+    }
+  };
+  await authenticate();
+  return isAuthenticated;
+}
+async function handleError(ctx, error) {
   const { logger } = ctx;
   logger.debug(error);
   if (error instanceof AxiosError) {
+    const errorMessage = typeof error.response?.data === "string" ? error.response.data : null;
     switch (error.response?.status) {
-      case 401:
-        logger.error("Your session has expired. Please log in again.");
-        tokenService.eraseToken();
-        return;
       case 403:
         logger.error(
-          error.response.data || "You do not have permission to create a project. Please contact support for assistance."
+          errorMessage || "You do not have permission to create a project. Please contact support for assistance."
         );
         return;
       case 400:
-        logger.error("Invalid input. Please check your inputs and try again.");
+        logger.error(errorMessage || "Invalid input. Please check your inputs and try again.");
         return;
       case 503:
         logger.error(
           "Strapi Cloud project creation is currently unavailable. Please try again later."
         );
         return;
+      default:
+        if (errorMessage) {
+          logger.error(errorMessage);
+          return;
+        }
+        break;
     }
   }
   logger.error(
     "We encountered an issue while creating your project. Please try again in a moment. If the problem persists, contact support for assistance."
   );
 }
-const action$3 = async (ctx) => {
+async function createProject$1(ctx, cloudApi, projectInput) {
   const { logger } = ctx;
-  const { getValidToken } = tokenServiceFactory(ctx);
-  const token = await getValidToken();
+  const spinner = logger.spinner("Setting up your project...").start();
+  try {
+    const { data } = await cloudApi.createProject(projectInput);
+    await save({ project: data });
+    spinner.succeed("Project created successfully!");
+    return data;
+  } catch (e) {
+    spinner.fail("An error occurred while creating the project on Strapi Cloud.");
+    throw e;
+  }
+}
+const action$2 = async (ctx) => {
+  const { logger } = ctx;
+  const { getValidToken, eraseToken } = await tokenServiceFactory(ctx);
+  const token = await getValidToken(ctx, promptLogin);
   if (!token) {
     return;
   }
-  const cloudApi = cloudApiFactory(token);
+  const cloudApi = await cloudApiFactory(ctx, token);
   const { data: config } = await cloudApi.config();
   const { questions, defaults: defaultValues } = config.projectCreation;
   const projectAnswersDefaulted = defaults(defaultValues);
   const projectAnswers = await inquirer.prompt(questions);
   const projectInput = projectAnswersDefaulted(projectAnswers);
-  const spinner = logger.spinner("Setting up your project...").start();
   try {
-    const { data } = await cloudApi.createProject(projectInput);
-    save({ project: data });
-    spinner.succeed("Project created successfully!");
-    return data;
+    return await createProject$1(ctx, cloudApi, projectInput);
   } catch (e) {
-    spinner.fail("Failed to create project on Strapi Cloud.");
-    handleError(ctx, e);
+    if (e instanceof AxiosError && e.response?.status === 401) {
+      logger.warn("Oops! Your session has expired. Please log in again to retry.");
+      await eraseToken();
+      if (await promptLogin(ctx)) {
+        return await createProject$1(ctx, cloudApi, projectInput);
+      }
+    } else {
+      await handleError(ctx, e);
+    }
   }
 };
 function notificationServiceFactory({ logger }) {
@@ -739,9 +937,9 @@ const buildLogsServiceFactory = ({ logger }) => {
   };
 };
 async function upload(ctx, project, token, maxProjectFileSize) {
-  const cloudApi = cloudApiFactory(token);
+  const cloudApi = await cloudApiFactory(ctx, token);
   try {
-    const storagePath = getTmpStoragePath();
+    const storagePath = await getTmpStoragePath();
     const projectFolder = path__default.resolve(process.cwd());
     const packageJson2 = await loadPkg(ctx);
     if (!packageJson2) {
@@ -772,11 +970,18 @@ async function upload(ctx, project, token, maxProjectFileSize) {
       process.exit(1);
     }
     const tarFilePath = path__default.resolve(storagePath, compressedFilename);
-    const fileStats = fs__default.statSync(tarFilePath);
+    const fileStats = await fse.stat(tarFilePath);
     if (fileStats.size > maxProjectFileSize) {
-      return ctx.logger.log(
+      ctx.logger.log(
         "Unable to proceed: Your project is too big to be transferred, please use a git repo instead."
       );
+      try {
+        await fse.remove(tarFilePath);
+      } catch (e) {
+        ctx.logger.log("Unable to remove file: ", tarFilePath);
+        ctx.logger.debug(e);
+      }
+      return;
     }
     ctx.logger.info("🚀 Uploading project...");
     const progressBar = ctx.logger.progressBar(100, "Upload Progress");
@@ -810,7 +1015,7 @@ async function upload(ctx, project, token, maxProjectFileSize) {
       }
       ctx.logger.debug(e);
     } finally {
-      fs__default.rmSync(tarFilePath, { force: true });
+      await fse.remove(tarFilePath);
     }
     process.exit(0);
   } catch (e) {
@@ -820,10 +1025,10 @@ async function upload(ctx, project, token, maxProjectFileSize) {
   }
 }
 async function getProject(ctx) {
-  const { project } = retrieve();
+  const { project } = await retrieve();
   if (!project) {
     try {
-      return await action$3(ctx);
+      return await action$2(ctx);
     } catch (e) {
       ctx.logger.error("An error occurred while deploying the project. Please try again later.");
       ctx.logger.debug(e);
@@ -832,9 +1037,9 @@ async function getProject(ctx) {
   }
   return project;
 }
-const action$2 = async (ctx) => {
-  const { getValidToken } = tokenServiceFactory(ctx);
-  const token = await getValidToken();
+const action$1 = async (ctx) => {
+  const { getValidToken } = await tokenServiceFactory(ctx);
+  const token = await getValidToken(ctx, promptLogin);
   if (!token) {
     return;
   }
@@ -842,10 +1047,15 @@ const action$2 = async (ctx) => {
   if (!project) {
     return;
   }
+  const cloudApiService = await cloudApiFactory(ctx);
+  try {
+    await cloudApiService.track("willDeployWithCLI", { projectInternalName: project.name });
+  } catch (e) {
+    ctx.logger.debug("Failed to track willDeploy", e);
+  }
   const notificationService = notificationServiceFactory(ctx);
   const buildLogsService = buildLogsServiceFactory(ctx);
-  const cloudApiService2 = cloudApiFactory();
-  const { data: cliConfig2 } = await cloudApiService2.config();
+  const { data: cliConfig2 } = await cloudApiService.config();
   let maxSize = parseInt(cliConfig2.maxProjectFileSize, 10);
   if (Number.isNaN(maxSize)) {
     ctx.logger.debug(
@@ -854,9 +1064,18 @@ const action$2 = async (ctx) => {
     maxSize = 1e8;
   }
   const buildId = await upload(ctx, project, token, maxSize);
+  if (!buildId) {
+    return;
+  }
   try {
     notificationService(`${apiConfig.apiBaseUrl}/notifications`, token, cliConfig2);
     await buildLogsService(`${apiConfig.apiBaseUrl}/v1/logs/${buildId}`, token, cliConfig2);
+    ctx.logger.log(
+      "Visit the following URL for deployment logs. Your deployment will be available here shortly."
+    );
+    ctx.logger.log(
+      chalk.underline(`${apiConfig.dashboardBaseUrl}/projects/${project.name}/deployments`)
+    );
   } catch (e) {
     if (e instanceof Error) {
       ctx.logger.error(e.message);
@@ -893,185 +1112,50 @@ const runAction = (name2, action2) => (...args) => {
   });
 };
 const command$3 = ({ command: command2, ctx }) => {
-  return command2.command("cloud:deploy").alias("deploy").description("Deploy a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("deploy", action$2)(ctx));
+  command2.command("cloud:deploy").alias("deploy").description("Deploy a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("deploy", action$1)(ctx));
 };
 const deployProject = {
   name: "deploy-project",
   description: "Deploy a Strapi Cloud project",
-  action: action$2,
+  action: action$1,
   command: command$3
 };
-const openModule = import("open");
-const action$1 = async (ctx) => {
-  const { logger } = ctx;
-  const tokenService = tokenServiceFactory(ctx);
-  const existingToken = await tokenService.retrieveToken();
-  const cloudApiService2 = cloudApiFactory(existingToken || void 0);
-  const trackFailedLogin = async () => {
-    try {
-      await cloudApiService2.track("didNotLogin", { loginMethod: "cli" });
-    } catch (e) {
-      logger.debug("Failed to track failed login", e);
-    }
-  };
-  if (existingToken) {
-    const isTokenValid = await tokenService.isTokenValid(existingToken);
-    if (isTokenValid) {
-      try {
-        const userInfo = await cloudApiService2.getUserInfo();
-        const { email } = userInfo.data.data;
-        if (email) {
-          logger.log(`You are already logged into your account (${email}).`);
-        } else {
-          logger.log("You are already logged in.");
-        }
-        return;
-      } catch (e) {
-        logger.debug("Failed to fetch user info", e);
-      }
-    }
-  }
-  let cliConfig2;
-  try {
-    logger.info("🔌 Connecting to the Strapi Cloud API...");
-    const config = await cloudApiService2.config();
-    cliConfig2 = config.data;
-  } catch (e) {
-    logger.error("🥲 Oops! Something went wrong while logging you in. Please try again.");
-    logger.debug(e);
-    return;
-  }
-  try {
-    await cloudApiService2.track("willLoginAttempt", {});
-  } catch (e) {
-    logger.debug("Failed to track login attempt", e);
-  }
-  logger.debug("🔐 Creating device authentication request...", {
-    client_id: cliConfig2.clientId,
-    scope: cliConfig2.scope,
-    audience: cliConfig2.audience
-  });
-  const deviceAuthResponse = await axios.post(cliConfig2.deviceCodeAuthUrl, {
-    client_id: cliConfig2.clientId,
-    scope: cliConfig2.scope,
-    audience: cliConfig2.audience
-  }).catch((e) => {
-    logger.error("There was an issue with the authentication process. Please try again.");
-    if (e.message) {
-      logger.debug(e.message, e);
-    } else {
-      logger.debug(e);
-    }
-  });
-  openModule.then((open) => {
-    open.default(deviceAuthResponse.data.verification_uri_complete).catch((e) => {
-      logger.error("We encountered an issue opening the browser. Please try again later.");
-      logger.debug(e.message, e);
-    });
-  });
-  logger.log("If a browser tab does not open automatically, please follow the next steps:");
-  logger.log(
-    `1. Open this url in your device: ${deviceAuthResponse.data.verification_uri_complete}`
-  );
-  logger.log(
-    `2. Enter the following code: ${deviceAuthResponse.data.user_code} and confirm to login.
-`
-  );
-  const tokenPayload = {
-    grant_type: "urn:ietf:params:oauth:grant-type:device_code",
-    device_code: deviceAuthResponse.data.device_code,
-    client_id: cliConfig2.clientId
-  };
-  let isAuthenticated = false;
-  const authenticate = async () => {
-    const spinner = logger.spinner("Waiting for authentication");
-    spinner.start();
-    const spinnerFail = () => spinner.fail("Authentication failed!");
-    while (!isAuthenticated) {
-      try {
-        const tokenResponse = await axios.post(cliConfig2.tokenUrl, tokenPayload);
-        const authTokenData = tokenResponse.data;
-        if (tokenResponse.status === 200) {
-          try {
-            logger.debug("🔐 Validating token...");
-            await tokenService.validateToken(authTokenData.id_token, cliConfig2.jwksUrl);
-            logger.debug("🔐 Token validation successful!");
-          } catch (e) {
-            logger.debug(e);
-            spinnerFail();
-            throw new Error("Unable to proceed: Token validation failed");
-          }
-          const cloudApiService22 = cloudApiFactory(authTokenData.access_token);
-          logger.debug("🔍 Fetching user information...");
-          await cloudApiService22.getUserInfo();
-          logger.debug("🔍 User information fetched successfully!");
-          try {
-            logger.debug("📝 Saving login information...");
-            await tokenService.saveToken(authTokenData.access_token);
-            logger.debug("📝 Login information saved successfully!");
-            isAuthenticated = true;
-          } catch (e) {
-            logger.error(
-              "There was a problem saving your login information. Please try logging in again."
-            );
-            logger.debug(e);
-            spinnerFail();
-            return;
-          }
-        }
-      } catch (e) {
-        if (e.message === "Unable to proceed: Token validation failed") {
-          logger.error(
-            "There seems to be a problem with your login information. Please try logging in again."
-          );
-          spinnerFail();
-          await trackFailedLogin();
-          return;
-        }
-        if (e.response?.data.error && !["authorization_pending", "slow_down"].includes(e.response.data.error)) {
-          logger.debug(e);
-          spinnerFail();
-          await trackFailedLogin();
-          return;
-        }
-        await new Promise((resolve) => {
-          setTimeout(resolve, deviceAuthResponse.data.interval * 1e3);
-        });
-      }
-    }
-    spinner.succeed("Authentication successful!");
-    logger.log("You are now logged into Strapi Cloud.");
-    try {
-      await cloudApiService2.track("didLogin", { loginMethod: "cli" });
-    } catch (e) {
-      logger.debug("Failed to track login", e);
-    }
-  };
-  await authenticate();
-};
 const command$2 = ({ command: command2, ctx }) => {
-  return command2.command("cloud:login").alias("login").description("Strapi Cloud Login").addHelpText(
+  command2.command("cloud:login").alias("login").description("Strapi Cloud Login").addHelpText(
     "after",
     "\nAfter running this command, you will be prompted to enter your authentication information."
-  ).option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("login", action$1)(ctx));
+  ).option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("login", loginAction)(ctx));
 };
 const login = {
   name: "login",
   description: "Strapi Cloud Login",
-  action: action$1,
+  action: loginAction,
   command: command$2
 };
+const openModule = import("open");
 const action = async (ctx) => {
   const { logger } = ctx;
-  const { retrieveToken, eraseToken } = tokenServiceFactory(ctx);
+  const { retrieveToken, eraseToken } = await tokenServiceFactory(ctx);
   const token = await retrieveToken();
   if (!token) {
     logger.log("You're already logged out.");
     return;
   }
-  const cloudApiService2 = cloudApiFactory(token);
+  const cloudApiService = await cloudApiFactory(ctx, token);
+  const config = await cloudApiService.config();
+  const cliConfig2 = config.data;
   try {
     await eraseToken();
+    openModule.then((open) => {
+      open.default(
+        `${cliConfig2.baseUrl}/oidc/logout?client_id=${encodeURIComponent(
+          cliConfig2.clientId
+        )}&logout_hint=${encodeURIComponent(token)}
+          `
+      ).catch((e) => {
+        logger.debug(e.message, e);
+      });
+    });
     logger.log(
       "🔌 You have been logged out from the CLI. If you are on a shared computer, please make sure to log out from the Strapi Cloud Dashboard as well."
     );
@@ -1080,13 +1164,13 @@ const action = async (ctx) => {
     logger.debug(e);
   }
   try {
-    await cloudApiService2.track("didLogout", { loginMethod: "cli" });
+    await cloudApiService.track("didLogout", { loginMethod: "cli" });
   } catch (e) {
     logger.debug("Failed to track logout event", e);
   }
 };
 const command$1 = ({ command: command2, ctx }) => {
-  return command2.command("cloud:logout").alias("logout").description("Strapi Cloud Logout").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("logout", action)(ctx));
+  command2.command("cloud:logout").alias("logout").description("Strapi Cloud Logout").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("logout", action)(ctx));
 };
 const logout = {
   name: "logout",
@@ -1095,12 +1179,12 @@ const logout = {
   command: command$1
 };
 const command = ({ command: command2, ctx }) => {
-  return command2.command("cloud:create-project").description("Create a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("cloud:create-project", action$3)(ctx));
+  command2.command("cloud:create-project").description("Create a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("cloud:create-project", action$2)(ctx));
 };
 const createProject = {
   name: "create-project",
   description: "Create a new project",
-  action: action$3,
+  action: action$2,
   command
 };
 const cli = {
@@ -1111,25 +1195,25 @@ const cli = {
 };
 const cloudCommands = [deployProject, login, logout];
 async function initCloudCLIConfig() {
-  const localConfig = getLocalConfig();
+  const localConfig = await getLocalConfig();
   if (!localConfig.deviceId) {
     localConfig.deviceId = crypto$1.randomUUID();
   }
-  saveLocalConfig(localConfig);
+  await saveLocalConfig(localConfig);
 }
-function buildStrapiCloudCommands({
+async function buildStrapiCloudCommands({
   command: command2,
   ctx,
   argv
 }) {
-  initCloudCLIConfig();
-  cloudCommands.forEach((cloudCommand) => {
+  await initCloudCLIConfig();
+  for (const cloudCommand of cloudCommands) {
     try {
-      cloudCommand.command({ command: command2, ctx, argv });
+      await cloudCommand.command({ command: command2, ctx, argv });
     } catch (e) {
       console.error(`Failed to load command ${cloudCommand.name}`, e);
     }
-  });
+  }
 }
 export {
   buildStrapiCloudCommands,