@maker-or/opencms 0.1.4 → 0.1.6

package/README.md

@@ -19,6 +19,8 @@ npx @maker-or/opencms deploy
 
 `opencms create` authenticates you, creates an OpenCMS project, pulls the Next.js template, writes the project configuration, and installs dependencies.
 
+`opencms login` refreshes the saved browser session. The CLI also retries a management request once with a fresh browser session when the saved session has expired.
+
 The generated `cms/schema.json` file defines the project's content types and allowed blocks. The CLI syncs it to the development environment when `dev` or `deploy` runs.
 
 The CLI stores its local login configuration in `~/.config/opencms/config.json` (or `$XDG_CONFIG_HOME/opencms/config.json` when configured).

package/dist/index.js

@@ -211,6 +211,7 @@ var dashboardUrl = process.env.OPENCMS_DASHBOARD_URL ?? hostedUrl;
 var apiUrl = process.env.OPENCMS_API_URL ?? hostedUrl;
 var configRoot = process.env.XDG_CONFIG_HOME ?? join(homedir(), ".config");
 var configPath = join(configRoot, "opencms", "config.json");
+var legacyLocalApiUrl = "http://localhost:3000";
 async function readConfig() {
   if (!await fileExists(configPath))
     return {};
@@ -228,9 +229,16 @@ async function writeConfig(config) {
 function tokenFor(config) {
   return process.env.OPENCMS_CLERK_TOKEN ?? config.token ?? null;
 }
+function apiUrlFor(config) {
+  if (process.env.OPENCMS_API_URL)
+    return process.env.OPENCMS_API_URL;
+  if (config?.apiUrl && config.apiUrl !== legacyLocalApiUrl)
+    return config.apiUrl;
+  return apiUrl;
+}
 function sdk(config, projectId) {
   return createSdk({
-    baseUrl: process.env.OPENCMS_API_URL ?? config.apiUrl ?? apiUrl,
+    baseUrl: apiUrlFor(config),
     projectId,
     getToken: () => tokenFor(config)
   });
@@ -317,23 +325,27 @@ async function ensureToken(config) {
   if (token)
     return token;
   const loggedInToken = await browserLogin();
-  await writeConfig({ ...config, token: loggedInToken, apiUrl: config.apiUrl ?? apiUrl });
+  await writeConfig({ ...config, token: loggedInToken, apiUrl: apiUrlFor(config) });
   return loggedInToken;
 }
 async function reauthenticate(config) {
+  if (process.env.OPENCMS_CLERK_TOKEN) {
+    throw new Error("OPENCMS_CLERK_TOKEN was rejected or expired. Provide a fresh token or unset the variable to use browser login.");
+  }
   console.log("Your OpenCMS session has expired. Opening browser login…");
   const loggedInToken = await browserLogin();
-  await writeConfig({ ...config, token: loggedInToken, apiUrl: config.apiUrl ?? apiUrl });
+  await writeConfig({ ...config, token: loggedInToken, apiUrl: apiUrlFor(config) });
   return loggedInToken;
 }
 async function login() {
   const config = await readConfig();
   if (process.env.OPENCMS_CLERK_TOKEN) {
-    await writeConfig({ ...config, token: process.env.OPENCMS_CLERK_TOKEN, apiUrl: config.apiUrl ?? apiUrl });
+    await writeConfig({ ...config, token: process.env.OPENCMS_CLERK_TOKEN, apiUrl: apiUrlFor(config) });
     console.log("Saved OPENCMS_CLERK_TOKEN for local CLI use.");
     return;
   }
-  await ensureToken(config);
+  const loggedInToken = await browserLogin();
+  await writeConfig({ ...config, token: loggedInToken, apiUrl: apiUrlFor(config) });
   console.log("Logged in to OpenCMS.");
 }
 async function logout() {
@@ -431,7 +443,7 @@ async function createProject() {
   }
   const destination = resolve(process.cwd(), slugify(project.name));
   await pullTemplate(destination);
-  const baseUrl = process.env.OPENCMS_API_URL ?? config.apiUrl ?? apiUrl;
+  const baseUrl = apiUrlFor(config);
   await writeProjectEnv(destination, project, baseUrl);
   await ensureCmsDirectory(destination, project, baseUrl);
   await installDependencies(destination);
@@ -449,10 +461,25 @@ Next steps:
 async function runDev() {
   const config = await readConfig();
   await ensureToken(config);
-  await syncLocalSchema(await projectIdFromEnv(), await readConfig());
+  try {
+    await syncLocalSchema(await projectIdFromEnv(), await readConfig());
+  } catch (error) {
+    if (!(error instanceof OpenCmsApiError) || error.status !== 401)
+      throw error;
+    await reauthenticate(await readConfig());
+    await syncLocalSchema(await projectIdFromEnv(), await readConfig());
+  }
   const manager = await packageManager(process.cwd());
   const command = manager[0] === "npm" ? ["npm", "run", "dev"] : manager[0] === "pnpm" ? ["pnpm", "dev"] : manager[0] === "yarn" ? ["yarn", "dev"] : ["bun", "run", "dev"];
-  process.exit(await runCommand(command[0], command.slice(1), { cwd: process.cwd(), env: { ...process.env, OPENCMS_ENVIRONMENT: "development" }, inherit: true }));
+  process.exit(await runCommand(command[0], command.slice(1), {
+    cwd: process.cwd(),
+    env: {
+      ...process.env,
+      OPENCMS_API_URL: apiUrlFor(await readConfig()),
+      OPENCMS_ENVIRONMENT: "development"
+    },
+    inherit: true
+  }));
 }
 async function syncLocalSchema(projectId, config) {
   if (!projectId)
@@ -484,8 +511,17 @@ async function deploy() {
   const projectId = await projectIdFromEnv() ?? config.projectId;
   if (!projectId)
     throw new Error("No OpenCMS project is configured in this directory.");
-  await syncLocalSchema(projectId, await readConfig());
-  const deployment = await sdk(await readConfig()).deploy(projectId);
+  let deployment;
+  try {
+    await syncLocalSchema(projectId, await readConfig());
+    deployment = await sdk(await readConfig()).deploy(projectId);
+  } catch (error) {
+    if (!(error instanceof OpenCmsApiError) || error.status !== 401)
+      throw error;
+    await reauthenticate(await readConfig());
+    await syncLocalSchema(projectId, await readConfig());
+    deployment = await sdk(await readConfig()).deploy(projectId);
+  }
   console.log(`Deployed ${deployment.sourceEnvironment} content to ${deployment.targetEnvironment}.`);
   if (process.env.VERCEL_TOKEN) {
     console.log("Deploying the application to Vercel…");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maker-or/opencms",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "The developer-first CLI for OpenCMS",
   "type": "module",
   "repository": {