cloudron 5.11.4 → 5.11.5

package/bin/cloudron-build

@@ -14,8 +14,8 @@ function collectArgs(value, collected) {
 
 // global options
 program.option('--server <server>', 'Cloudron domain')
-    .option('--build-service-token <token>', 'Build service token')
-    .option('--build-service, --set-build-service [buildservice url]', 'Set build service app URL. This build service is automatically used for future calls from this project');
+    .option('--token, --build-service-token <token>', 'Build service token')
+    .option('--url, --set-build-service [buildservice url]', 'Set build service URL. This build service is automatically used for future calls from this project');
 
 program.command('build', { isDefault: true })
     .description('Build an app. This is the default subcommand')
@@ -31,8 +31,7 @@ program.command('build', { isDefault: true })
 
 program.command('login')
     .description('Login to the build service')
-    .option('-u, --username <username>', 'Username')
-    .option('-p, --password <password>', 'Password (unsafe)')
+    .option('-t, --token <token>', 'Build service token')
     .action(buildActions.login);
 
 program.command('logs')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "5.11.4",
+  "version": "5.11.5",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",

package/src/build-actions.js

@@ -33,25 +33,50 @@ function requestError(response) {
     return `${response.statusCode} message: ${response.body?.message || null}`;
 }
 
+// analyzes options and merges with any existing build service config
+function getBuildServiceConfig(options) {
+    const buildService = config.getBuildServiceConfig();
+    if (!buildService.type) buildService.type = 'local'; // default
+
+    if (options.local) {
+        buildService.type = 'local';
+    } else if (options.setBuildService) { // stash for future use
+        buildService.token = null;
+        buildService.url = null;
+        buildService.type = 'remote';
+
+        let url;
+        if (typeof options.setBuildService === 'string') {
+            url = options.setBuildService;
+        } else {
+            url = readlineSync.question('Enter build service URL: ', { });
+        }
+
+        if (url.indexOf('://') === -1) url = `https://${url}`;
+        buildService.url = url;
+    }
+
+    if (options.buildServiceToken) buildService.token = options.buildServiceToken;
+
+    config.setBuildServiceConfig(buildService);
+
+    return buildService;
+}
+
 async function login(options) {
     assert.strictEqual(typeof options, 'object');
 
-    const buildServiceConfig = config.getBuildServiceConfig();
-
-    if (!options.hideBanner) console.log('Build Service login' + ` (${buildServiceConfig.url}):`);
+    const buildServiceConfig = getBuildServiceConfig(options);
 
-    const username = options.username || readlineSync.question('Username: ', {});
-    const password = options.password || readlineSync.question('Password: ', { noEchoBack: true });
+    console.log('Build Service login' + ` (${buildServiceConfig.url}):`);
 
-    // reset token
-    buildServiceConfig.token = null;
-    config.setBuildServiceConfig(buildServiceConfig);
+    const token = options.buildServiceToken || readlineSync.question('Token: ', {});
 
-    const response = await superagent.post(`${buildServiceConfig.url}/api/v1/login`).send({ username: username, password: password }).ok(() => true);
-    if (response.statusCode === 401 || response.statusCode === 403) return exit(`Authentication error: ${requestError(response)}}`);
-    if (response.statusCode !== 200 && response.statusCode !== 201) return exit(`Unexpected response: ${requestError(response)}`);
+    const response = await superagent.get(`${buildServiceConfig.url}/api/v1/profile`).query({ accessToken: token }).ok(() => true);
+    if (response.statusCode === 401 || response.statusCode === 403) return exit(`Authentication error: ${requestError(response)}`);
+    if (response.statusCode !== 200) return exit(`Unexpected response: ${requestError(response)}`);
 
-    buildServiceConfig.token = response.body.accessToken;
+    buildServiceConfig.token = token;
     config.setBuildServiceConfig(buildServiceConfig);
 
     console.log('Login successful.');
@@ -276,7 +301,9 @@ async function buildRemote(manifest, sourceDir, appConfig, options) {
     exit();
 }
 
-async function build(options) {
+async function build(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
+
     // try to find the manifest of this project
     const manifestFilePath = helper.locateManifest();
     if (!manifestFilePath) return exit('No CloudronManifest.json found');
@@ -288,31 +315,7 @@ async function build(options) {
     const sourceDir = path.dirname(manifestFilePath);
 
     const appConfig = config.getAppConfig(sourceDir);
-
-    const buildService = config.getBuildServiceConfig();
-    if (!buildService.type) buildService.type = 'local'; // default
-
-    if (options.local) {
-        buildService.type = 'local';
-    } else if (options.setBuildService) {
-        buildService.token = null;
-        buildService.url = null;
-        buildService.type = 'remote';
-
-        let url;
-        if (typeof options.setBuildService === 'string') {
-            url = options.setBuildService;
-        } else {
-            url = readlineSync.question('Enter build service URL: ', { });
-        }
-
-        if (url.indexOf('://') === -1) url = `https://${url}`;
-        buildService.url = url;
-    }
-
-    if (options.buildServiceToken) buildService.token = options.buildServiceToken;
-
-    config.setBuildServiceConfig(buildService);
+    const buildServiceConfig = getBuildServiceConfig(options);
 
     let repository = appConfig.repository;
     if (!repository || options.setRepository) {
@@ -328,23 +331,27 @@ async function build(options) {
         config.setAppConfig(sourceDir, appConfig);
     }
 
-    if (buildService.type === 'local') {
+    if (buildServiceConfig.type === 'local') {
         await buildLocal(manifest, sourceDir, appConfig, options);
-    } else if (buildService.type === 'remote' && buildService.url) {
+    } else if (buildServiceConfig.type === 'remote' && buildServiceConfig.url) {
         await buildRemote(manifest, sourceDir, appConfig, options);
     } else {
         exit('Unknown build service type or missing build service url. Rerun with --reset-build-service');
     }
 }
 
-async function logs(options) {
+async function logs(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
+
     if (!options.id) return exit('buildId is required');
 
     const [logsError] = await safe(followBuildLog(options.id, !!options.raw));
     if (logsError) console.log(`Failed to get logs: ${logsError.message}`);
 }
 
-async function status(options) {
+async function status(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
+
     if (!options.id) return exit('buildId is required');
 
     const [statusError, status] = await safe(getStatus(options.id));
@@ -352,12 +359,14 @@ async function status(options) {
     console.log(status);
 }
 
-async function push(options) {
+async function push(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
+
     if (!options.id) return exit('buildId is required');
     if (!options.repository) return exit('repository is required');
     if (!options.tag) return exit('tag is required');
 
-    const buildServiceConfig = config.getBuildServiceConfig();
+    const buildServiceConfig = getBuildServiceConfig(options);
 
     const response = await superagent.post(`${buildServiceConfig.url}/api/v1/builds/${options.id}/push`)
         .query({ accessToken: buildServiceConfig.token })