@strapi/cloud-cli 4.25.1 → 4.25.3

package/dist/index.mjs

@@ -18,10 +18,11 @@ 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")
@@ -132,7 +133,7 @@ async function saveLocalConfig(data) {
   await fse.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
 }
 const name = "@strapi/cloud-cli";
-const version = "4.25.0";
+const version = "4.25.2";
 const description = "Commands to interact with the Strapi Cloud";
 const keywords = [
   "strapi",
@@ -173,10 +174,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.0",
+  "@strapi/utils": "4.25.2",
   axios: "1.6.0",
   chalk: "4.1.2",
   "cli-progress": "3.12.0",
@@ -201,8 +203,8 @@ const devDependencies = {
   "@types/cli-progress": "3.11.5",
   "@types/eventsource": "1.1.15",
   "@types/lodash": "^4.14.191",
-  "eslint-config-custom": "4.25.0",
-  tsconfig: "4.25.0"
+  "eslint-config-custom": "4.25.2",
+  tsconfig: "4.25.2"
 };
 const engines = {
   node: ">=18.0.0 <=20.x.x",
@@ -231,7 +233,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,
@@ -284,8 +286,19 @@ 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;
+      }
     },
     listProjects() {
       return axiosCloudAPI.get("/projects");
@@ -324,7 +337,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 +386,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 +430,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 +572,235 @@ 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 fs$1.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 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.");
-        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 +826,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$2 = 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 +901,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);
@@ -741,7 +963,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());
@@ -832,7 +1054,7 @@ async function getProject(ctx) {
   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);
@@ -841,10 +1063,9 @@ async function getProject(ctx) {
   }
   return project;
 }
-const action$2 = async (ctx) => {
+const action$1 = 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,6 +1073,7 @@ const action$2 = async (ctx) => {
   if (!project) {
     return;
   }
+  const cloudApiService = await cloudApiFactory(ctx);
   try {
     await cloudApiService.track("willDeployWithCLI", { projectInternalName: project.name });
   } catch (e) {
@@ -916,183 +1138,27 @@ const runAction = (name2, action2) => (...args) => {
   });
 };
 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));
+  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 = 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);
-      }
-    }
-  }
-  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.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(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;
-};
 const command$2 = ({ 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,
+  action: loginAction,
   command: command$2
 };
+const openModule = import("open");
 const action = async (ctx) => {
   const { logger } = ctx;
   const { retrieveToken, eraseToken } = await tokenServiceFactory(ctx);
@@ -1101,9 +1167,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."
     );
@@ -1127,12 +1205,12 @@ const logout = {
   command: command$1
 };
 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));
+  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 = {