cloudron 8.0.2 → 8.1.0

package/bin/cloudron

@@ -27,17 +27,7 @@ program.option('--server <server>', 'Cloudron domain')
     .option('--no-wait', 'Do not wait for the operation to finish');
 
 const appstoreCommand = program.command('appstore').description('Commands for publishing to the Appstore')
-    .option('--appstore-token <token>', 'AppStore token');
-
-appstoreCommand.command('login')
-    .description('Login to the appstore')
-    .option('-e, --email <email>', 'Email address')
-    .option('-p, --password <password>', 'Password (unsafe)')
-    .action(appstoreActions.login);
-
-appstoreCommand.command('logout')
-    .description('Logout from the appstore')
-    .action(appstoreActions.logout);
+    .requiredOption('--appstore-token <token>', 'AppStore token');
 
 appstoreCommand.command('info')
     .description('List info of published app')

package/package.json

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

package/src/appstore-actions.js

@@ -13,7 +13,7 @@ import Table from 'easy-table';
 const NO_MANIFEST_FOUND_ERROR_STRING = 'No CloudronManifest.json found';
 
 function requestError(response) {
-    if (response.status === 401) return 'Invalid token. Use cloudron appstore login again.';
+    if (response.status === 401) return 'Invalid token.';
 
     return `${response.status} message: ${response.body?.message || response.text || JSON.stringify(response.body)}`; // body is sometimes just a string like in 401
 }
@@ -30,10 +30,6 @@ function createRequest(method, apiPath, options) {
     return request;
 }
 
-function createUrl(api) {
-    return config.appStoreOrigin() + api;
-}
-
 // the app argument allows us in the future to get by name or id
 async function getAppstoreId(appstoreId) {
     if (appstoreId) return appstoreId.split('@');
@@ -47,54 +43,6 @@ async function getAppstoreId(appstoreId) {
     return [manifest.id, manifest.version];
 }
 
-async function authenticate(options) { // maybe we can use options.token to valid using a profile call?
-    if (!options.hideBanner) {
-        const webDomain = config.appStoreOrigin().replace('https://api.', '');
-        console.log(`${webDomain} login` + ` (If you do not have one, sign up at https://${webDomain}/console.html#/register)`);
-    }
-
-    const email = options.email || await readline.question('Email: ', {});
-    const password = options.password || await readline.question('Password: ', { noEchoBack: true });
-
-    config.setAppStoreToken(null);
-
-    const response = await superagent.post(createUrl('/api/v1/login')).auth(email, password).send({ totpToken: options.totpToken }).ok(() => true);
-    if (response.status === 401 && response.body.message.indexOf('TOTP') !== -1) {
-        if (response.body.message === 'TOTP token missing') console.log('A 2FA TOTP Token is required for this account.');
-
-        options.totpToken = await readline.question('2FA token: ', {});
-        options.email = email;
-        options.password = password;
-        options.hideBanner = true;
-
-        return await authenticate(options); // try again with top set
-    }
-
-    if (response.status !== 200) {
-        console.log('Login failed.');
-
-        options.hideBanner = true;
-        options.email = '';
-        options.password = '';
-
-        return await authenticate(options);
-    }
-
-    config.setAppStoreToken(response.body.accessToken);
-
-    console.log('Login successful.');
-}
-
-async function login(localOptions, cmd) {
-    const options = cmd.optsWithGlobals();
-    await authenticate(options);
-}
-
-function logout() {
-    config.setAppStoreToken(null);
-    console.log('Done.');
-}
-
 async function info(localOptions, cmd) {
     const options = cmd.optsWithGlobals();
     const [id, version] = await getAppstoreId(options.appstoreId);
@@ -238,19 +186,25 @@ async function verifyManifest(localOptions, cmd) {
     const appConfig = config.getCwdConfig(sourceDir);
 
     // image can be passed in options for buildbot
+    let missingDockerImage = false;
     if (options.image) {
         manifest.dockerImage = options.image;
     } else {
         manifest.dockerImage = appConfig.dockerImage;
     }
 
-    if (!manifest.dockerImage) exit('No docker image found, run `cloudron build` first');
+    if (!manifest.dockerImage) {
+        missingDockerImage = true;
+        manifest.dockerImage = `cloudron/${manifest.id}:${manifest.version}`;
+    }
 
     // ensure we remove the docker hub handle
     if (manifest.dockerImage.indexOf('docker.io/') === 0) manifest.dockerImage = manifest.dockerImage.slice('docker.io/'.length);
 
     const error = manifestFormat.checkAppstoreRequirements(manifest);
     if (error) return exit(error);
+
+    if (missingDockerImage) return exit('No docker image found, run `cloudron build` first');
 }
 
 async function checkDockerHub(dockerImage) {
@@ -471,8 +425,6 @@ async function notify() {
 }
 
 export default {
-    login,
-    logout,
     info,
     listVersions,
     submit,

package/src/build-actions.js

@@ -313,7 +313,10 @@ async function build(localOptions, cmd) {
         config.setCwdConfig(sourceDir, appConfig);
     }
 
-    appConfig.gitCommit = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim(); // when the build gets saved, save the gitCommit also
+    const gitCommit = safe.child_process.execSync('git rev-parse HEAD', { encoding: 'utf8' })?.trim(); // when the build gets saved, save the gitCommit also
+    if (safe.error) console.log('No git repository found. Continuing without commit sha info.');
+
+    appConfig.gitCommit = gitCommit || '';
     if (buildServiceConfig.type === 'remote' && buildServiceConfig.url) {
         console.log('Building using remote build service at %s', buildServiceConfig.url);
         await buildRemote(manifest, sourceDir, appConfig, options, buildServiceConfig);