@hubspot/cli 5.2.1-beta.3 → 5.2.1-beta.4

package/commands/project/dev.js

@@ -221,7 +221,9 @@ exports.handler = async options => {
     parentAccountId: targetProjectAccountId,
     projectConfig,
     projectDir,
+    projectId: project.id,
     targetAccountId: targetTestingAccountId,
+    env,
   });
 
   await LocalDev.start();

package/lang/en.lyaml

@@ -927,6 +927,7 @@ en:
       exitingStart: "Stopping local dev server ..."
       exitingSucceed: "Successfully exited"
       exitingFail: "Failed to cleanup before exiting"
+      missingUid: "Could not find a uid for the selected app. Confirm that the app config file contains the uid field and re-run {{ devCommand }}."
       uploadWarning:
         appLabel: "[App]"
         uiExtensionLabel: "[UI Extension]"
@@ -1231,6 +1232,10 @@ en:
           destRequired: "You must specify a destination directory."
       cleanUploadPrompt:
         message: "You are about to remove any remote files in \"{{ filePath }}\" on HubSpot account {{ accountId }} that don't exist locally. Are you sure you want to do this?"
+      installPublicAppPrompt:
+        explanation: "Local development requires this app to be installed in the target test account"
+        prompt: "Open hubspot.com to install this app?"
+        decline: "To continue local development of this app, install it in your target test account and re-run {{#bold}}`hs project dev`{{/bold}}"
     convertFields:
       positionals:
         src:

package/lib/LocalDevManager.js

@@ -4,6 +4,12 @@ const chalk = require('chalk');
 const { i18n } = require('./lang');
 const { handleKeypress } = require('./process');
 const { logger } = require('@hubspot/local-dev-lib/logger');
+const {
+  fetchAppInstallationData,
+} = require('@hubspot/local-dev-lib/api/localDevAuth');
+const {
+  fetchPublicAppsForPortal,
+} = require('@hubspot/local-dev-lib/api/appsDev');
 const {
   getAccountId,
   getConfigDefaultAccount,
@@ -26,6 +32,8 @@ const {
   uiLink,
   uiLine,
 } = require('./ui');
+const { logErrorInstance } = require('./errorHandlers/standardErrors');
+const { installPublicAppPrompt } = require('./prompts/installPublicAppPrompt');
 
 const WATCH_EVENTS = {
   add: 'add',
@@ -44,6 +52,7 @@ class LocalDevManager {
 
     this.projectConfig = options.projectConfig;
     this.projectDir = options.projectDir;
+    this.projectId = options.projectId;
     this.debug = options.debug || false;
     this.deployedBuild = options.deployedBuild;
     this.isGithubLinked = options.isGithubLinked;
@@ -51,6 +60,8 @@ class LocalDevManager {
     this.uploadWarnings = {};
     this.runnableComponents = this.getRunnableComponents(options.components);
     this.activeApp = null;
+    this.activePublicAppData = null;
+    this.env = options.env;
 
     this.projectSourceDir = path.join(
       this.projectDir,
@@ -84,10 +95,43 @@ class LocalDevManager {
     return components.filter(component => component.runnable);
   }
 
-  async setActiveApp(app) {
-    this.activeApp = app;
+  async setActiveApp(appUid) {
+    if (!appUid) {
+      logger.error(
+        i18n(`${i18nKey}.missingUid`, {
+          devCommand: uiCommandReference('hs project dev'),
+        })
+      );
+      process.exit(EXIT_CODES.ERROR);
+    }
+    this.activeApp = this.runnableComponents.find(component => {
+      return component.config.uid === appUid;
+    });
 
-    // TODO: Show the install warnings the first time this gets set
+    if (this.activeApp.type === COMPONENT_TYPES.publicApp) {
+      try {
+        await this.setActivePublicAppData();
+        await this.checkPublicAppInstallation();
+      } catch (e) {
+        logErrorInstance(e);
+      }
+    }
+  }
+
+  async setActivePublicAppData() {
+    if (!this.activeApp) {
+      return;
+    }
+
+    const portalPublicApps = await fetchPublicAppsForPortal(
+      this.targetProjectAccountId
+    );
+
+    const activePublicAppData = portalPublicApps.find(
+      ({ sourceId }) => sourceId === this.activeApp.config.uid
+    );
+
+    this.activePublicAppData = activePublicAppData;
   }
 
   async start() {
@@ -179,6 +223,32 @@ class LocalDevManager {
     process.exit(EXIT_CODES.SUCCESS);
   }
 
+  getActiveAppInstallationData() {
+    return fetchAppInstallationData(
+      this.targetAccountId,
+      this.projectId,
+      this.activeApp.config.uid,
+      this.activeApp.config.auth.requiredScopes,
+      this.activeApp.config.auth.optionalScopes
+    );
+  }
+
+  async checkPublicAppInstallation() {
+    const {
+      isInstalledWithScopeGroups: isInstalled,
+    } = await this.getActiveAppInstallationData();
+
+    if (!isInstalled) {
+      await installPublicAppPrompt(
+        this.env,
+        this.targetAccountId,
+        this.activePublicAppData.clientId,
+        this.activeApp.config.auth.requiredScopes,
+        this.activeApp.config.auth.redirectUrls
+      );
+    }
+  }
+
   updateKeypressListeners() {
     handleKeypress(async key => {
       if ((key.ctrl && key.name === 'c') || key.name === 'q') {

package/lib/prompts/installPublicAppPrompt.js

@@ -0,0 +1,42 @@
+const open = require('open');
+const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
+const { logger } = require('@hubspot/local-dev-lib/logger');
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('../lang');
+const { EXIT_CODES } = require('../enums/exitCodes');
+
+const i18nKey = 'lib.prompts.installPublicAppPrompt';
+
+const installPublicAppPrompt = async (
+  env,
+  targetAccountId,
+  clientId,
+  scopes,
+  redirectUrls
+) => {
+  logger.log('');
+  logger.log(i18n(`${i18nKey}.explanation`));
+
+  const { shouldOpenBrowser } = await promptUser({
+    name: 'shouldOpenBrowser',
+    type: 'confirm',
+    message: i18n(`${i18nKey}.prompt`),
+  });
+
+  if (!shouldOpenBrowser) {
+    logger.log(i18n(`${i18nKey}.decline`));
+    process.exit(EXIT_CODES.SUCCESS);
+  }
+
+  const websiteOrigin = getHubSpotWebsiteOrigin(env);
+
+  const url =
+    `${websiteOrigin}/oauth/${targetAccountId}/authorize` +
+    `?client_id=${encodeURIComponent(clientId)}` +
+    `&scope=${encodeURIComponent(scopes)}` +
+    `&redirect_uri=${encodeURIComponent(redirectUrls)}`;
+
+  open(url);
+};
+
+module.exports = { installPublicAppPrompt };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.2.1-beta.3",
+  "version": "5.2.1-beta.4",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,10 +8,10 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/local-dev-lib": "1.0.1",
-    "@hubspot/serverless-dev-runtime": "5.2.1-beta.2",
+    "@hubspot/local-dev-lib": "1.1.0",
+    "@hubspot/serverless-dev-runtime": "5.2.1-beta.4",
     "@hubspot/theme-preview-dev-server": "0.0.5",
-    "@hubspot/ui-extensions-dev-server": "0.8.15",
+    "@hubspot/ui-extensions-dev-server": "0.8.16",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.0.1",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "70d81f550d7916e8eb80ec22ce41ac51265c9a36"
+  "gitHead": "59dbc8bff2ca377c95e1eea4dcc52389e98ac644"
 }