PTF-1349: whoami message updated

Author: Max

package.json

@@ -1,7 +1,7 @@
 {
   "name": "codestore",
   "description": "code.store CLI. Add services, deploy, debug, perform all operations from your terminal.",
-  "version": "1.9.9",
+  "version": "1.9.10",
   "bin": {
     "codestore": "./bin/run",
     "cs": "./bin/run"

src/commands/auth/login.ts

@@ -22,6 +22,6 @@ export default class Login extends Command {
     const user = await this.codestore.getMe();
 
     ux.action.stop(blue('Done'));
-    this.log(blue(`👋 Welcome to code.store, dear ${user.firstName}`));
+    this.log(blue(`👋 Welcome to code.store${user.firstName ? `, dear ${user.firstName}` : ''}`));
   }
 }

src/commands/auth/whoami.ts

@@ -14,7 +14,19 @@ export default class Whoami extends Command {
   public async execute(): Promise<void> {
     try {
       const user: IUser = await this.codestore.getMe();
-      this.log(`You're ${chalk.cyan(user.firstName)}, officially ${chalk.cyan(user.lastName)} using ${chalk.cyan(user.email)} as main email${user?.organization?.name ? ` and working for ${chalk.cyan(user.organization.name)}` : ''}. Oh, and you're amazing!`);
+      let welcomeMessage = "You're";
+      if (user.firstName) {
+        welcomeMessage += `${chalk.cyan(user.firstName)},`;
+      }
+      if (user.lastName) {
+        welcomeMessage += ` officially ${chalk.cyan(user.lastName)}`;
+      }
+      welcomeMessage += ` using ${chalk.cyan(user.email)} as main email`;
+      if (user?.organization?.name) {
+        welcomeMessage += ` and working for ${chalk.cyan(user.organization.name)}`;
+      }
+      welcomeMessage += ". Oh, and you're amazing!";
+      this.log(welcomeMessage);
     } catch (error) {
       if (error.message === 'GraphQL error: Bad JWT token.') {
         throw new NotAuthorizedError();

src/lib/command.ts

@@ -30,6 +30,8 @@ export default abstract class Command extends Base {
 
   public static apiPath = process.env.CODESTORE_GATEWAY_HOST || 'https://api.code.store';
 
+  public static appPath = process.env.CODESTORE_APP_HOST || 'https://app.code.store';
+
   public get codestore(): APIClient {
     return this._codestore;
   }