cloudron 8.0.0 → 8.0.1

package/bin/cloudron

@@ -91,7 +91,7 @@ const buildCommand = program.command('build').description('Build using the build
     .option('--build-service-url <url>', 'Build service URL')
     .option('--build-service-token <token>', 'Build service token');
 
-buildCommand.command('build', { isDefault: true })
+const buildBuildCommand = buildCommand.command('build', { isDefault: true })
     .description('Build an app')
     .option('--build-arg <namevalue>', 'Build arg passed to docker. Can be used multiple times', collectBuildArgs, [])
     .option('-f, --file <dockerfile>', 'Name of the Dockerfile')
@@ -137,6 +137,11 @@ buildCommand.command('status')
     .option('--id <buildid>', 'Build ID')
     .action(buildActions.status);
 
+buildCommand.addHelpText('after', (ctx) => {
+    const header = '\nDefault subcommand `build` (same as `cloudron build build`; used when no subcommand is given):\n\n';
+    return header + buildBuildCommand.helpInformation({ error: ctx.error });
+});
+
 backupCommand.command('create')
     .description('Create new app backup')
     .option('--site <siteid>', 'App id')

package/package.json

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

package/src/actions.js

@@ -347,6 +347,7 @@ async function login(adminFqdn, localOptions, cmd) {
 
         if (semver.gte(response.body.version, '9.1.0')) {
             token = await performOidcLogin(adminFqdn, { rejectUnauthorized });
+            if (!token) process.exit(1);
         } else {
             const username = options.username || await readline.question('Username: ', {});
             const password = options.password || await readline.question('Password: ', { noEchoBack: true });

package/src/helper.js

@@ -87,7 +87,7 @@ async function performOidcLogin(adminFqdn, { rejectUnauthorized = true } = {}) {
 
     const { device_code, user_code, verification_uri_complete, verification_uri, interval: pollInterval = 5 } = deviceResponse.body;
 
-    console.log(`\nOpen ${verification_uri_complete || verification_uri} in a browser and enter code: ${user_code}\n`);
+    console.log(`\nOpen ${verification_uri_complete || verification_uri} in a browser and confirm code: ${user_code}\n`);
 
     // try to open browser automatically
     safe(open(verification_uri_complete || verification_uri));
@@ -119,10 +119,12 @@ async function performOidcLogin(adminFqdn, { rejectUnauthorized = true } = {}) {
             continue;
         }
 
-        throw new Error(tokenResponse.body.error_description || error);
+        console.log('Login failed. Try again.');
+        return null;
     }
 
-    throw new Error('Login timed out');
+    console.log('Login timed out. Try again.');
+    return null;
 }
 
 export {