cloudron 4.14.0 → 4.14.4

package/bin/cloudron

@@ -27,6 +27,7 @@ function collectArgs(value, collected) {
     return collected;
 }
 
+// TODO when updating to commander v8 we require https://github.com/tj/commander.js/pull/1670
 program.version(version)
     .option('--server <server>', 'Cloudron domain')
     .option('--token <token>', 'Cloudron token')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "4.14.0",
+  "version": "4.14.4",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -18,7 +18,7 @@
   "author": "Cloudron Developers <support@cloudron.io>",
   "dependencies": {
     "async": "^3.2.3",
-    "cloudron-manifestformat": "^5.15.0",
+    "cloudron-manifestformat": "^5.15.2",
     "commander": "^6.1.0",
     "debug": "^4.3.3",
     "delay": "^5.0.0",

package/src/actions.js

@@ -67,6 +67,10 @@ const NO_APP_FOUND_ERROR_STRING = 'Could not determine app. Use --app to specify
 // options for the request module
 function requestOptions(options) {
     const adminFqdn = options.parent.server || config.apiEndpoint();
+
+    // ensure config can return the correct section
+    config.setActive(adminFqdn);
+
     const token = options.parent.token || config.token();
     const rejectUnauthorized = !(options.parent.allowSelfsigned || options.parent.acceptSelfsigned || config.allowSelfsigned());
 
@@ -82,7 +86,7 @@ function createRequest(method, apiPath, options) {
     if (url.includes('?')) url += '&'; else url += '?';
     url += `access_token=${token}`;
     const request = superagent(method, url);
-    if (rejectUnauthorized) request.disableTLSCerts();
+    if (!rejectUnauthorized) request.disableTLSCerts();
     request.ok(() => true);
     return request;
 }
@@ -364,11 +368,15 @@ async function login(adminFqdn, options) {
 
     config.setActive(adminFqdn);
 
+    const rejectUnauthorized = !(options.parent.allowSelfsigned || options.parent.acceptSelfsigned);
     let token = config.token();
     if (token) { // check if the token is not expired
-        const [error, response] = await safe(superagent.get(`https://${adminFqdn}/api/v1/profile?access_token=${token}`)
+        const request = superagent.get(`https://${adminFqdn}/api/v1/profile?access_token=${token}`)
             .timeout(60000)
-            .ok(() => true));
+            .ok(() => true);
+        if (!rejectUnauthorized) request.disableTLSCerts();
+
+        const [error, response] = await safe(request);
         if (error) return exit(error);
         if (response.status === 200) {
             console.log('Existing token still valid.');
@@ -381,7 +389,6 @@ async function login(adminFqdn, options) {
     if (!token) {
         const username = options.username || readlineSync.question('Username: ', {});
         const password = options.password || readlineSync.question('Password: ', { noEchoBack: true });
-        const rejectUnauthorized = !(options.parent.allowSelfsigned || options.parent.acceptSelfsigned);
 
         const [error, result] = await safe(authenticate(adminFqdn, username, password, { rejectUnauthorized, askForTotpToken: false }));
         if (error) return exit(`Failed to login: ${error.message}`);
@@ -646,12 +653,14 @@ async function configure(options) {
         const domainObject = await selectDomain(location, options);
 
         const secondaryDomains = {};
-        app.secondaryDomains.forEach(sd => {
-            secondaryDomains[sd.environmentVariable] = {
-                subdomain: sd.subdomain,
-                domain: sd.domain
-            };
-        });
+        if (app.secondaryDomains) { // only valid post 7.1
+            app.secondaryDomains.forEach(sd => {
+                secondaryDomains[sd.environmentVariable] = {
+                    subdomain: sd.subdomain,
+                    domain: sd.domain
+                };
+            });
+        }
 
         const data = {
             location: domainObject.subdomain, // LEGACY
@@ -969,7 +978,7 @@ async function inspect(options) {
         for (const app of response.body.apps) {
             const response2 = await createRequest('GET', `/api/v1/apps/${app.id}`, options);
             if (response2.statusCode !== 200) return exit(`Failed to list app: ${requestError(response2)}`);
-            response2.body.location = response2.body.subdomain; // LEGACY support
+            response2.body.location = response2.body.location || response2.body.subdomain; // LEGACY support
             apps.push(response2.body);
         }
 

package/src/appstore-actions.js

@@ -367,6 +367,19 @@ function approveVersion(appstoreId, version) {
 
         console.log('Approved.');
         console.log('');
+
+        superagentEnd(function () {
+            return superagent.get(createUrl('/api/v1/developers/apps/' + appstoreId + '/versions/' + version)).query({ accessToken: config.appStoreToken() });
+        }, function (error, result) {
+            if (error && !error.response) exit(util.format('Failed to list apps: %s', error.message));
+            if (result.statusCode !== 200) exit(util.format('Failed to list apps: %s message: %s', result.statusCode, result.text));
+
+            console.log('Changelog for forum update: ' + result.body.manifest.forumUrl);
+            console.log('');
+            console.log('[' + version + ']');
+            console.log(result.body.manifest.changelog);
+            console.log('');
+        });
     });
 }
 
@@ -505,6 +518,7 @@ function approve(options) {
         if (!version) return exit('--appstore-id must be of the format id@version');
 
         console.log('Approving ' + id + '@' + version);
+
         approveVersion(id, version);
     });
 }