contensis-cli 1.0.0-beta.5 → 1.0.0-beta.51

package/src/services/ContensisCliService.ts

@@ -3,7 +3,8 @@ import path from 'path';
 import fetch from 'node-fetch';
 import inquirer from 'inquirer';
 import to from 'await-to-js';
-import { Component, ContentType } from 'contensis-core-api';
+import chalk from 'chalk';
+import { Component, ContentType, Project } from 'contensis-core-api';
 import { isPassword, isSharedSecret, isUuid, url } from '~/util';
 import SessionCacheProvider from '../providers/SessionCacheProvider';
 import ContensisAuthService from './ContensisAuthService';
@@ -16,13 +17,21 @@ import {
   PushBlockParams,
   SourceCms,
   logEntriesTable,
+  ContentTypesResult,
+  Model,
+  MigrateModelsResult,
 } from 'migratortron';
 import { Entry } from 'contensis-management-api/lib/models';
 
 import { csvFormatter } from '~/util/csv.formatter';
 import { xmlFormatter } from '~/util/xml.formatter';
 import { jsonFormatter } from '~/util/json.formatter';
-import { printBlockVersion, printMigrateResult } from '~/util/console.printer';
+import {
+  printBlockVersion,
+  printMigrateResult,
+  printModelMigrationAnalysis,
+  printModelMigrationResult,
+} from '~/util/console.printer';
 import { readJsonFile } from '~/providers/file-provider';
 
 type OutputFormat = 'json' | 'csv' | 'xml';
@@ -45,28 +54,31 @@ interface IAuthOptions {
 }
 
 interface IImportOptions {
-  sourceEnv?: string;
+  sourceAlias?: string;
   sourceProjectId?: string;
 }
 
+let insecurePasswordWarningShown = false;
+
 class ContensisCli {
   static quit = (error?: Error) => {
     process.removeAllListeners('exit');
     const exitCode = error ? 1 : 0;
 
-    console.info(`\nExiting contensis-cli with exit code: ${exitCode}\n`);
+    // console.info(`\nExiting contensis-cli with exit code: ${exitCode}\n`);
     process.exit(exitCode);
   };
 
-  cache: SessionCache;
+  private command: CliCommand;
+  private format?: OutputFormat;
+  private output?: string;
+  private session: SessionCacheProvider;
+
   contensis?: ContensisMigrationService;
   contensisOpts: Partial<MigrateRequest>;
-  contentTypes?: ContentType[];
-  components?: Component[];
-  currentEnv: string;
   currentProject: string;
-  env: EnvironmentCache;
-  sourceEnv?: string;
+
+  sourceAlias?: string;
   targetEnv?: string;
   urls:
     | {
@@ -78,17 +90,53 @@ class ContensisCli {
         iisPreviewWeb: string;
       }
     | undefined;
-  private command: CliCommand;
-  private format?: OutputFormat;
-  private output?: string;
   log = Logger;
   messages = LogMessages;
-  private session: SessionCacheProvider;
 
   verb: string;
   noun: string;
   thirdArg: string;
 
+  get cache() {
+    return this.session.Get();
+  }
+
+  get currentEnv() {
+    return this.cache.currentEnvironment || '';
+  }
+
+  set currentEnv(currentEnvironment: string) {
+    this.session.Update({ currentEnvironment });
+  }
+
+  get env() {
+    const currentEnvironment = this.currentEnv;
+    const environments = this.cache.environments || {};
+
+    if (!currentEnvironment) return {} as EnvironmentCache;
+    else if (!!environments[currentEnvironment])
+      return environments[currentEnvironment];
+    else {
+      return {
+        history: [],
+        lastUserId: '',
+        projects: [],
+        versionStatus: 'latest',
+      } as EnvironmentCache;
+    }
+  }
+
+  get contentTypes() {
+    return this.contensis?.models.contentTypes();
+  }
+
+  get components() {
+    return this.contensis?.models.components();
+  }
+  get models(): Model[] | undefined {
+    return this.contensis?.models.contentModels();
+  }
+
   constructor(
     args: string[],
     outputOpts?: OutputOptions & IConnectOptions & IImportOptions,
@@ -106,40 +154,28 @@ class ContensisCli {
     }`.trim();
 
     this.session = new SessionCacheProvider();
-    this.cache = this.session.Get();
+
     this.contensisOpts = contensisOpts;
     this.format = outputOpts?.format;
     this.output =
       outputOpts?.output && path.join(process.cwd(), outputOpts.output);
 
-    const currentEnvironment =
-      outputOpts?.alias || this.cache.currentEnvironment || '';
+    const currentEnvironment = outputOpts?.alias || this.currentEnv;
     const environments = this.cache.environments || {};
-
-    if (!currentEnvironment) this.env = {} as EnvironmentCache;
-    else if (!!environments[currentEnvironment])
-      this.env = environments[currentEnvironment];
-    else {
-      this.env = {
-        history: [],
-        lastUserId: '',
-        projects: [],
-        versionStatus: 'latest',
-      };
-    }
+    this.currentEnv = currentEnvironment;
 
     const env = this.env;
 
     if (outputOpts?.projectId) env.currentProject = outputOpts.projectId;
     if (outputOpts?.user) env.lastUserId = outputOpts.user;
+    // setting this in env means passwordFallback is written to environments.json
     if (outputOpts?.password) env.passwordFallback = outputOpts.password;
     if (outputOpts?.clientId) env.lastUserId = outputOpts.clientId;
     if (outputOpts?.sharedSecret)
       env.passwordFallback = outputOpts.sharedSecret;
 
-    this.currentEnv = currentEnvironment;
     this.currentProject = env?.currentProject || 'null';
-    this.sourceEnv = outputOpts?.sourceEnv || currentEnvironment;
+    this.sourceAlias = outputOpts?.sourceAlias || currentEnvironment;
 
     if (currentEnvironment) {
       this.urls = url(currentEnvironment, env?.currentProject || 'website');
@@ -154,7 +190,7 @@ class ContensisCli {
     if (currentEnvironment) {
       env.history = [this.command];
       if (commandText) {
-        environments[currentEnvironment] = this.env;
+        environments[currentEnvironment] = env;
         this.session.Update({
           currentEnvironment,
           environments,
@@ -181,45 +217,24 @@ class ContensisCli {
   };
 
   Connect = async (environment: string) => {
-    const { cache, log, messages, session } = this;
+    const { log, messages, session } = this;
 
     if (environment) {
-      const envCache = cache.environments[environment];
-      if (!envCache)
-        cache.environments[environment] = {
-          versionStatus: 'published',
-          history: [],
-          lastUserId: '',
-          projects: [],
-          ...(!this.currentEnv ? this.env : {}),
-        };
-
-      this.env = cache.environments[environment];
       this.currentEnv = environment;
       this.urls = url(environment, 'website');
 
       const [fetchErr, response] = await to(fetch(this.urls.cms));
       if (response && response?.status < 400) {
         log.success(messages.connect.connected(environment));
+        session.UpdateEnv(this.env, environment);
 
         if (this.env?.lastUserId) {
-          await this.ConnectContensis();
+          // await this.ConnectContensis();
           await this.PrintProjects();
         } else {
           log.warning(messages.projects.noList());
           log.help(messages.connect.tip());
-          // cache.environments[environment] = {
-          //   versionStatus: 'published',
-          //   history: [],
-          //   lastUserId: '',
-          //   projects: [],
-          // };
         }
-
-        session.Update({
-          currentEnvironment: environment,
-          environments: cache.environments,
-        });
       } else {
         // Cannot reach environment - status X
         log.error(
@@ -233,68 +248,75 @@ class ContensisCli {
   };
 
   ConnectContensis = async ({ commit = false } = {}) => {
-    const { contensisOpts, currentEnv, env, log, messages } = this;
-    const userId = env?.lastUserId;
-    const isGuidId = userId && isUuid(userId);
+    if (!this.contensis) {
+      const { contensisOpts, currentEnv, env, log, messages } = this;
+      const userId = env?.lastUserId;
+      const isGuidId = userId && isUuid(userId);
 
-    if (currentEnv && userId) {
-      const [credentialError, credentials] = await new CredentialProvider(
-        {
+      if (currentEnv && userId) {
+        const credentials = await this.GetCredentials(
           userId,
-          alias: currentEnv,
-        },
-        env.passwordFallback
-      ).Init();
+          env.passwordFallback
+        );
 
-      if (credentialError && !credentials.current) {
-        // Log problem with Credential Provider
-        log.error(credentialError as any);
-        return;
-      }
-      const cachedPassword = credentials?.current?.password;
-
-      if (cachedPassword) {
-        this.contensis = new ContensisMigrationService(
-          {
-            ...contensisOpts,
-            source: {
-              url: this.urls?.cms || '',
-              username: !isGuidId ? userId : undefined,
-              password: !isGuidId ? cachedPassword : undefined,
-              clientId: isGuidId ? userId : undefined,
-              sharedSecret: isGuidId ? cachedPassword : undefined,
-              project: env?.currentProject || '',
-              assetHostname: this.urls?.previewWeb,
+        const cachedPassword = credentials?.current?.password;
+
+        if (cachedPassword) {
+          this.contensis = new ContensisMigrationService(
+            {
+              ...contensisOpts,
+              source: {
+                url: this.urls?.cms || '',
+                username: !isGuidId ? userId : undefined,
+                password: !isGuidId ? cachedPassword : undefined,
+                clientId: isGuidId ? userId : undefined,
+                sharedSecret: isGuidId ? cachedPassword : undefined,
+                project: env?.currentProject || '',
+                assetHostname: this.urls?.previewWeb,
+              },
+              concurrency:
+                typeof contensisOpts.concurrency !== 'undefined'
+                  ? contensisOpts.concurrency
+                  : 3,
+              outputProgress: true,
             },
-            concurrency:
-              typeof contensisOpts.concurrency !== 'undefined'
-                ? contensisOpts.concurrency
-                : 3,
-            outputProgress: true,
-          },
-          !commit
-        );
+            !commit
+          );
+        }
+      } else {
+        if (!currentEnv) log.help(messages.connect.help());
+        if (!userId) log.help(messages.connect.tip());
       }
-    } else {
-      if (!currentEnv) log.help(messages.connect.help());
-      if (!userId) log.help(messages.connect.tip());
     }
+    return this.contensis;
   };
 
   ConnectContensisImport = async ({
-    commit,
-    source,
-    fileData,
-    fileDataType,
+    commit = false,
+    fromFile,
+    importDataType,
   }: {
-    commit: boolean;
-    source: 'contensis' | 'file' | 'input';
-    fileData?: any[] | string;
-    fileDataType?: 'entries' | 'contentTypes' | 'components';
+    commit?: boolean;
+    fromFile?: string;
+    importDataType?:
+      | 'entries'
+      | 'contentTypes'
+      | 'components'
+      | 'models'
+      | 'user-input';
   }) => {
-    const { contensisOpts, currentEnv, env, log, messages, sourceEnv } = this;
+    const source: 'contensis' | 'file' = fromFile ? 'file' : 'contensis';
+
+    const fileData = fromFile
+      ? readJsonFile<(Entry | ContentType | Component)[]>(fromFile) || []
+      : [];
+
+    if (typeof fileData === 'string')
+      throw new Error(`Import file format must be of type JSON`);
+
+    const { contensisOpts, currentEnv, env, log, messages, sourceAlias } = this;
     const environments = this.cache.environments || {};
-    const sourceEnvironment = environments[sourceEnv || ''] || {};
+    const sourceEnvironment = environments[sourceAlias || ''] || {};
     const sourceCms =
       ('source' in contensisOpts && contensisOpts.source) ||
       ({} as Partial<SourceCms>);
@@ -303,7 +325,7 @@ class ContensisCli {
     const sourceProjectId =
       sourceCms.project || sourceEnvironment.currentProject || 'website';
     const isSourceGuidId = sourceUserId && isUuid(sourceUserId);
-    const sourceUrls = url(sourceEnv || '', sourceProjectId);
+    const sourceUrls = url(sourceAlias || '', sourceProjectId);
 
     const sourcePassword =
       sourceCms.sharedSecret ||
@@ -314,40 +336,24 @@ class ContensisCli {
     const isTargetGuidId = targetUserId && isUuid(targetUserId);
 
     if (sourceUserId && currentEnv && targetUserId) {
-      const [sourceCredentialError, sourceCredentials] =
-        await new CredentialProvider(
-          {
-            userId: sourceUserId,
-            alias: currentEnv,
-          },
-          sourcePassword
-        ).Init();
-
-      if (sourceCredentialError && !sourceCredentials.current) {
-        // Log problem with Credential Provider
-        logError(sourceCredentialError);
-        return;
-      }
+      const sourceCredentials = await this.GetCredentials(
+        sourceUserId,
+        sourcePassword,
+        sourceAlias,
+        false
+      );
+
       const cachedSourcePassword = sourceCredentials?.current?.password;
 
-      const [targetCredentialError, targetCredentials] =
-        await new CredentialProvider(
-          {
-            userId: targetUserId,
-            alias: currentEnv,
-          },
-          env.passwordFallback
-        ).Init();
+      const targetCredentials = await this.GetCredentials(
+        targetUserId,
+        env.passwordFallback
+      );
 
-      if (targetCredentialError && !targetCredentials.current) {
-        // Log problem with Credential Provider
-        log.error(targetCredentialError as any);
-        return;
-      }
       const cachedTargetPassword = targetCredentials?.current?.password;
 
       if (cachedSourcePassword && cachedTargetPassword) {
-        if (source === 'file' || source === 'input') {
+        if (source === 'file' || importDataType === 'user-input') {
           this.contensis = new ContensisMigrationService(
             {
               concurrency: 3,
@@ -362,12 +368,11 @@ class ContensisCli {
                 targetProjects: [env.currentProject || ''],
                 assetHostname: this.urls?.previewWeb,
               },
-              ...(fileDataType ? { [fileDataType]: fileData } : {}),
+              ...(importDataType ? { [importDataType]: fileData } : {}),
             },
             !commit
           );
-        }
-        if (source === 'contensis') {
+        } else if (source === 'contensis') {
           this.contensis = new ContensisMigrationService(
             {
               concurrency: 3,
@@ -400,6 +405,40 @@ class ContensisCli {
       if (!currentEnv) log.help(messages.connect.help());
       if (!targetUserId) log.help(messages.connect.tip());
     }
+    return this.contensis;
+  };
+
+  GetCredentials = async (
+    userId: string,
+    password?: string,
+    currentEnv = this.currentEnv,
+    saveCurrentEnv = true
+  ): Promise<CredentialProvider | undefined> => {
+    const { log, messages } = this;
+    if (userId) {
+      const [credentialError, credentials] = await new CredentialProvider(
+        { userId, alias: currentEnv },
+        password
+      ).Init();
+
+      if (credentialError && !credentials.current) {
+        // Log problem with Credential Provider
+        log.error(credentialError as any);
+        return;
+      }
+
+      if (credentials.remarks.secure !== true) {
+        if (!insecurePasswordWarningShown) {
+          log.warning(messages.login.insecurePassword());
+          insecurePasswordWarningShown = true;
+        }
+      } else {
+        const env = this.cache.environments[currentEnv];
+        env.passwordFallback = undefined;
+        this.session.UpdateEnv(env, currentEnv, saveCurrentEnv);
+      }
+      return credentials;
+    }
   };
 
   Login = async (
@@ -409,111 +448,102 @@ class ContensisCli {
       promptPassword = true,
       sharedSecret = isSharedSecret(this.env.passwordFallback),
       silent = false,
+      attempt = 1,
     }: {
       password?: string;
       promptPassword?: boolean;
       sharedSecret?: string;
       silent?: boolean;
-    }
+      attempt?: number;
+    } = {}
   ): Promise<string | undefined> => {
-    let inputPassword = password;
+    let inputPassword = password || sharedSecret;
     const { log, messages } = this;
 
     if (userId) {
-      const { cache, currentEnv, env } = this;
+      const { currentEnv, env } = this;
 
       if (currentEnv) {
-        const [credentialError, credentials] = await new CredentialProvider(
-          { userId, alias: currentEnv },
-          inputPassword || sharedSecret
-        ).Init();
-
-        if (credentialError && !credentials.current) {
-          // Log problem with Credential Provider
-          log.error(credentialError as any);
-          return;
-        }
-
-        if (credentials.remarks.secure !== true)
-          log.warning(messages.login.insecurePassword());
-
-        const cachedPassword = isPassword(credentials?.current?.password);
-        const cachedSecret = isSharedSecret(credentials?.current?.password);
-
-        if (
-          !sharedSecret &&
-          !inputPassword &&
-          !cachedPassword &&
-          !cachedSecret &&
-          promptPassword
-        ) {
-          // Password prompt
-          ({ inputPassword } = await inquirer.prompt([
-            {
-              type: 'password',
-              message: messages.login.passwordPrompt(currentEnv, userId),
-              name: 'inputPassword',
-              mask: '*',
-              prefix: undefined,
-            },
-          ]));
-        }
+        const credentials = await this.GetCredentials(userId, inputPassword);
+
+        if (credentials) {
+          const cachedPassword = isPassword(credentials.current?.password);
+          const cachedSecret = isSharedSecret(credentials.current?.password);
+
+          if (!cachedPassword && !cachedSecret && promptPassword) {
+            // Password prompt
+            ({ inputPassword } = await inquirer.prompt([
+              {
+                type: 'password',
+                message: messages.login.passwordPrompt(currentEnv, userId),
+                name: 'inputPassword',
+                mask: '*',
+                prefix: undefined,
+              },
+            ]));
+          }
 
-        if (sharedSecret || cachedSecret || inputPassword || cachedPassword) {
-          const authService = new ContensisAuthService({
-            username: userId,
-            password: inputPassword || cachedPassword,
-            projectId: env?.currentProject || 'website',
-            rootUrl: this.urls?.cms || '',
-            clientId: userId,
-            clientSecret: sharedSecret || cachedSecret,
-          });
+          if (inputPassword || cachedPassword || cachedSecret) {
+            const authService = new ContensisAuthService({
+              username: userId,
+              password: inputPassword || cachedPassword,
+              projectId: env?.currentProject || 'website',
+              rootUrl: this.urls?.cms || '',
+              clientId: userId,
+              clientSecret: sharedSecret || cachedSecret,
+            });
+
+            const [authError, bearerToken] = await to(
+              authService.BearerToken()
+            );
 
-          const [authError, bearerToken] = await to(authService.BearerToken());
-
-          // Login successful
-          if (bearerToken) {
-            // Set env vars
-            env.authToken = bearerToken;
-            env.lastUserId = userId;
-            env.passwordFallback =
-              credentials.remarks.secure !== true
-                ? credentials.current?.password
-                : undefined;
-
-            if (!silent) {
-              Logger.success(messages.login.success(currentEnv, userId));
-              await this.PrintProjects();
+            // Login successful
+            if (bearerToken) {
+              // Set env vars
+              env.authToken = bearerToken;
+              env.lastUserId = userId;
+              env.passwordFallback =
+                credentials.remarks.secure !== true
+                  ? credentials.current?.password
+                  : undefined;
+
+              // Persist env before finding projects or doing anything else
+              this.session.UpdateEnv(env);
+              if (inputPassword) await credentials.Save(inputPassword);
+              if (sharedSecret) await credentials.Save(sharedSecret);
+
+              if (!silent) {
+                Logger.success(messages.login.success(currentEnv, userId));
+                await this.PrintProjects();
+              }
+            } else if (authError) {
+              Logger.error(authError.toString());
+              // Clear env vars
+              env.authToken = '';
+              env.lastUserId = '';
+              env.passwordFallback = undefined;
+              // Persist env to remove cleared values
+              this.session.UpdateEnv(env);
+
+              // If the auth error was raised using a cached password
+              if (
+                (cachedPassword || cachedSecret) &&
+                credentials.remarks.secure
+              ) {
+                // Remove any bad stored credential and trigger login prompt again
+                await credentials.Delete();
+                return await this.Login(userId, { password, sharedSecret });
+              } else {
+                throw new Error(messages.login.failed(currentEnv, userId));
+              }
             }
-            if (inputPassword) await credentials.Save(inputPassword);
-            if (sharedSecret) await credentials.Save(sharedSecret);
-          } else if (authError) {
-            Logger.error(authError.toString());
-            // Clear env vars
-            env.authToken = '';
-            env.lastUserId = '';
-            env.passwordFallback = undefined;
-
-            // If the auth error was raised using a cached password
-            if (
-              (cachedPassword || cachedSecret) &&
-              credentials.remarks.secure
-            ) {
-              // Remove any bad stored credential and trigger login prompt again
-              await credentials.Delete();
-              return await this.Login(userId, { password, sharedSecret });
-            } else {
-              throw new Error(messages.login.failed(currentEnv, userId));
-            }
-          }
 
-          // Persist env
-          this.session.Update({
-            environments: cache.environments,
-          });
-          return env.authToken;
-        } else {
-          Logger.error(messages.login.passwordPrompt(currentEnv, userId));
+            return env.authToken;
+          } else {
+            Logger.error(messages.login.passwordPrompt());
+            if (attempt < 2)
+              return await this.Login(userId, { attempt: attempt + 1 });
+          }
         }
       } else {
         // No environment set, use `contensis connect {alias}` first
@@ -525,19 +555,42 @@ class ContensisCli {
     }
   };
 
+  PrintContensisVersion = async () => {
+    const { log, messages } = this;
+    const contensis = await this.ConnectContensis();
+
+    if (contensis) {
+      // Retrieve projects list for env
+      const [projectsErr, projects] = await to(
+        contensis.projects.GetSourceProjects()
+      );
+
+      if (Array.isArray(projects)) {
+        // Print contensis version to console
+        this.HandleFormattingAndOutput(contensis.contensisVersion, () =>
+          log.raw(log.highlightText(contensis.contensisVersion))
+        );
+      }
+
+      if (projectsErr) {
+        log.error(messages.projects.noList());
+        log.error(projectsErr.message);
+      }
+    }
+  };
+
   PrintProjects = async () => {
-    const { cache, currentEnv, currentProject, log, messages, session } = this;
-    if (!this.contensis) await this.ConnectContensis();
+    const { currentProject, log, messages, session } = this;
+    const contensis = await this.ConnectContensis();
 
-    if (this.contensis) {
+    if (contensis) {
       // Retrieve projects list for env
       const [projectsErr, projects] = await to(
-        this.contensis.projects.GetSourceProjects()
+        contensis.projects.GetSourceProjects()
       );
 
       if (Array.isArray(projects)) {
         // save these projects in cache
-        const currentVals = cache.environments[currentEnv] || {};
         const nextCurrentProject =
           currentProject && currentProject !== 'null'
             ? currentProject
@@ -545,46 +598,80 @@ class ContensisCli {
             ? 'website'
             : undefined;
 
-        cache.environments[currentEnv] = {
-          ...currentVals,
+        session.UpdateEnv({
           projects: projects.map(p => p.id),
           currentProject: nextCurrentProject,
-        };
+        });
 
         log.success(messages.projects.list());
+        log.raw('');
+
         this.HandleFormattingAndOutput(projects, () => {
           // print the projects to console
-          for (const project of projects) {
+          for (const project of projects.sort((a, b) =>
+            a.id.localeCompare(b.id)
+          )) {
+            let color;
+            try {
+              color = chalk.keyword((project as any).color);
+            } catch (ex) {
+              color = chalk.white;
+            }
             console.log(
-              `  - ${nextCurrentProject === project.id ? '* ' : ''}[${
-                project.primaryLanguage
-              }] ${project.id}`
+              `${
+                nextCurrentProject === project.id
+                  ? `>> ${log.boldText(color(project.id))}`
+                  : `    ${color(project.id)}`
+              } ${log.infoText(
+                `[${project.supportedLanguages
+                  .map(l =>
+                    l === project.primaryLanguage ? `*${log.boldText(l)}` : l
+                  )
+                  .join(' ')}]`
+              )}`
             );
           }
         });
 
-        session.Update({
-          environments: cache.environments,
-        });
+        if (!this.SetProject(nextCurrentProject))
+          log.warning(messages.projects.tip());
+      }
 
-        if (nextCurrentProject) {
-          this.env = cache.environments[currentEnv];
-          this.SetProject(nextCurrentProject);
-        }
+      if (projectsErr) {
+        log.error(messages.projects.noList());
+        log.error(projectsErr.message);
+      }
+    }
+  };
+
+  PrintProject = async (projectId = this.currentProject) => {
+    const { log, messages, session } = this;
+    const contensis = await this.ConnectContensis();
+
+    if (contensis) {
+      // Retrieve projects list for env
+      const [projectsErr, projects] = await to(
+        contensis.projects.GetSourceProjects()
+      );
+
+      const foundProject = projects?.find(
+        p => p.id.toLowerCase() === projectId.toLowerCase()
+      );
+
+      if (foundProject) {
+        log.raw('');
+        this.HandleFormattingAndOutput(foundProject, log.object);
       }
 
       if (projectsErr) {
         log.error(messages.projects.noList());
         log.error(projectsErr.message);
       }
-      // } else {
-      //   log.warning(messages.projects.noList());
-      //   log.help(messages.connect.tip());
     }
   };
 
-  SetProject = async (projectId = '') => {
-    const { cache, env, log, messages, session } = this;
+  SetProject = (projectId = 'website') => {
+    const { env, log, messages, session } = this;
     let nextProjectId: string | undefined;
     if (env?.projects.length > 0 && env?.lastUserId) {
       nextProjectId = env.projects.find(
@@ -592,10 +679,9 @@ class ContensisCli {
       );
       if (nextProjectId) {
         env.currentProject = nextProjectId;
-        session.Update({
-          environments: cache.environments,
-        });
+        session.UpdateEnv(env);
         log.success(messages.projects.set(projectId));
+        log.raw('');
       } else {
         log.error(messages.projects.failedSet(projectId));
       }
@@ -607,8 +693,8 @@ class ContensisCli {
     return nextProjectId;
   };
 
-  SetVersion = async (versionStatus: 'latest' | 'published') => {
-    const { cache, env, log, messages, session } = this;
+  SetVersion = (versionStatus: 'latest' | 'published') => {
+    const { env, log, messages, session } = this;
     if (!['latest', 'published'].includes(versionStatus)) {
       log.error(messages.version.invalid(versionStatus));
       return false;
@@ -618,10 +704,7 @@ class ContensisCli {
       return false;
     }
     if (env?.projects.length > 0 && env?.lastUserId) {
-      env.versionStatus = versionStatus;
-      session.Update({
-        environments: cache.environments,
-      });
+      session.UpdateEnv({ versionStatus });
       log.success(messages.version.set(this.currentEnv, versionStatus));
       return true;
     } else {
@@ -634,12 +717,12 @@ class ContensisCli {
 
   HydrateContensis = async () => {
     const { log } = this;
-    if (!this.contensis) await this.ConnectContensis();
+    const contensis = await this.ConnectContensis();
 
-    if (this.contensis) {
+    if (contensis) {
       // Retrieve content types list for env
       const [contensisErr, models] = await to(
-        this.contensis.models.HydrateContensisRepositories()
+        contensis.models.HydrateContensisRepositories()
       );
 
       if (contensisErr) {
@@ -651,11 +734,11 @@ class ContensisCli {
 
   PrintApiKeys = async () => {
     const { currentEnv, log, messages } = this;
-    if (!this.contensis) await this.ConnectContensis();
+    const contensis = await this.ConnectContensis();
 
-    if (this.contensis) {
+    if (contensis) {
       // Retrieve keys list for env
-      const [keysErr, apiKeys] = await this.contensis.apiKeys.GetKeys();
+      const [keysErr, apiKeys] = await contensis.apiKeys.GetKeys();
 
       if (Array.isArray(apiKeys)) {
         log.success(messages.keys.list(currentEnv));
@@ -689,13 +772,10 @@ class ContensisCli {
 
   CreateApiKey = async (name: string, description?: string) => {
     const { currentEnv, log, messages } = this;
-    if (!this.contensis) await this.ConnectContensis();
+    const contensis = await this.ConnectContensis();
 
-    if (this.contensis) {
-      const [err, key] = await this.contensis.apiKeys.CreateKey(
-        name,
-        description
-      );
+    if (contensis) {
+      const [err, key] = await contensis.apiKeys.CreateKey(name, description);
 
       if (key) {
         log.success(messages.keys.created(currentEnv, name));
@@ -719,10 +799,10 @@ class ContensisCli {
 
   RemoveApiKey = async (id: string) => {
     const { currentEnv, log, messages } = this;
-    if (!this.contensis) await this.ConnectContensis({ commit: true });
+    const contensis = await this.ConnectContensis({ commit: true });
 
-    if (this.contensis) {
-      const [err, key] = await this.contensis.apiKeys.RemoveKey(id);
+    if (contensis) {
+      const [err, key] = await contensis.apiKeys.RemoveKey(id);
 
       if (!err) {
         log.success(messages.keys.removed(currentEnv, id));
@@ -733,17 +813,221 @@ class ContensisCli {
     }
   };
 
+  CreateProject = async (project: Project) => {
+    const { currentEnv, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+
+    if (contensis) {
+      const [err, created] = await contensis.projects.CreateProject(project);
+
+      if (created) {
+        log.success(messages.projects.created(currentEnv, project.id));
+
+        this.HandleFormattingAndOutput(created, () => {
+          // set the CLI project to the newly created project
+          this.SetProject(project.id);
+          // print all the projects to console
+          this.PrintProjects();
+        });
+        return project.id;
+      }
+
+      if (err) {
+        log.error(messages.projects.failedCreate(currentEnv, project.id), err);
+      }
+    }
+  };
+
+  UpdateProject = async (project: Partial<Project>) => {
+    const { currentEnv, currentProject, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+
+    if (contensis) {
+      const [err, updated] = await contensis.projects.UpdateProject({
+        id: currentProject,
+        ...project,
+      });
+
+      if (updated) {
+        log.success(messages.projects.updated(currentEnv, currentProject));
+
+        this.HandleFormattingAndOutput(updated, log.object);
+        return updated.id;
+      }
+
+      if (err) {
+        log.error(
+          messages.projects.failedUpdate(currentEnv, currentProject),
+          err
+        );
+      }
+    }
+  };
+
   GetContentTypes = async () => {
     const { currentProject, log, messages } = this;
     let err;
     if (!this.contensis) err = await this.HydrateContensis();
 
-    if (err) log.error(messages.contenttypes.noList(currentProject));
-    if (this.contensis) {
-      this.contentTypes = this.contensis.models.contentTypes();
-      this.components = this.contensis.models.components();
+    if (err) log.error(messages.models.noList(currentProject));
+    if (!this.contensis) log.warning(messages.models.noList(currentProject));
+
+    return this.contensis;
+  };
+
+  PrintContentModels = async (modelIds: string[] = []) => {
+    const { currentProject, log, messages } = this;
+    const contensis = await this.GetContentTypes();
+    if (contensis) {
+      // Retrieve models list for env
+      const { models, contentTypes = [], components = [] } = this;
+
+      // Models to output to console
+      const returnModels = modelIds?.length
+        ? models?.filter((m: Model) =>
+            modelIds.some(id => id.toLowerCase() === m.id.toLowerCase())
+          )
+        : undefined;
+
+      // Generate a list of contentTypeIds and componentIds from all models
+      // and dependencies
+      const contentTypeIds = Array.from(
+        new Set([
+          ...(returnModels || models || []).map(m => m.id),
+          ...(returnModels || models || [])
+            .map(m => m.dependencies?.contentTypes?.map(c => c[0]) || [])
+            .flat(),
+        ])
+      );
+      const componentIds = Array.from(
+        new Set(
+          (returnModels || models || [])
+            .map(m => m.dependencies?.components?.map(c => c[0]) || [])
+            .flat()
+        )
+      );
+
+      // Create an array of all the content types and component definitions
+      // we will use this when outputting to a file
+      const contentModelBackup = [
+        ...contentTypes.filter(c => contentTypeIds.includes(c.id)),
+        ...components.filter(c => componentIds.includes(c.id)),
+      ];
+
+      if (Array.isArray(returnModels)) {
+        log.success(messages.models.list(currentProject));
+        this.HandleFormattingAndOutput(contentModelBackup, () => {
+          // print the content models to console
+          for (const model of returnModels) {
+            log.raw('');
+            log.object(model);
+          }
+          log.raw('');
+        });
+      } else {
+        log.success(
+          messages.models.get(currentProject, models?.length.toString() || '0')
+        );
+        log.raw('');
+        if (models?.length) {
+          this.HandleFormattingAndOutput(contentModelBackup, () => {
+            // print the content models s#qto console
+            for (const model of models) {
+              const components = model.components?.length || 0;
+              const contentTypes = model.contentTypes?.length || 0;
+              const dependencies =
+                (model.dependencies?.components?.length || 0) +
+                (model.dependencies?.contentTypes?.length || 0);
+              const dependencyOf =
+                (model.dependencyOf?.components?.length || 0) +
+                (model.dependencyOf?.contentTypes?.length || 0);
+
+              const hasAny =
+                components + contentTypes + dependencies + dependencyOf;
+              log.raw(
+                `  - ${log.highlightText(log.boldText(model.id))} ${
+                  hasAny
+                    ? log.infoText(
+                        `{ ${components ? `components: ${components}, ` : ''}${
+                          contentTypes ? `contentTypes: ${contentTypes}, ` : ''
+                        }${
+                          dependencies ? `references: ${dependencies}, ` : ''
+                        }${
+                          dependencyOf ? `required by: ${dependencyOf}` : ''
+                        } }`
+                      )
+                    : ''
+                }`
+              );
+            }
+            log.raw('');
+          });
+        }
+      }
+    }
+  };
+
+  ImportContentModels = async ({
+    commit,
+    fromFile,
+  }: {
+    commit: boolean;
+    fromFile: string;
+  }) => {
+    const { currentProject, log, messages } = this;
+
+    const fileData = fromFile
+      ? readJsonFile<(ContentType | Component)[]>(fromFile) || []
+      : [];
+    if (typeof fileData === 'string')
+      throw new Error(`Import file format must be of type JSON`);
+
+    const contensis = await this.ConnectContensisImport({
+      commit,
+      fromFile,
+      importDataType: 'models',
+    });
+
+    if (contensis) {
+      log.line();
+      if (contensis.isPreview) {
+        console.log(log.successText(` -- IMPORT PREVIEW -- `));
+      } else {
+        console.log(log.warningText(` *** COMMITTING IMPORT *** `));
+      }
+
+      const [migrateErr, result] = await contensis.MigrateContentModels();
+
+      if (migrateErr) logError(migrateErr);
+      else
+        this.HandleFormattingAndOutput(result, () => {
+          // print the results to console
+          if (!commit) {
+            log.raw(log.boldText(`\nContent types:`));
+            if (!result.contentTypes) log.info(`- None returned\n`);
+            else printModelMigrationAnalysis(this, result.contentTypes);
+
+            log.raw(log.boldText(`\nComponents:`));
+            if (!result.components) log.info(`- None returned\n`);
+            else printModelMigrationAnalysis(this, result.components);
+          } else {
+            const migrateResult = result as MigrateModelsResult;
+            log.raw(log.boldText(`\nContent types:`));
+            printModelMigrationResult(
+              this,
+              migrateResult[currentProject].contentTypes
+            );
+
+            log.raw(log.boldText(`\nComponents:`));
+            printModelMigrationResult(
+              this,
+              migrateResult[currentProject].components
+            );
+          }
+        });
     } else {
-      log.warning(messages.contenttypes.noList(currentProject));
+      log.warning(messages.models.noList(currentProject));
+      log.help(messages.connect.tip());
     }
   };
 
@@ -799,15 +1083,12 @@ class ContensisCli {
 
   RemoveContentTypes = async (contentTypeIds: string[], commit = false) => {
     const { currentProject, log, messages } = this;
-    if (!this.contensis)
-      await this.ConnectContensisImport({
-        source: 'input',
-        commit,
-      });
-    if (this.contensis) {
-      const [err, result] = await this.contensis.DeleteContentTypes(
-        contentTypeIds
-      );
+    const contensis = await this.ConnectContensisImport({
+      commit,
+      importDataType: 'user-input',
+    });
+    if (contensis) {
+      const [err, result] = await contensis.DeleteContentTypes(contentTypeIds);
 
       if (err) {
         log.error(
@@ -822,7 +1103,7 @@ class ContensisCli {
           messages.contenttypes.removed(
             currentProject,
             contentTypeIds.join('", "'),
-            !this.contensis.isPreview
+            !contensis.isPreview
           )
         );
         // print the results to console
@@ -851,22 +1132,21 @@ class ContensisCli {
 
     if (!Array.isArray(fileData)) fileData = [fileData];
 
-    await this.ConnectContensisImport({
+    const contensis = await this.ConnectContensisImport({
       commit,
-      source: fromFile ? 'file' : 'contensis',
+      importDataType: fromFile ? 'user-input' : undefined,
     });
 
-    if (this.contensis) {
+    if (contensis) {
       // Pass each content type to the target repo
       for (const contentType of fileData) {
         // Fix invalid data
         contentType.projectId = currentProject;
         delete contentType.uuid;
 
-        const [err, created, createStatus] =
-          await this.contensis.models.targetRepos[
-            currentProject
-          ].repo.UpsertContentType(false, contentType);
+        const [err, created, createStatus] = await contensis.models.targetRepos[
+          currentProject
+        ].repo.UpsertContentType(false, contentType);
 
         if (err) log.error(err.message, err);
         if (createStatus) {
@@ -884,6 +1164,53 @@ class ContensisCli {
     }
   };
 
+  DiffModels = async (
+    {
+      fromFile,
+    }: {
+      fromFile: string;
+    },
+    modelIds: string[] = []
+  ) => {
+    const { log } = this;
+
+    let fileData = fromFile ? readJsonFile<ContentType[]>(fromFile) || [] : [];
+    if (typeof fileData === 'string')
+      throw new Error(`Import file format must be of type JSON`);
+
+    if (!Array.isArray(fileData)) fileData = [fileData];
+
+    const contensis = await this.ConnectContensisImport({
+      fromFile,
+      importDataType: 'models',
+    });
+
+    if (contensis) {
+      const [err, result] = (await to(
+        contensis.models.Diff(fileData.length ? fileData : modelIds)
+      )) as [Error | null, ContentTypesResult | undefined];
+
+      if (err) log.error(err.message, err);
+      if (result)
+        // print the content type to console
+        this.HandleFormattingAndOutput(result, () => {
+          log.success(
+            `Queried models ${log.infoText(
+              `"${result.query.modelIds?.join(', ')}"`
+            )}\n`
+          );
+
+          log.raw(log.boldText(`Content types:`));
+          if (!result.contentTypes) log.info(`- None returned\n`);
+          else printModelMigrationAnalysis(this, result.contentTypes);
+
+          log.raw(log.boldText(`Components:`));
+          if (!result.components) log.info(`- None returned\n`);
+          else printModelMigrationAnalysis(this, result.components);
+        });
+    }
+  };
+
   PrintComponents = async () => {
     const { currentProject, log, messages } = this;
     await this.GetContentTypes();
@@ -933,13 +1260,12 @@ class ContensisCli {
 
   RemoveComponents = async (componentIds: string[], commit = false) => {
     const { currentProject, log, messages } = this;
-    if (!this.contensis)
-      await this.ConnectContensisImport({
-        source: 'input',
-        commit,
-      });
-    if (this.contensis) {
-      const [err, result] = await this.contensis.DeleteContentTypes(
+    const contensis = await this.ConnectContensisImport({
+      commit,
+      importDataType: 'user-input',
+    });
+    if (contensis) {
+      const [err, result] = await contensis.DeleteContentTypes(
         undefined,
         componentIds
       );
@@ -957,7 +1283,7 @@ class ContensisCli {
           messages.components.removed(
             currentProject,
             componentIds.join('", "'),
-            !this.contensis.isPreview
+            !contensis.isPreview
           )
         );
         // print the results to console
@@ -986,22 +1312,21 @@ class ContensisCli {
 
     if (!Array.isArray(fileData)) fileData = [fileData];
 
-    await this.ConnectContensisImport({
+    const contensis = await this.ConnectContensisImport({
       commit,
-      source: fromFile ? 'file' : 'contensis',
+      importDataType: fromFile ? 'user-input' : undefined,
     });
 
-    if (this.contensis) {
+    if (contensis) {
       // Pass each component to the target repo
       for (const component of fileData) {
         // Fix invalid data
         component.projectId = currentProject;
         delete component.uuid;
 
-        const [err, created, createStatus] =
-          await this.contensis.models.targetRepos[
-            currentProject
-          ].repo.UpsertComponent(false, component);
+        const [err, created, createStatus] = await contensis.models.targetRepos[
+          currentProject
+        ].repo.UpsertComponent(false, component);
 
         if (err) log.error(err.message, err);
         if (createStatus) {
@@ -1019,21 +1344,20 @@ class ContensisCli {
     }
   };
 
-  RemoveEntry = async (id: string, commit = false) => {
+  RemoveEntries = async (commit = false) => {
     const { currentEnv, log, messages } = this;
-    if (!this.contensis)
-      await this.ConnectContensisImport({
-        source: 'input',
-        commit,
-      });
+    const contensis = await this.ConnectContensisImport({
+      commit,
+      importDataType: 'user-input',
+    });
 
-    if (this.contensis) {
-      if (this.contensis.isPreview) {
+    if (contensis) {
+      if (contensis.isPreview) {
         console.log(log.successText(` -- PREVIEW -- `));
       } else {
         console.log(log.warningText(` *** COMMITTING DELETE *** `));
       }
-      const [err, result] = await this.contensis.DeleteEntries();
+      const [err, result] = await contensis.DeleteEntries();
       if (result)
         this.HandleFormattingAndOutput(result, () => {
           // print the migrateResult to console
@@ -1045,12 +1369,12 @@ class ContensisCli {
           Object.values(result.entriesToMigrate)?.[0].totalCount > 0) ||
           (commit && result.migrateResult?.deleted))
       ) {
-        log.success(messages.entries.removed(currentEnv, id, commit));
+        log.success(messages.entries.removed(currentEnv, commit));
         if (!commit) log.help(messages.entries.commitTip());
       } else {
-        log.error(messages.entries.failedRemove(currentEnv, id), err);
+        log.error(messages.entries.failedRemove(currentEnv), err);
         if (!Object.values(result.entriesToMigrate)?.[0].totalCount)
-          log.help(messages.entries.notFound(id));
+          log.help(messages.entries.notFound(currentEnv));
       }
     }
   };
@@ -1061,21 +1385,21 @@ class ContensisCli {
     withDependents?: boolean;
   }) => {
     const { currentProject, log, messages } = this;
-    await this.ConnectContensis();
+    const contensis = await this.ConnectContensis();
 
-    if (this.contensis) {
+    if (contensis) {
       log.line();
-      const entries = await this.contensis.GetEntries({ withDependents });
+      const entries = await contensis.GetEntries({ withDependents });
       this.HandleFormattingAndOutput(entries, () =>
         // print the entries to console
         logEntriesTable(
           entries,
           currentProject,
-          this.contensis?.payload.query?.fields
+          contensis.payload.query?.fields
         )
       );
     } else {
-      log.warning(messages.contenttypes.noList(currentProject));
+      log.warning(messages.models.noList(currentProject));
       log.help(messages.connect.tip());
     }
   };
@@ -1089,26 +1413,21 @@ class ContensisCli {
   }) => {
     const { currentProject, log, messages } = this;
 
-    const fileData = fromFile ? readJsonFile<Entry[]>(fromFile) || [] : [];
-    if (typeof fileData === 'string')
-      throw new Error(`Import file format must be of type JSON`);
-
-    await this.ConnectContensisImport({
+    const contensis = await this.ConnectContensisImport({
       commit,
-      source: fromFile ? 'file' : 'contensis',
-      fileData,
-      fileDataType: 'entries',
+      fromFile,
+      importDataType: 'entries',
     });
 
-    if (this.contensis) {
+    if (contensis) {
       log.line();
-      if (this.contensis.isPreview) {
+      if (contensis.isPreview) {
         console.log(log.successText(` -- IMPORT PREVIEW -- `));
       } else {
         console.log(log.warningText(` *** COMMITTING IMPORT *** `));
       }
 
-      const [migrateErr, migrateResult] = await this.contensis.MigrateEntries();
+      const [migrateErr, migrateResult] = await contensis.MigrateEntries();
 
       if (migrateErr) logError(migrateErr);
       else
@@ -1117,7 +1436,7 @@ class ContensisCli {
           printMigrateResult(this, migrateResult);
         });
     } else {
-      log.warning(messages.contenttypes.noList(currentProject));
+      log.warning(messages.models.noList(currentProject));
       log.help(messages.connect.tip());
     }
   };
@@ -1127,19 +1446,19 @@ class ContensisCli {
     name?: string
   ) => {
     const { currentEnv, log, messages } = this;
-    if (!this.contensis) await this.ConnectContensis();
-    if (this.contensis) {
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
       // Retrieve webhooks list for env
       const [webhooksErr, webhooks] =
-        await this.contensis.subscriptions.webhooks.GetSubscriptions();
+        await contensis.subscriptions.webhooks.GetSubscriptions();
 
       const filteredResults =
         typeof name === 'string'
-          ? webhooks.filter(w =>
+          ? webhooks?.filter(w =>
               w.name?.toLowerCase().includes(name.toLowerCase())
             )
           : Array.isArray(subscriptionIds)
-          ? webhooks.filter(w => subscriptionIds?.some(id => id === w.id))
+          ? webhooks?.filter(w => subscriptionIds?.some(id => id === w.id))
           : webhooks;
 
       if (Array.isArray(filteredResults)) {
@@ -1176,16 +1495,16 @@ class ContensisCli {
   };
 
   PrintBlocks = async () => {
-    const { currentEnv, log, messages } = this;
-    if (!this.contensis) await this.ConnectContensis();
-    if (this.contensis) {
+    const { currentEnv, env, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
       // Retrieve blocks list for env
-      const [err, blocks] = await this.contensis.blocks.GetBlocks();
+      const [err, blocks] = await contensis.blocks.GetBlocks();
 
       if (Array.isArray(blocks)) {
         this.HandleFormattingAndOutput(blocks, () => {
           // print the blocks to console
-          log.success(messages.blocks.list(currentEnv));
+          log.success(messages.blocks.list(currentEnv, env.currentProject));
           for (const {
             id,
             description,
@@ -1226,10 +1545,10 @@ class ContensisCli {
     version: string
   ) => {
     const { currentEnv, env, log, messages } = this;
-    if (!this.contensis) await this.ConnectContensis();
-    if (this.contensis) {
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
       // Retrieve block version
-      const [err, blocks] = await this.contensis.blocks.GetBlockVersions(
+      const [err, blocks] = await contensis.blocks.GetBlockVersions(
         blockId,
         branch,
         version
@@ -1239,7 +1558,7 @@ class ContensisCli {
         this.HandleFormattingAndOutput(blocks, () => {
           // print the version detail to console
           log.success(
-            messages.blocks.get(`${currentEnv}:${env.currentProject}`)
+            messages.blocks.get(blockId, currentEnv, env.currentProject)
           );
           for (const block of blocks)
             printBlockVersion(
@@ -1268,18 +1587,20 @@ class ContensisCli {
     const { currentEnv, env, log, messages } = this;
 
     // Output request to console
-    messages.blocks.tryPush(
-      block.id,
-      block.source.branch,
-      currentEnv,
-      env.currentProject
+    log.info(
+      messages.blocks.tryPush(
+        block.id,
+        block.source.branch,
+        currentEnv,
+        env.currentProject
+      )
     );
     console.log(jsonFormatter(block));
 
-    if (!this.contensis) await this.ConnectContensis();
-    if (this.contensis) {
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
       // Push new block version
-      const [err, blockVersion] = await this.contensis.blocks.PushBlockVersion(
+      const [err, blockVersion] = await contensis.blocks.PushBlockVersion(
         block
       );
       if (!err) {
@@ -1291,7 +1612,6 @@ class ContensisCli {
             env.currentProject
           )
         );
-        console.log(jsonFormatter(blockVersion));
       }
       if (blockVersion) {
         this.HandleFormattingAndOutput(blockVersion, () => {
@@ -1306,17 +1626,51 @@ class ContensisCli {
     }
   };
 
+  ReleaseBlock = async (blockId: string, version: string) => {
+    const { currentEnv, env, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      // Retrieve block version
+      const [err, blockVersion] = await contensis.blocks.BlockAction(
+        blockId,
+        'release',
+        version
+      );
+
+      if (blockVersion) {
+        this.HandleFormattingAndOutput(blockVersion, () => {
+          // print the version detail to console
+          log.success(
+            messages.blocks.released(blockId, currentEnv, env.currentProject)
+          );
+          printBlockVersion(this, blockVersion);
+        });
+      }
+
+      if (err) {
+        log.error(
+          messages.blocks.failedRelease(blockId, currentEnv, env.currentProject)
+        );
+        log.error(jsonFormatter(err));
+      }
+    }
+  };
+
   PrintBlockLogs = async (
     blockId: string,
     branch: string,
     version: string,
     dataCenter: 'hq' | 'manchester' | 'london'
   ) => {
-    const { currentEnv, log, messages } = this;
-    if (!this.contensis) await this.ConnectContensis();
-    if (this.contensis) {
+    const { currentEnv, env, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
       // Retrieve block logs
-      const [err, blockLogs] = await this.contensis.blocks.GetBlockLogs({
+      log.success(
+        messages.blocks.getLogs(blockId, branch, currentEnv, env.currentProject)
+      );
+
+      const [err, blockLogs] = await contensis.blocks.GetBlockLogs({
         blockId,
         branchId: branch,
         version,
@@ -1325,8 +1679,7 @@ class ContensisCli {
 
       if (blockLogs) {
         this.HandleFormattingAndOutput(blockLogs, () => {
-          // print the  logs to console
-          log.success(messages.blocks.list(currentEnv));
+          // print the logs to console
           console.log(
             `  - ${blockId} ${branch} ${
               Number(version) ? `v${version}` : version
@@ -1339,7 +1692,9 @@ class ContensisCli {
       }
 
       if (err) {
-        log.error(messages.blocks.noList(currentEnv));
+        log.error(
+          messages.blocks.failedGetLogs(blockId, currentEnv, env.currentProject)
+        );
         log.error(jsonFormatter(err));
       }
     }
@@ -1347,6 +1702,21 @@ class ContensisCli {
 
   HandleFormattingAndOutput = <T>(obj: T, logFn: (obj: T) => void) => {
     const { format, log, messages, output } = this;
+    if (!format) {
+      // print the object to console
+      logFn(obj);
+    } else if (format === 'csv') {
+      log.raw('');
+      log.raw(log.infoText(csvFormatter(obj)));
+    } else if (format === 'xml') {
+      log.raw('');
+      log.raw(log.infoText(xmlFormatter(obj)));
+    } else if (format === 'json') {
+      log.raw('');
+      log.raw(log.infoText(jsonFormatter(obj)));
+    }
+    log.raw('');
+
     if (output) {
       let writeString = '';
       if (format === 'csv') {
@@ -1361,21 +1731,6 @@ class ContensisCli {
       } else {
         log.info(messages.app.noFileOutput());
       }
-    } else {
-      if (!format) {
-        // print the object to console
-        logFn(obj);
-      } else if (format === 'csv') {
-        log.raw('');
-        log.raw(log.infoText(csvFormatter(obj)));
-      } else if (format === 'xml') {
-        log.raw('');
-        log.raw(log.infoText(xmlFormatter(obj)));
-      } else if (format === 'json') {
-        log.raw('');
-        log.raw(log.infoText(jsonFormatter(obj)));
-      }
-      log.raw('');
     }
   };
 }