@strapi/cloud-cli 4.25.0 → 4.25.2

package/LICENSE

@@ -2,7 +2,21 @@ Copyright (c) 2015-present Strapi Solutions SAS
 
 Portions of the Strapi software are licensed as follows:
 
-* All software that resides under an "ee/" directory (the “EE Software”), if that directory exists, is licensed under the license defined in "ee/LICENSE".
+* All software that resides under an "ee/" directory (the “EE Software”), if that directory exists, is licensed under the license defined below.
+
+Enterprise License
+
+If you or the company you represent has entered into a written agreement referencing the Enterprise Edition of the Strapi source code available at
+https://github.com/strapi/strapi, then such agreement applies to your use of the Enterprise Edition of the Strapi Software. If you or the company you
+represent is using the Enterprise Edition of the Strapi Software in connection with a subscription to our cloud offering, then the agreement you have
+agreed to with respect to our cloud offering and the licenses included in such agreement apply to your use of the Enterprise Edition of the Strapi Software.
+Otherwise, the Strapi Enterprise Software License Agreement (found here https://strapi.io/enterprise-terms) applies to your use of the Enterprise Edition of the Strapi Software.
+
+BY ACCESSING OR USING THE ENTERPRISE EDITION OF THE STRAPI SOFTWARE, YOU ARE AGREEING TO BE BOUND BY THE RELEVANT REFERENCED AGREEMENT.
+IF YOU ARE NOT AUTHORIZED TO ACCEPT THESE TERMS ON BEHALF OF THE COMPANY YOU REPRESENT OR IF YOU DO NOT AGREE TO ALL OF THE RELEVANT TERMS AND CONDITIONS REFERENCED AND YOU
+HAVE NOT OTHERWISE EXECUTED A WRITTEN AGREEMENT WITH STRAPI, YOU ARE NOT AUTHORIZED TO ACCESS OR USE OR ALLOW ANY USER TO ACCESS OR USE ANY PART OF
+THE ENTERPRISE EDITION OF THE STRAPI SOFTWARE.  YOUR ACCESS RIGHTS ARE CONDITIONAL ON YOUR CONSENT TO THE RELEVANT REFERENCED TERMS TO THE EXCLUSION OF ALL OTHER TERMS;
+IF THE RELEVANT REFERENCED TERMS ARE CONSIDERED AN OFFER BY YOU, ACCEPTANCE IS EXPRESSLY LIMITED TO THE RELEVANT REFERENCED TERMS.
 
 * All software outside of the above-mentioned directories or restrictions above is available under the "MIT Expat" license as set forth below.
 
@@ -18,5 +32,6 @@ furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/dist/index.js

@@ -194,7 +194,7 @@ async function saveLocalConfig(data) {
   await fse__default.default.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
 }
 const name = "@strapi/cloud-cli";
-const version = "4.24.5";
+const version = "4.25.1";
 const description = "Commands to interact with the Strapi Cloud";
 const keywords = [
   "strapi",
@@ -238,7 +238,7 @@ const scripts = {
   watch: "pack-up watch"
 };
 const dependencies = {
-  "@strapi/utils": "4.24.5",
+  "@strapi/utils": "4.25.1",
   axios: "1.6.0",
   chalk: "4.1.2",
   "cli-progress": "3.12.0",
@@ -263,8 +263,8 @@ const devDependencies = {
   "@types/cli-progress": "3.11.5",
   "@types/eventsource": "1.1.15",
   "@types/lodash": "^4.14.191",
-  "eslint-config-custom": "4.24.5",
-  tsconfig: "4.24.5"
+  "eslint-config-custom": "4.25.1",
+  tsconfig: "4.25.1"
 };
 const engines = {
   node: ">=18.0.0 <=20.x.x",
@@ -293,7 +293,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,
@@ -346,8 +346,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");
@@ -386,7 +397,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) {
@@ -435,14 +446,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__default.default.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();
       });
     });
   }
@@ -476,15 +490,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;
   }
@@ -618,17 +632,183 @@ const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
   local: strapiInfoSave,
   tokenServiceFactory
 }, Symbol.toStringTag, { value: "Module" }));
-async function handleError(ctx, error) {
+const openModule$1 = import("open");
+async function promptLogin(ctx) {
+  const response = await inquirer__default.default.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__default.default.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__default.default.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__default.default.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__default.default.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 axios.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."
@@ -654,28 +834,44 @@ 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 projectAnswersDefaulted = fp.defaults(defaultValues);
   const projectAnswers = await inquirer__default.default.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 axios.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 }) {
@@ -803,7 +999,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__namespace.default.resolve(process.cwd());
@@ -894,7 +1090,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);
@@ -903,10 +1099,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;
   }
@@ -914,6 +1109,7 @@ const action$2 = async (ctx) => {
   if (!project) {
     return;
   }
+  const cloudApiService = await cloudApiFactory(ctx);
   try {
     await cloudApiService.track("willDeployWithCLI", { projectInternalName: project.name });
   } catch (e) {
@@ -978,183 +1174,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__default.default.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__default.default.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__default.default.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__default.default.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);
@@ -1163,9 +1203,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."
     );
@@ -1189,12 +1241,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 = {