cloudron 4.12.4 → 4.12.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "4.12.4",
+  "version": "4.12.8",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -42,7 +42,7 @@
     "underscore": "^1.13.1"
   },
   "engines": {
-    "node": ">= 4.x.x"
+    "node": ">= 14.x.x"
   },
   "devDependencies": {
     "expect.js": "^0.3.1",

package/src/actions.js

@@ -250,13 +250,18 @@ function startApp(app, options, callback) {
 }
 
 async function authenticate(adminFqdn, username, password, options) {
+    assert.strictEqual(typeof adminFqdn, 'string');
+    assert.strictEqual(typeof username, 'string');
+    assert.strictEqual(typeof password, 'string');
+    assert.strictEqual(typeof options, 'object');
+
     let totpToken;
 
     const { rejectUnauthorized, askForTotpToken } = options;
     if (askForTotpToken) totpToken = readlineSync.question('2FA Token: ', {});
 
     const request = superagent.post(`https://${adminFqdn}/api/v1/cloudron/login`)
-        .timeout(10000)
+        .timeout(60000)
         .send({ username, password, totpToken })
         .ok(() => true)
         .set('User-Agent', 'cloudron-cli');
@@ -264,10 +269,10 @@ async function authenticate(adminFqdn, username, password, options) {
     const response = await request; // this triggers the request
     if (response.status === 401) {
         if (response.body.message === 'A totpToken must be provided') {
-            return await authenticate(username, password, { rejectUnauthorized, askForTotpToken: true });
+            return await authenticate(adminFqdn, username, password, { rejectUnauthorized, askForTotpToken: true });
         } else if (response.body.message === 'Invalid totpToken') {
             console.log('Invalid 2FA Token'.red);
-            return await authenticate(username, password, { rejectUnauthorized, askForTotpToken: true });
+            return await authenticate(adminFqdn, username, password, { rejectUnauthorized, askForTotpToken: true });
         } else {
             throw new Error('Invalid credentials');
         }
@@ -290,7 +295,7 @@ async function login(adminFqdn, options) {
     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}`)
-            .timeout(10000)
+            .timeout(60000)
             .ok(() => true));
         if (error) return exit(error);
         if (response.status === 200) {
@@ -316,6 +321,8 @@ async function login(adminFqdn, options) {
     config.setToken(token);
     config.setAllowSelfsigned(options.parent.allowSelfsigned || options.parent.acceptSelfsigned);
     config.set('cloudrons.default', adminFqdn);
+
+    console.log('Login successful.'.green);
 }
 
 function logout() {
@@ -1157,7 +1164,7 @@ function backupList(options) {
             response.body.backups.forEach(function (backup) {
                 t.cell('Id', backup.id);
                 t.cell('Creation Time', backup.creationTime);
-                t.cell('Version', backup.version);
+                t.cell('Version', backup.packageVersion);
 
                 t.newRow();
             });

package/src/templates/Dockerfile.ejs

@@ -1,3 +1,3 @@
-FROM cloudron/base:3.0.0@sha256:455c70428723e3a823198c57472785437eb6eab082e79b3ff04ea584faf46e92
+FROM cloudron/base:3.1.0@sha256:eb2ab9c7d361acda2f3ef2d8388154bc48f1651b5013fe6de4beea003018e427
 
 EXPOSE <%- httpPort %>