@swell/cli 2.0.1-alpha.10 → 2.0.1-alpha.12

package/dist/commands/app/push.js

@@ -50,7 +50,10 @@ ${Object.values(ConfigPaths)
         const file = fileArg || fileFlag;
         const currentStore = swellConfig.getDefaultStore();
         this.api.setStoreEnv(currentStore, 'test');
-        this.app = await this.getAppWithConfig('', false);
+        this.app = await this.getAppWithConfig('').catch((_err) => {
+            // Ignore so we can continue to create it
+            return {};
+        });
         const confirmExistingApp = await this.confirmRemoveInstalledApp(currentStore);
         if (confirmExistingApp === false) {
             return;

package/dist/commands/login.js

@@ -39,21 +39,14 @@ have available for logging in to.
                 // noop
             }
         }
-        if (!user) {
-            const [sessionId, storeId] = await getSessionIdOrLoginInBrowser(store);
-            this.api.setStoreEnv(storeId);
-            user = await this.api.get({ adminPath: 'user' }, { sessionId });
-            await this.getAndSetStoreConfig({ sessionId, storeId });
-            await modifyDefaultStore({ currentStoreId, storeId });
-            config.setUser(user);
-            this.log(`You are now logged in to ${style.storeId(storeId)} as ${style.currentUser(user.username)}.`);
-            process.exit(0);
-        }
-        this.log(`You are already logged in as ${style.currentUser(user.username)}.`);
-        this.log([
-            `Use ${style.command('swell switch')}`,
-            'to login to another account.',
-        ].join(' '));
+        const [sessionId, storeId] = await getSessionIdOrLoginInBrowser(store);
+        this.api.setStoreEnv(storeId);
+        user = await this.api.get({ adminPath: 'user' }, { sessionId });
+        await this.getAndSetStoreConfig({ sessionId, storeId });
+        await modifyDefaultStore({ currentStoreId, storeId });
+        config.setUser(user);
+        this.log(`You are now logged in to ${style.storeId(storeId)} as ${style.currentUser(user.username)}.`);
+        process.exit(0);
     }
     /**
      * Use the /user/switch API request to either get the session id for the

package/dist/lib/constants.js

@@ -13,5 +13,5 @@ export function getAdminApiBaseUrl(storeId) {
     return ADMIN_API_BASE_URL.replace('${STORE_ID}', storeId);
 }
 export function getLoginHost(storeId) {
-    return LOGIN_HOST.replace('${STORE_ID}', storeId || 'app');
+    return LOGIN_HOST.replace('${STORE_ID}', storeId || 'login');
 }

package/dist/remote-app-command.d.ts

@@ -12,7 +12,7 @@ export declare abstract class RemoteAppCommand extends AppCommand {
     }, storeId?: string): string;
     protected deleteConfig(configId: string): Promise<any>;
     protected getApp(id?: string): Promise<App>;
-    protected getAppWithConfig(id?: string, errorNotFound?: boolean): Promise<App>;
+    protected getAppWithConfig(id?: string): Promise<App>;
     protected getCreateUpdateApp(updateApp?: App): Promise<App>;
     protected handleRequestErrors(request: () => any, spinnerError?: () => void): Promise<any>;
     init(): Promise<void>;

package/dist/remote-app-command.js

@@ -51,7 +51,7 @@ export class RemoteAppCommand extends AppCommand {
         this.debugJson('getApp: remote app', app);
         return app;
     }
-    async getAppWithConfig(id = '', errorNotFound = true) {
+    async getAppWithConfig(id = '') {
         const swellId = this.app?.id;
         const appConfigId = this.appConfig.get('id');
         if (!appConfigId) {
@@ -90,7 +90,7 @@ export class RemoteAppCommand extends AppCommand {
             // we don't create a loop.
             //
             // we don't throw an error ever sometimes, like when pushing an app
-            const shouldThrow = !errorNotFound && (errorJson.error.message !== 'App not found' || id);
+            const shouldThrow = errorJson.error.message !== 'App not found' || id;
             if (shouldThrow) {
                 const errorMessage = typeof errorJson.error === 'string'
                     ? errorJson.error
@@ -201,6 +201,10 @@ export class RemoteAppCommand extends AppCommand {
                 this.showErrors(jsonError, spinnerError);
                 this.error('API request failed');
             }
+            else if (typeof error.message === 'string') {
+                this.showErrors(error, spinnerError);
+                this.error(error.message);
+            }
             throw error;
         }
     }

package/oclif.manifest.json

@@ -1086,5 +1086,5 @@
       ]
     }
   },
-  "version": "2.0.1-alpha.10"
+  "version": "2.0.1-alpha.12"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "2.0.1-alpha.10",
+  "version": "2.0.1-alpha.12",
   "type": "module",
   "description": "Swell's command line interface/utility",
   "keywords": [