@maker-or/opencms 0.1.0 → 0.1.2

package/dist/index.js

@@ -7,6 +7,7 @@ import { join, resolve } from "node:path";
 import { access, mkdir, readdir, readFile, rm, writeFile } from "node:fs/promises";
 import { constants } from "node:fs";
 import { spawn } from "node:child_process";
+import { createInterface } from "node:readline/promises";
 import process from "node:process";
 
 // ../../packages/sdk/src/index.ts
@@ -121,6 +122,14 @@ function sdk(config, projectId) {
     getToken: () => tokenFor(config)
   });
 }
+async function ask(question) {
+  const terminal = createInterface({ input: process.stdin, output: process.stdout });
+  try {
+    return (await terminal.question(question)).trim();
+  } finally {
+    terminal.close();
+  }
+}
 function fileExists(path) {
   return access(path, constants.F_OK).then(() => true, () => false);
 }
@@ -198,6 +207,12 @@ async function ensureToken(config) {
   await writeConfig({ ...config, token: loggedInToken, apiUrl: config.apiUrl ?? apiUrl });
   return loggedInToken;
 }
+async function reauthenticate(config) {
+  console.log("Your OpenCMS session has expired. Opening browser login…");
+  const loggedInToken = await browserLogin();
+  await writeConfig({ ...config, token: loggedInToken, apiUrl: config.apiUrl ?? apiUrl });
+  return loggedInToken;
+}
 async function login() {
   const config = await readConfig();
   if (process.env.OPENCMS_CLERK_TOKEN) {
@@ -280,11 +295,22 @@ async function pullTemplate(destination) {
 async function createProject() {
   const config = await readConfig();
   await ensureToken(config);
-  const name = prompt("Project name:")?.trim();
+  const name = await ask("Project name: ");
   if (!name)
     throw new Error("A project name is required.");
-  const client = sdk(await readConfig());
-  const project = await client.projects.create({ name });
+  let currentConfig = await readConfig();
+  let client = sdk(currentConfig);
+  let project;
+  try {
+    project = await client.projects.create({ name });
+  } catch (error) {
+    if (!(error instanceof OpenCmsApiError) || error.status !== 401)
+      throw error;
+    await reauthenticate(currentConfig);
+    currentConfig = await readConfig();
+    client = sdk(currentConfig);
+    project = await client.projects.create({ name });
+  }
   const destination = resolve(process.cwd(), slugify(project.name));
   await pullTemplate(destination);
   const baseUrl = process.env.OPENCMS_API_URL ?? config.apiUrl ?? apiUrl;

package/package.json

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