npm - cloudron - Versions diffs - 7.1.0 → 7.1.2 - Mend

cloudron 7.1.0 → 7.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/bin/cloudron CHANGED Viewed

@@ -418,7 +418,8 @@ versionsCommand.command('list')
     .action(versionsActions.list);
 versionsCommand.command('revoke')
-    .description('Revoke the latest version')
+    .description('Revoke a version')
+    .option('--version <version>', 'Version to revoke (defaults to latest)')
     .action(versionsActions.revoke);
 versionsCommand.command('update')

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "7.1.0",
+  "version": "7.1.2",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "type": "module",

package/src/actions.js CHANGED Viewed

@@ -31,7 +31,7 @@ function requestOptions(options) {
     // ensure config can return the correct section
     config.setActive(adminFqdn);
-    const token = options.token || config.token();
+    const token = options.token || process.env.CLOUDRON_CLI_AUTH_TOKEN || config.token();
     const rejectUnauthorized = !(options.allowSelfsigned || options.acceptSelfsigned || config.allowSelfsigned());
     if (!adminFqdn && !token) return exit('Login with "cloudron login" first'); // a bit rough to put this here!

package/src/helper.js CHANGED Viewed

@@ -3,6 +3,7 @@ import fs from 'fs';
 import http from 'http';
 import open from 'open';
 import path from 'path';
+import readline from 'readline';
 import safe from '@cloudron/safetydance';
 import superagent from '@cloudron/superagent';
 import util from 'util';
@@ -128,15 +129,22 @@ async function performOidcLogin(adminFqdn, { rejectUnauthorized = true } = {}) {
             }
             const receivedCode = url.searchParams.get('code');
+            const successHtml = fs.readFileSync(path.join(import.meta.dirname, 'login-success.html'), 'utf8');
             res.writeHead(200, { 'Content-Type': 'text/html' });
-            res.end('<html><body><h1>Login successful!</h1><p>You can close this window and return to the terminal.</p></body></html>');
+            res.end(successHtml);
             server.close();
             resolve(receivedCode);
         });
-        server.listen(1312, () => {
-            console.log('Opening browser for authentication...');
-            open(authUrl.toString());
+        // without the host ip, it will listen on :: . on mac, which has dual stack disabled, it will listen on ipv6 only
+        server.listen(1312, '127.0.0.1', () => {
+            // console.log('Login at:');
+            // console.log(authUrl.toString());
+            const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+            rl.question('Press ENTER to authenticate using the browser...', () => {
+                rl.close();
+                open(authUrl.toString());
+            });
         });
         server.on('error', (err) => {

package/src/login-success.html ADDED Viewed

@@ -0,0 +1,61 @@
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Authentication successful</title>
+    <style>
+        * { margin: 0; padding: 0; box-sizing: border-box; }
+        body {
+            font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
+            min-height: 100vh;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            background: #f3f4f6;
+            color: #333;
+        }
+        .card {
+            text-align: center;
+            background: #fff;
+            border-radius: 4px;
+            padding: 48px 40px;
+            box-shadow: 0 2px 5px rgba(0,0,0,.1);
+        }
+        .icon {
+            width: 64px; height: 64px;
+            margin: 0 auto 24px;
+            background: #1a76bf21;
+            border-radius: 50%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+        }
+        .icon svg { width: 32px; height: 32px; color: #1a76bf; }
+        h1 { font-size: 22px; font-weight: 600; margin-bottom: 8px; }
+        p  { font-size: 15px; color: #666; line-height: 1.5; }
+        @media (prefers-color-scheme: dark) {
+          body {
+            background-color: black;
+            color: white;
+          }
+          .card {
+            background: #15181f;
+          }
+          p {
+            color: #aaa;
+          }
+        }
+    </style>
+</head>
+<body>
+    <div class="card">
+        <div class="icon">
+            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
+                <polyline points="20 6 9 17 4 12"/>
+            </svg>
+        </div>
+        <h1>Authentication successful</h1>
+        <p>You can close this tab and return to your command line.</p>
+    </div>
+</body>
+</html>

package/src/versions-actions.js CHANGED Viewed

@@ -252,21 +252,30 @@ async function list(/*localOptions, cmd*/) {
     console.log(t.toString());
 }
-async function revoke() {
+async function revoke(localOptions, cmd) {
     const versionsFilePath = await locateVersions();
     if (!versionsFilePath) return exit(NO_VERSIONS_FOUND_ERROR_STRING);
+    const options = cmd.optsWithGlobals();
     const versionsRoot = await readVersions(versionsFilePath);
     const versions = versionsRoot.versions;
-    const sortedVersions = Object.keys(versions).sort(manifestFormat.packageVersionCompare);
-    const latestVersion = sortedVersions.at(-1);
-    if (versions[latestVersion].publishState !== PUBLISH_STATE_PUBLISHED) {
-        return exit(`Only versions in "${PUBLISH_STATE_PUBLISHED}" can be revoked. ${latestVersion} is currently marked as "${versions[latestVersion].publishState}"`);
+    let targetVersion;
+    if (options.version) {
+        if (!(options.version in versions)) exit(`${options.version} does not exist in ${path.relative(process.cwd(), versionsFilePath)}.`);
+        targetVersion = options.version;
+    } else {
+        const sortedVersions = Object.keys(versions).sort(manifestFormat.packageVersionCompare);
+        targetVersion = sortedVersions.at(-1);
+    }
+    if (versions[targetVersion].publishState !== PUBLISH_STATE_PUBLISHED) {
+        return exit(`Only versions in "${PUBLISH_STATE_PUBLISHED}" can be revoked. ${targetVersion} is currently marked as "${versions[targetVersion].publishState}"`);
     }
-    versions[latestVersion].publishState = PUBLISH_STATE_REVOKED;
+    versions[targetVersion].publishState = PUBLISH_STATE_REVOKED;
     await writeVersions(versionsFilePath, versionsRoot);
-    console.log(`Marked ${latestVersion} as revoked in ${path.relative(process.cwd(), versionsFilePath)}`);
+    console.log(`Marked ${targetVersion} as revoked in ${path.relative(process.cwd(), versionsFilePath)}`);
 }
 export default {