@strapi/cloud-cli 0.0.0-next.c27880c9af0e2c29e6d6512b0d5fbaa6b506acdc → 0.0.0-next.d54a672641d83234230d3d80d92aaf87f60f8c75

package/dist/index.mjs

@@ -1,12 +1,12 @@
 import crypto$1 from "crypto";
-import fse from "fs-extra";
+import * as fse from "fs-extra";
+import fse__default 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";
@@ -18,10 +18,10 @@ import jwt from "jsonwebtoken";
 import stringify from "fast-safe-stringify";
 import ora from "ora";
 import * as cliProgress from "cli-progress";
-import EventSource from "eventsource";
-import fs$1 from "fs/promises";
 import pkgUp from "pkg-up";
 import * as yup from "yup";
+import _ from "lodash";
+import EventSource from "eventsource";
 const apiConfig = {
   apiBaseUrl: env("STRAPI_CLI_CLOUD_API", "https://cloud-cli-api.strapi.io"),
   dashboardBaseUrl: env("STRAPI_CLI_CLOUD_DASHBOARD", "https://cloud.strapi.io")
@@ -40,23 +40,6 @@ const IGNORED_PATTERNS = [
   "**/.idea/**",
   "**/.vscode/**"
 ];
-const getFiles = (dirPath, ignorePatterns = [], arrayOfFiles = [], subfolder = "") => {
-  const entries = fs.readdirSync(path.join(dirPath, subfolder));
-  entries.forEach((entry) => {
-    const entryPathFromRoot = path.join(subfolder, entry);
-    const entryPath = path.relative(dirPath, entryPathFromRoot);
-    const isIgnored = isIgnoredFile(dirPath, entryPathFromRoot, ignorePatterns);
-    if (isIgnored) {
-      return;
-    }
-    if (fs.statSync(entryPath).isDirectory()) {
-      getFiles(dirPath, ignorePatterns, arrayOfFiles, entryPathFromRoot);
-    } else {
-      arrayOfFiles.push(entryPath);
-    }
-  });
-  return arrayOfFiles;
-};
 const isIgnoredFile = (folderPath, file, ignorePatterns) => {
   ignorePatterns.push(...IGNORED_PATTERNS);
   const relativeFilePath = path.join(folderPath, file);
@@ -74,16 +57,35 @@ const isIgnoredFile = (folderPath, file, ignorePatterns) => {
   }
   return isIgnored;
 };
-const readGitignore = (folderPath) => {
+const getFiles = async (dirPath, ignorePatterns = [], subfolder = "") => {
+  const arrayOfFiles = [];
+  const entries = await fse.readdir(path.join(dirPath, subfolder));
+  for (const entry of entries) {
+    const entryPathFromRoot = path.join(subfolder, entry);
+    const entryPath = path.relative(dirPath, entryPathFromRoot);
+    const isIgnored = isIgnoredFile(dirPath, entryPathFromRoot, ignorePatterns);
+    if (!isIgnored) {
+      if (fse.statSync(entryPath).isDirectory()) {
+        const subFiles = await getFiles(dirPath, ignorePatterns, entryPathFromRoot);
+        arrayOfFiles.push(...subFiles);
+      } else {
+        arrayOfFiles.push(entryPath);
+      }
+    }
+  }
+  return arrayOfFiles;
+};
+const readGitignore = async (folderPath) => {
   const gitignorePath = path.resolve(folderPath, ".gitignore");
-  if (!fs.existsSync(gitignorePath))
+  const pathExist = await fse.pathExists(gitignorePath);
+  if (!pathExist)
     return [];
-  const gitignoreContent = fs.readFileSync(gitignorePath, "utf8");
+  const gitignoreContent = await fse.readFile(gitignorePath, "utf8");
   return gitignoreContent.split(/\r?\n/).filter((line) => Boolean(line.trim()) && !line.startsWith("#"));
 };
 const compressFilesToTar = async (storagePath, folderToCompress, filename) => {
-  const ignorePatterns = readGitignore(folderToCompress);
-  const filesToCompress = getFiles(folderToCompress, ignorePatterns);
+  const ignorePatterns = await readGitignore(folderToCompress);
+  const filesToCompress = await getFiles(folderToCompress, ignorePatterns);
   return tar.c(
     {
       gzip: true,
@@ -96,7 +98,7 @@ const APP_FOLDER_NAME = "com.strapi.cli";
 const CONFIG_FILENAME = "config.json";
 async function checkDirectoryExists(directoryPath) {
   try {
-    const fsStat = await fse.lstat(directoryPath);
+    const fsStat = await fse__default.lstat(directoryPath);
     return fsStat.isDirectory();
   } catch (e) {
     return false;
@@ -104,14 +106,14 @@ async function checkDirectoryExists(directoryPath) {
 }
 async function getTmpStoragePath() {
   const storagePath = path__default.join(os.tmpdir(), APP_FOLDER_NAME);
-  await fse.ensureDir(storagePath);
+  await fse__default.ensureDir(storagePath);
   return storagePath;
 }
 async function getConfigPath() {
   const configDirs = XDGAppPaths(APP_FOLDER_NAME).configDirs();
   const configPath = configDirs.find(checkDirectoryExists);
   if (!configPath) {
-    await fse.ensureDir(configDirs[0]);
+    await fse__default.ensureDir(configDirs[0]);
     return configDirs[0];
   }
   return configPath;
@@ -119,9 +121,9 @@ async function getConfigPath() {
 async function getLocalConfig() {
   const configPath = await getConfigPath();
   const configFilePath = path__default.join(configPath, CONFIG_FILENAME);
-  await fse.ensureFile(configFilePath);
+  await fse__default.ensureFile(configFilePath);
   try {
-    return await fse.readJSON(configFilePath, { encoding: "utf8", throws: true });
+    return await fse__default.readJSON(configFilePath, { encoding: "utf8", throws: true });
   } catch (e) {
     return {};
   }
@@ -129,10 +131,10 @@ async function getLocalConfig() {
 async function saveLocalConfig(data) {
   const configPath = await getConfigPath();
   const configFilePath = path__default.join(configPath, CONFIG_FILENAME);
-  await fse.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
+  await fse__default.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
 }
 const name = "@strapi/cloud-cli";
-const version = "4.25.1";
+const version = "4.25.5";
 const description = "Commands to interact with the Strapi Cloud";
 const keywords = [
   "strapi",
@@ -173,10 +175,11 @@ const scripts = {
   build: "pack-up build",
   clean: "run -T rimraf ./dist",
   lint: "run -T eslint .",
+  "test:unit": "run -T jest",
   watch: "pack-up watch"
 };
 const dependencies = {
-  "@strapi/utils": "4.25.1",
+  "@strapi/utils": "4.25.5",
   axios: "1.6.0",
   chalk: "4.1.2",
   "cli-progress": "3.12.0",
@@ -201,8 +204,8 @@ const devDependencies = {
   "@types/cli-progress": "3.11.5",
   "@types/eventsource": "1.1.15",
   "@types/lodash": "^4.14.191",
-  "eslint-config-custom": "4.25.1",
-  tsconfig: "4.25.1"
+  "eslint-config-custom": "4.25.5",
+  tsconfig: "4.25.5"
 };
 const engines = {
   node: ">=18.0.0 <=20.x.x",
@@ -231,7 +234,7 @@ const packageJson = {
   engines
 };
 const VERSION = "v1";
-async function cloudApiFactory(token) {
+async function cloudApiFactory({ logger }, token) {
   const localConfig = await getLocalConfig();
   const customHeaders = {
     "x-device-id": localConfig.deviceId,
@@ -255,7 +258,7 @@ async function cloudApiFactory(token) {
     deploy({ filePath, project }, { onUploadProgress }) {
       return axiosCloudAPI.post(
         `/deploy/${project.name}`,
-        { file: fse.createReadStream(filePath) },
+        { file: fse__default.createReadStream(filePath) },
         {
           headers: {
             "Content-Type": "multipart/form-data"
@@ -284,11 +287,47 @@ async 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;
+      }
+    },
+    async listProjects() {
+      try {
+        const response = await axiosCloudAPI.get("/projects");
+        if (response.status !== 200) {
+          throw new Error("Error fetching cloud projects from the server.");
+        }
+        return response;
+      } catch (error) {
+        logger.debug(
+          "🥲 Oops! Couldn't retrieve your project's list from the server. Please try again."
+        );
+        throw error;
+      }
     },
-    listProjects() {
-      return axiosCloudAPI.get("/projects");
+    async listLinkProjects() {
+      try {
+        const response = await axiosCloudAPI.get("/projects/linkable");
+        if (response.status !== 200) {
+          throw new Error("Error fetching cloud projects from the server.");
+        }
+        return response;
+      } catch (error) {
+        logger.debug(
+          "🥲 Oops! Couldn't retrieve your project's list from the server. Please try again."
+        );
+        throw error;
+      }
     },
     track(event, payload = {}) {
       return axiosCloudAPI.post("/track", {
@@ -303,18 +342,18 @@ 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);
-  await fse.ensureDir(path__default.dirname(pathToFile));
-  await fse.writeJson(pathToFile, storedData, { encoding: "utf8" });
+  await fse__default.ensureDir(path__default.dirname(pathToFile));
+  await fse__default.writeJson(pathToFile, storedData, { encoding: "utf8" });
 }
 async function retrieve({
   directoryPath
 } = {}) {
   const pathToFile = path__default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
-  const pathExists = await fse.pathExists(pathToFile);
+  const pathExists = await fse__default.pathExists(pathToFile);
   if (!pathExists) {
     return {};
   }
-  return fse.readJSON(pathToFile, { encoding: "utf8" });
+  return fse__default.readJSON(pathToFile, { encoding: "utf8" });
 }
 const strapiInfoSave = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
@@ -324,7 +363,7 @@ const strapiInfoSave = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defi
 }, Symbol.toStringTag, { value: "Module" }));
 let cliConfig;
 async function tokenServiceFactory({ logger }) {
-  const cloudApiService = await cloudApiFactory();
+  const cloudApiService = await cloudApiFactory({ logger });
   async function saveToken(str) {
     const appConfig = await getLocalConfig();
     if (!appConfig) {
@@ -373,14 +412,17 @@ async 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();
       });
     });
   }
@@ -414,15 +456,15 @@ async function tokenServiceFactory({ logger }) {
       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;
   }
@@ -556,17 +598,227 @@ const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
   local: strapiInfoSave,
   tokenServiceFactory
 }, Symbol.toStringTag, { value: "Module" }));
-async function handleError(ctx, error) {
+yup.object({
+  name: yup.string().required(),
+  exports: yup.lazy(
+    (value) => yup.object(
+      typeof value === "object" ? Object.entries(value).reduce((acc, [key, value2]) => {
+        if (typeof value2 === "object") {
+          acc[key] = yup.object({
+            types: yup.string().optional(),
+            source: yup.string().required(),
+            module: yup.string().optional(),
+            import: yup.string().required(),
+            require: yup.string().required(),
+            default: yup.string().required()
+          }).noUnknown(true);
+        } else {
+          acc[key] = yup.string().matches(/^\.\/.*\.json$/).required();
+        }
+        return acc;
+      }, {}) : void 0
+    ).optional()
+  )
+});
+const loadPkg = async ({ cwd, logger }) => {
+  const pkgPath = await pkgUp({ cwd });
+  if (!pkgPath) {
+    throw new Error("Could not find a package.json in the current directory");
+  }
+  const buffer = await fse.readFile(pkgPath);
+  const pkg = JSON.parse(buffer.toString());
+  logger.debug("Loaded package.json:", os.EOL, pkg);
+  return pkg;
+};
+async function getProjectNameFromPackageJson(ctx) {
+  try {
+    const packageJson2 = await loadPkg(ctx);
+    return packageJson2.name || "my-strapi-project";
+  } catch (e) {
+    return "my-strapi-project";
+  }
+}
+function applyDefaultName(newDefaultName, questions, defaultValues) {
+  const newDefaultValues = _.cloneDeep(defaultValues);
+  newDefaultValues.name = newDefaultName;
+  const newQuestions = questions.map((question) => {
+    const questionCopy = _.cloneDeep(question);
+    if (questionCopy.name === "name") {
+      questionCopy.default = newDefaultName;
+    }
+    return questionCopy;
+  });
+  return { newQuestions, newDefaultValues };
+}
+const trackEvent = async (ctx, cloudApiService, eventName, eventData) => {
+  try {
+    await cloudApiService.track(eventName, eventData);
+  } catch (e) {
+    ctx.logger.debug(`Failed to track ${eventName}`, e);
+  }
+};
+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);
+  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;
+  }
+  await trackEvent(ctx, cloudApiService, "willLoginAttempt", {});
+  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 trackEvent(ctx, cloudApiService, "didNotLogin", { loginMethod: "cli" });
+          return false;
+        }
+        if (e.response?.data.error && !["authorization_pending", "slow_down"].includes(e.response.data.error)) {
+          logger.debug(e);
+          spinnerFail();
+          await trackEvent(ctx, cloudApiService, "didNotLogin", { loginMethod: "cli" });
+          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`));
+    await trackEvent(ctx, cloudApiService, "didLogin", { loginMethod: "cli" });
+  };
+  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.");
-        await tokenService.eraseToken();
-        return;
       case 403:
         logger.error(
           errorMessage || "You do not have permission to create a project. Please contact support for assistance."
@@ -592,28 +844,48 @@ async function handleError(ctx, 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 } = await 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$4 = async (ctx) => {
+  const { logger } = ctx;
+  const { getValidToken, eraseToken } = await tokenServiceFactory(ctx);
+  const token = await getValidToken(ctx, promptLogin);
   if (!token) {
     return;
   }
-  const cloudApi = await cloudApiFactory(token);
+  const cloudApi = await cloudApiFactory(ctx, token);
   const { data: config } = await cloudApi.config();
-  const { questions, defaults: defaultValues } = config.projectCreation;
+  const { newQuestions: questions, newDefaultValues: defaultValues } = applyDefaultName(
+    await getProjectNameFromPackageJson(ctx),
+    config.projectCreation.questions,
+    config.projectCreation.defaults
+  );
   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);
-    await 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.");
-    await 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 }) {
@@ -647,38 +919,6 @@ function notificationServiceFactory({ logger }) {
     };
   };
 }
-yup.object({
-  name: yup.string().required(),
-  exports: yup.lazy(
-    (value) => yup.object(
-      typeof value === "object" ? Object.entries(value).reduce((acc, [key, value2]) => {
-        if (typeof value2 === "object") {
-          acc[key] = yup.object({
-            types: yup.string().optional(),
-            source: yup.string().required(),
-            module: yup.string().optional(),
-            import: yup.string().required(),
-            require: yup.string().required(),
-            default: yup.string().required()
-          }).noUnknown(true);
-        } else {
-          acc[key] = yup.string().matches(/^\.\/.*\.json$/).required();
-        }
-        return acc;
-      }, {}) : void 0
-    ).optional()
-  )
-});
-const loadPkg = async ({ cwd, logger }) => {
-  const pkgPath = await pkgUp({ cwd });
-  if (!pkgPath) {
-    throw new Error("Could not find a package.json in the current directory");
-  }
-  const buffer = await fs$1.readFile(pkgPath);
-  const pkg = JSON.parse(buffer.toString());
-  logger.debug("Loaded package.json:", os.EOL, pkg);
-  return pkg;
-};
 const buildLogsServiceFactory = ({ logger }) => {
   return async (url, token, cliConfig2) => {
     const CONN_TIMEOUT = Number(cliConfig2.buildLogsConnectionTimeout);
@@ -732,6 +972,7 @@ const buildLogsServiceFactory = ({ logger }) => {
           if (retries > MAX_RETRIES) {
             spinner.fail("We were unable to connect to the server to get build logs at this time.");
             es.close();
+            clearExistingTimeout();
             reject(new Error("Max retries reached"));
           }
         };
@@ -741,7 +982,7 @@ const buildLogsServiceFactory = ({ logger }) => {
   };
 };
 async function upload(ctx, project, token, maxProjectFileSize) {
-  const cloudApi = await cloudApiFactory(token);
+  const cloudApi = await cloudApiFactory(ctx, token);
   try {
     const storagePath = await getTmpStoragePath();
     const projectFolder = path__default.resolve(process.cwd());
@@ -774,13 +1015,13 @@ async function upload(ctx, project, token, maxProjectFileSize) {
       process.exit(1);
     }
     const tarFilePath = path__default.resolve(storagePath, compressedFilename);
-    const fileStats = await fse.stat(tarFilePath);
+    const fileStats = await fse__default.stat(tarFilePath);
     if (fileStats.size > maxProjectFileSize) {
       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);
+        await fse__default.remove(tarFilePath);
       } catch (e) {
         ctx.logger.log("Unable to remove file: ", tarFilePath);
         ctx.logger.debug(e);
@@ -819,7 +1060,7 @@ async function upload(ctx, project, token, maxProjectFileSize) {
       }
       ctx.logger.debug(e);
     } finally {
-      await fse.remove(tarFilePath);
+      await fse__default.remove(tarFilePath);
     }
     process.exit(0);
   } catch (e) {
@@ -832,7 +1073,7 @@ async function getProject(ctx) {
   const { project } = await retrieve();
   if (!project) {
     try {
-      return await action$3(ctx);
+      return await action$4(ctx);
     } catch (e) {
       ctx.logger.error("An error occurred while deploying the project. Please try again later.");
       ctx.logger.debug(e);
@@ -841,10 +1082,21 @@ async function getProject(ctx) {
   }
   return project;
 }
-const action$2 = async (ctx) => {
+async function getConfig({
+  ctx,
+  cloudApiService
+}) {
+  try {
+    const { data: cliConfig2 } = await cloudApiService.config();
+    return cliConfig2;
+  } catch (e) {
+    ctx.logger.debug("Failed to get cli config", e);
+    return null;
+  }
+}
+const action$3 = async (ctx) => {
   const { getValidToken } = await tokenServiceFactory(ctx);
-  const cloudApiService = await cloudApiFactory();
-  const token = await getValidToken();
+  const token = await getValidToken(ctx, promptLogin);
   if (!token) {
     return;
   }
@@ -852,14 +1104,19 @@ const action$2 = async (ctx) => {
   if (!project) {
     return;
   }
-  try {
-    await cloudApiService.track("willDeployWithCLI", { projectInternalName: project.name });
-  } catch (e) {
-    ctx.logger.debug("Failed to track willDeploy", e);
-  }
+  const cloudApiService = await cloudApiFactory(ctx);
+  await trackEvent(ctx, cloudApiService, "willDeployWithCLI", {
+    projectInternalName: project.name
+  });
   const notificationService = notificationServiceFactory(ctx);
   const buildLogsService = buildLogsServiceFactory(ctx);
-  const { data: cliConfig2 } = await cloudApiService.config();
+  const cliConfig2 = await getConfig({ ctx, cloudApiService });
+  if (!cliConfig2) {
+    ctx.logger.error(
+      "An error occurred while retrieving data from Strapi Cloud. Please try check your network or again later."
+    );
+    return;
+  }
   let maxSize = parseInt(cliConfig2.maxProjectFileSize, 10);
   if (Number.isNaN(maxSize)) {
     ctx.logger.debug(
@@ -881,10 +1138,11 @@ const action$2 = async (ctx) => {
       chalk.underline(`${apiConfig.dashboardBaseUrl}/projects/${project.name}/deployments`)
     );
   } catch (e) {
+    ctx.logger.debug(e);
     if (e instanceof Error) {
       ctx.logger.error(e.message);
     } else {
-      throw e;
+      ctx.logger.error("An error occurred while deploying the project. Please try again later.");
     }
   }
 };
@@ -915,185 +1173,175 @@ const runAction = (name2, action2) => (...args) => {
     process.exit(1);
   });
 };
-const command$3 = ({ command: command2, 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$2)(ctx));
+const command$5 = ({ command: command2, 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$3)(ctx));
 };
 const deployProject = {
   name: "deploy-project",
   description: "Deploy a Strapi Cloud project",
-  action: action$2,
-  command: command$3
+  action: action$3,
+  command: command$5
 };
-const openModule = import("open");
-const action$1 = async (ctx) => {
-  const { logger } = ctx;
-  const tokenService = await tokenServiceFactory(ctx);
-  const existingToken = await tokenService.retrieveToken();
-  const cloudApiService = await cloudApiFactory(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);
+const QUIT_OPTION = "Quit";
+async function getExistingConfig(ctx) {
+  try {
+    return await retrieve();
+  } catch (e) {
+    ctx.logger.debug("Failed to get project config", e);
+    ctx.logger.error("An error occurred while retrieving config data from your local project.");
+    return null;
+  }
+}
+async function promptForRelink(ctx, cloudApiService, existingConfig) {
+  if (existingConfig && existingConfig.project) {
+    const { shouldRelink } = await inquirer.prompt([
+      {
+        type: "confirm",
+        name: "shouldRelink",
+        message: `A project named ${chalk.cyan(
+          existingConfig.project.displayName ? existingConfig.project.displayName : existingConfig.project.name
+        )} is already linked to this local folder. Do you want to update the link?`,
+        default: false
       }
+    ]);
+    if (!shouldRelink) {
+      await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
+        currentProjectName: existingConfig.project?.name
+      });
+      return false;
     }
   }
-  let cliConfig2;
+  return true;
+}
+async function getProjectsList(ctx, cloudApiService, existingConfig) {
+  const spinner = ctx.logger.spinner("Fetching your projects...\n").start();
   try {
-    logger.info("🔌 Connecting to the Strapi Cloud API...");
-    const config = await cloudApiService.config();
-    cliConfig2 = config.data;
+    const {
+      data: { data: projectList }
+    } = await cloudApiService.listLinkProjects();
+    spinner.succeed();
+    if (!Array.isArray(projectList)) {
+      ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
+      return null;
+    }
+    const projects = projectList.filter(
+      (project) => !(project.isMaintainer || project.name === existingConfig?.project?.name)
+    ).map((project) => {
+      return {
+        name: project.displayName,
+        value: { name: project.name, displayName: project.displayName }
+      };
+    });
+    if (projects.length === 0) {
+      ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
+      return null;
+    }
+    return projects;
   } catch (e) {
-    logger.error("🥲 Oops! Something went wrong while logging you in. Please try again.");
-    logger.debug(e);
-    return false;
+    spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
+    ctx.logger.debug("Failed to list projects", e);
+    return null;
   }
+}
+async function getUserSelection(ctx, projects) {
+  const { logger } = ctx;
   try {
-    await cloudApiService.track("willLoginAttempt", {});
+    const answer = await inquirer.prompt([
+      {
+        type: "list",
+        name: "linkProject",
+        message: "Which project do you want to link?",
+        choices: [...projects, { name: chalk.grey(`(${QUIT_OPTION})`), value: null }]
+      }
+    ]);
+    if (!answer.linkProject) {
+      return null;
+    }
+    return answer;
   } catch (e) {
-    logger.debug("Failed to track login attempt", e);
+    logger.debug("Failed to get user input", e);
+    logger.error("An error occurred while trying to get your input.");
+    return null;
   }
-  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 action$2 = async (ctx) => {
+  const { getValidToken } = await tokenServiceFactory(ctx);
+  const token = await getValidToken(ctx, promptLogin);
+  const { logger } = ctx;
+  if (!token) {
+    return;
+  }
+  const cloudApiService = await cloudApiFactory(ctx, token);
+  const existingConfig = await getExistingConfig(ctx);
+  const shouldRelink = await promptForRelink(ctx, cloudApiService, existingConfig);
+  if (!shouldRelink) {
+    return;
+  }
+  await trackEvent(ctx, cloudApiService, "willLinkProject", {});
+  const projects = await getProjectsList(
+    ctx,
+    cloudApiService,
+    existingConfig
   );
-  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(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);
-        });
+  if (!projects) {
+    return;
+  }
+  const answer = await getUserSelection(ctx, projects);
+  if (!answer) {
+    return;
+  }
+  try {
+    const { confirmAction } = await inquirer.prompt([
+      {
+        type: "confirm",
+        name: "confirmAction",
+        message: "Warning: Once linked, deploying from CLI will replace the existing project and its data. Confirm to proceed:",
+        default: false
       }
+    ]);
+    if (!confirmAction) {
+      await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
+        cancelledProjectName: answer.linkProject.name,
+        currentProjectName: existingConfig ? existingConfig.project?.name : null
+      });
+      return;
     }
-    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;
+    await save({ project: answer.linkProject });
+    logger.log(`Project ${chalk.cyan(answer.linkProject.displayName)} linked successfully.`);
+    await trackEvent(ctx, cloudApiService, "didLinkProject", {
+      projectInternalName: answer.linkProject
+    });
+  } catch (e) {
+    logger.debug("Failed to link project", e);
+    logger.error("An error occurred while linking the project.");
+    await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
+      projectInternalName: answer.linkProject
+    });
+  }
 };
-const command$2 = ({ command: command2, ctx }) => {
+const command$4 = ({ command: command2, ctx }) => {
+  command2.command("cloud:link").alias("link").description("Link a local directory to a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("link", action$2)(ctx));
+};
+const link = {
+  name: "link-project",
+  description: "Link a local directory to a Strapi Cloud project",
+  action: action$2,
+  command: command$4
+};
+const command$3 = ({ command: command2, ctx }) => {
   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,
-  command: command$2
+  action: loginAction,
+  command: command$3
 };
-const action = async (ctx) => {
+const openModule = import("open");
+const action$1 = async (ctx) => {
   const { logger } = ctx;
   const { retrieveToken, eraseToken } = await tokenServiceFactory(ctx);
   const token = await retrieveToken();
@@ -1101,9 +1349,21 @@ const action = async (ctx) => {
     logger.log("You're already logged out.");
     return;
   }
-  const cloudApiService = await 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."
     );
@@ -1111,37 +1371,64 @@ const action = async (ctx) => {
     logger.error("🥲 Oops! Something went wrong while logging you out. Please try again.");
     logger.debug(e);
   }
-  try {
-    await cloudApiService.track("didLogout", { loginMethod: "cli" });
-  } catch (e) {
-    logger.debug("Failed to track logout event", e);
-  }
+  await trackEvent(ctx, cloudApiService, "didLogout", { loginMethod: "cli" });
 };
-const command$1 = ({ command: command2, 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 command$2 = ({ command: command2, 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$1)(ctx));
 };
 const logout = {
   name: "logout",
   description: "Strapi Cloud Logout",
-  action,
-  command: command$1
+  action: action$1,
+  command: command$2
 };
-const command = ({ command: command2, 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$3)(ctx));
+const command$1 = ({ command: command2, 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$4)(ctx));
 };
 const createProject = {
   name: "create-project",
   description: "Create a new project",
-  action: action$3,
+  action: action$4,
+  command: command$1
+};
+const action = async (ctx) => {
+  const { getValidToken } = await tokenServiceFactory(ctx);
+  const token = await getValidToken(ctx, promptLogin);
+  const { logger } = ctx;
+  if (!token) {
+    return;
+  }
+  const cloudApiService = await cloudApiFactory(ctx, token);
+  const spinner = logger.spinner("Fetching your projects...").start();
+  try {
+    const {
+      data: { data: projectList }
+    } = await cloudApiService.listProjects();
+    spinner.succeed();
+    logger.log(projectList);
+  } catch (e) {
+    ctx.logger.debug("Failed to list projects", e);
+    spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
+  }
+};
+const command = ({ command: command2, ctx }) => {
+  command2.command("cloud:projects").alias("projects").description("List Strapi Cloud projects").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("projects", action)(ctx));
+};
+const listProjects = {
+  name: "list-projects",
+  description: "List Strapi Cloud projects",
+  action,
   command
 };
 const cli = {
   deployProject,
+  link,
   login,
   logout,
-  createProject
+  createProject,
+  listProjects
 };
-const cloudCommands = [deployProject, login, logout];
+const cloudCommands = [deployProject, link, login, logout, listProjects];
 async function initCloudCLIConfig() {
   const localConfig = await getLocalConfig();
   if (!localConfig.deviceId) {