storyblok 4.12.0 → 4.13.0

package/dist/index.mjs

@@ -1862,23 +1862,117 @@ function session() {
   return sessionInstance;
 }
 
+async function performInteractiveLogin(options) {
+  const { verbose = false, preSelectedRegion, showWelcomeMessage = true } = options || {};
+  const spinner = new Spinner({
+    verbose: !isVitest
+  });
+  try {
+    const strategy = await select({
+      message: "How would you like to login?",
+      choices: [
+        {
+          name: "With email",
+          value: "login-with-email",
+          short: "Email"
+        },
+        {
+          name: "With Token (Personal Access Token \u2013 works also for SSO accounts)",
+          value: "login-with-token",
+          short: "Token"
+        }
+      ]
+    });
+    let userToken;
+    let userRegion;
+    if (strategy === "login-with-token") {
+      konsola.info([
+        "\u{1F511} You can use a Personal Access Token to log in.",
+        "This works for all accounts, including SSO accounts.",
+        `Generate one in your Storyblok account settings: ${chalk.underline.blue("https://app.storyblok.com/#/me/account?tab=token")}`
+      ].join("\n"));
+      userToken = await password({
+        message: "Please enter your Personal Access Token:",
+        validate: (value) => {
+          return value.length > 0;
+        }
+      });
+      userRegion = preSelectedRegion || await select({
+        message: "Please select the region you would like to work in:",
+        choices: Object.values(regions).map((region) => ({
+          name: regionNames[region],
+          value: region
+        })),
+        default: regions.EU
+      });
+      spinner.start(`Logging in with token`);
+      const user = await loginWithToken(userToken, userRegion);
+      spinner.succeed();
+      if (user) {
+        const { updateSession, persistCredentials } = session();
+        updateSession(user.email, userToken, userRegion);
+        await persistCredentials(userRegion);
+        if (showWelcomeMessage) {
+          konsola.ok(`Successfully logged in to region ${chalk.hex(colorPalette.PRIMARY)(`${regionNames[userRegion]} (${userRegion})`)}. Welcome ${chalk.hex(colorPalette.PRIMARY)(user.friendly_name)}.`, true);
+        }
+        return { token: userToken, region: userRegion };
+      }
+    } else {
+      const userEmail = await input({
+        message: "Please enter your email address:",
+        required: true,
+        validate: (value) => {
+          const emailRegex = /^[^\s@]+@[^\s@][^\s.@]*\.[^\s@]+$/;
+          return emailRegex.test(value);
+        }
+      });
+      const userPassword = await password({
+        message: "Please enter your password:"
+      });
+      userRegion = preSelectedRegion || await select({
+        message: "Please select the region you would like to work in:",
+        choices: Object.values(regions).map((region) => ({
+          name: regionNames[region],
+          value: region
+        })),
+        default: regions.EU
+      });
+      spinner.start(`Logging in with email`);
+      spinner.succeed();
+      const response = await loginWithEmailAndPassword(userEmail, userPassword, userRegion);
+      if (response?.otp_required) {
+        const otp = await input({
+          message: "Add the code from your Authenticator app, or the one we sent to your e-mail / phone:",
+          required: true
+        });
+        const otpResponse = await loginWithOtp(userEmail, userPassword, otp, userRegion);
+        if (otpResponse?.access_token) {
+          userToken = otpResponse.access_token;
+        }
+      } else if (response?.access_token) {
+        userToken = response.access_token;
+      }
+      if (userToken) {
+        const { updateSession, persistCredentials } = session();
+        updateSession(userEmail, userToken, userRegion);
+        await persistCredentials(userRegion);
+        if (showWelcomeMessage) {
+          konsola.ok(`Successfully logged in to region ${chalk.hex(colorPalette.PRIMARY)(`${regionNames[userRegion]} (${userRegion})`)}. Welcome ${chalk.hex(colorPalette.PRIMARY)(userEmail)}.`, true);
+        }
+        return { token: userToken, region: userRegion };
+      }
+    }
+    return null;
+  } catch (error) {
+    spinner.failed();
+    konsola.br();
+    handleError(error, verbose);
+    return null;
+  }
+}
+
 const program$h = getProgram();
 const allRegionsText = Object.values(regions).join(",");
-const loginStrategy = {
-  message: "How would you like to login?",
-  choices: [
-    {
-      name: "With email",
-      value: "login-with-email",
-      short: "Email"
-    },
-    {
-      name: "With Token (Personal Access Token \u2013 works also for SSO accounts)",
-      value: "login-with-token",
-      short: "Token"
-    }
-  ]
-};
 program$h.command(commands.LOGIN).description("Login to the Storyblok CLI").option("-t, --token <token>", "Token to login directly without questions, like for CI environments").option(
   "-r, --region <region>",
   `The region you would like to work in. Please keep in mind that the region must match the region of your space. This region flag will be used for the other cli's commands. You can use the values: ${allRegionsText}.`
@@ -1926,85 +2020,16 @@ program$h.command(commands.LOGIN).description("Login to the Storyblok CLI").opti
       handleError(error, verbose);
     }
   } else {
-    const spinner = new Spinner({
-      verbose: !isVitest
-    });
     try {
-      const strategy = await select(loginStrategy);
-      if (strategy === "login-with-token") {
-        konsola.info([
-          "\u{1F511} You can use a Personal Access Token to log in.",
-          "This works for all accounts, including SSO accounts.",
-          `Generate one in your Storyblok account settings: ${chalk.underline.blue("https://app.storyblok.com/#/me/account?tab=token")}`
-        ].join("\n"));
-        const userToken = await password({
-          message: "Please enter your Personal Access Token:",
-          validate: (value) => {
-            return value.length > 0;
-          }
-        });
-        let userRegion = region;
-        if (!userRegion) {
-          userRegion = await select({
-            message: "Please select the region you would like to work in:",
-            choices: Object.values(regions).map((region2) => ({
-              name: regionNames[region2],
-              value: region2
-            })),
-            default: regions.EU
-          });
-        }
-        spinner.start(`Logging in with token`);
-        const user = await loginWithToken(userToken, userRegion);
-        spinner.succeed();
-        if (user) {
-          updateSession(user.email, userToken, userRegion);
-          await persistCredentials(userRegion);
-          konsola.ok(`Successfully logged in to region ${chalk.hex(colorPalette.PRIMARY)(`${regionNames[userRegion]} (${userRegion})`)}. Welcome ${chalk.hex(colorPalette.PRIMARY)(user.friendly_name)}.`, true);
-        }
-      } else {
-        const userEmail = await input({
-          message: "Please enter your email address:",
-          required: true,
-          validate: (value) => {
-            const emailRegex = /^[^\s@]+@[^\s@][^\s.@]*\.[^\s@]+$/;
-            return emailRegex.test(value);
-          }
-        });
-        const userPassword = await password({
-          message: "Please enter your password:"
-        });
-        let userRegion = region;
-        if (!userRegion) {
-          userRegion = await select({
-            message: "Please select the region you would like to work in:",
-            choices: Object.values(regions).map((region2) => ({
-              name: regionNames[region2],
-              value: region2
-            })),
-            default: regions.EU
-          });
-        }
-        spinner.start(`Logging in with email`);
-        spinner.succeed();
-        const response = await loginWithEmailAndPassword(userEmail, userPassword, userRegion);
-        if (response?.otp_required) {
-          const otp = await input({
-            message: "Add the code from your Authenticator app, or the one we sent to your e-mail / phone:",
-            required: true
-          });
-          const otpResponse = await loginWithOtp(userEmail, userPassword, otp, userRegion);
-          if (otpResponse?.access_token) {
-            updateSession(userEmail, otpResponse?.access_token, userRegion);
-          }
-        } else if (response?.access_token) {
-          updateSession(userEmail, response.access_token, userRegion);
-        }
-        await persistCredentials(region);
-        konsola.ok(`Successfully logged in to region ${chalk.hex(colorPalette.PRIMARY)(`${regionNames[userRegion]} (${userRegion})`)}. Welcome ${chalk.hex(colorPalette.PRIMARY)(userEmail)}.`, true);
+      const result = await performInteractiveLogin({
+        verbose,
+        preSelectedRegion: region,
+        showWelcomeMessage: true
+      });
+      if (!result) {
+        konsola.warn("Login cancelled or failed.");
       }
     } catch (error) {
-      spinner.failed();
       konsola.br();
       handleError(error, verbose);
     }
@@ -6257,6 +6282,24 @@ function showNextSteps(technologyTemplate, finalProjectPath) {
         `);
   konsola.info(`Or check the dedicated guide at: ${chalk.hex(colorPalette.PRIMARY)(`https://www.storyblok.com/docs/guides/${technologyTemplate}`)}`);
 }
+async function promptForLogin(verbose) {
+  try {
+    konsola.br();
+    const shouldLogin = await confirm({
+      message: "Would you like to login now?",
+      default: true
+    });
+    if (!shouldLogin) {
+      konsola.warn('Login cancelled. You can login later using the "storyblok login" command.');
+      return null;
+    }
+    return await performInteractiveLogin({ verbose, showWelcomeMessage: true });
+  } catch (error) {
+    konsola.br();
+    handleError(error, verbose);
+    return null;
+  }
+}
 const program$3 = getProgram();
 program$3.command(`${commands.CREATE} [project-path]`).alias("c").description(`Scaffold a new project using Storyblok`).option("-t, --template <template>", "technology starter template").option("-b, --blueprint <blueprint>", "[DEPRECATED] use --template instead").option("--skip-space", "skip space creation").option("--token <token>", "Storyblok access token (skip space creation and use this token)").option(
   "-r, --region <region>",
@@ -6278,20 +6321,38 @@ program$3.command(`${commands.CREATE} [project-path]`).alias("c").description(`S
   }
   const { state, initializeSession } = session();
   await initializeSession();
-  if (!requireAuthentication(state, verbose)) {
-    return;
-  }
-  const { password, region } = state;
-  if (options.region && options.region !== region && !options.skipSpace && !token) {
-    handleError(new CommandError(`Cannot create space in region "${options.region}". Your account is configured for region "${region}". Space creation must use your account's region.`));
-    return;
+  let password;
+  let region;
+  if (state.region) {
+    region = state.region;
+  }
+  if (!token && !options.skipSpace) {
+    if (!requireAuthentication(state, verbose)) {
+      const loginResult = await promptForLogin(verbose);
+      if (!loginResult) {
+        return;
+      }
+      await initializeSession();
+    }
+    const authenticatedState = state;
+    password = authenticatedState.password;
+    region = authenticatedState.region;
+    if (options.region && options.region !== region) {
+      handleError(new CommandError(`Cannot create space in region "${options.region}". Your account is configured for region "${region}". Space creation must use your account's region.`));
+      return;
+    }
+    mapiClient({
+      token: {
+        accessToken: password
+      },
+      region
+    });
+  } else if (state.isLoggedIn && state.password) {
+    password = state.password;
+    if (state.region) {
+      region = state.region;
+    }
   }
-  mapiClient({
-    token: {
-      accessToken: password
-    },
-    region
-  });
   const spinnerBlueprints = new Spinner({
     verbose: !isVitest
   });
@@ -6374,10 +6435,26 @@ program$3.command(`${commands.CREATE} [project-path]`).alias("c").description(`S
           throw new Error("User data is undefined");
         }
         userData = user;
-      } catch (error) {
-        konsola.error("Failed to fetch user info. Please login again.", error);
-        konsola.br();
-        return;
+      } catch {
+        konsola.error("Failed to fetch user info. Your session may have expired.");
+        const loginResult = await promptForLogin(verbose);
+        if (!loginResult) {
+          konsola.br();
+          return;
+        }
+        await initializeSession();
+        const { password: newPassword, region: newRegion } = session().state;
+        try {
+          const user = await getUser(newPassword, newRegion);
+          if (!user) {
+            throw new Error("User data is undefined");
+          }
+          userData = user;
+        } catch (retryError) {
+          konsola.error("Failed to fetch user info after login.", retryError);
+          konsola.br();
+          return;
+        }
       }
       const choices = [
         { name: "My personal account", value: "personal" }