@hubspot/cms-lib - npm Package Compare versions

Comparing version 2.0.2-beta.1 to 2.0.2-beta.2

errorHandlers.js

@@ -315,7 +315,3 @@ const { HubSpotAuthError } = require('./lib/models/Errors');
 function logServerlessFunctionApiErrorInstance(error, scopesData, context) {
-  if (!scopesData) {
-    return;
-  }
-
-  if (isMissingScopeError(error)) {
+  if (isMissingScopeError(error) && scopesData) {
     const { portalScopesInGroup, userScopesInGroup } = scopesData;
@@ -322,0 +318,0 @@

functions.js

@@ -29,3 +29,3 @@ const path = require('path');
       // sendResponse is what you will send back to services hitting your serverless function
-      sendResponse({ body: { response: response }, statusCode: 200 });
+      sendResponse({ body: { response: response.data }, statusCode: 200 });
     })
@@ -32,0 +32,0 @@ .catch(function(error) {

lib/__tests__/config.js

@@ -378,3 +378,3 @@ const {
         };
-        getAndLoadConfigIfNeeded();
+        getAndLoadConfigIfNeeded({ useEnv: true });
         portalConfig = getPortalConfig(portalId);
@@ -417,3 +417,3 @@ });
         };
-        getAndLoadConfigIfNeeded();
+        getAndLoadConfigIfNeeded({ useEnv: true });
         portalConfig = getPortalConfig(portalId);
@@ -448,3 +448,3 @@ });
         };
-        getAndLoadConfigIfNeeded();
+        getAndLoadConfigIfNeeded({ useEnv: true });
         portalConfig = getPortalConfig(portalId);
@@ -451,0 +451,0 @@ });

lib/config.js

@@ -322,12 +322,11 @@ const fs = require('fs-extra');
   options = {
-    ignoreEnvironmentVariableConfig: false,
+    useEnv: false,
   }
 ) => {
-  if (
-    !options.ignoreEnvironmentVariableConfig &&
-    loadEnvironmentVariableConfig()
-  ) {
+  if (options.useEnv && loadEnvironmentVariableConfig()) {
+    logger.debug('Loaded environment variable config');
     environmentVariableConfigLoaded = true;
     return;
   } else {
+    logger.debug(`Loaded config from ${DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME}`);
     loadConfigFromFile(path, options);
@@ -402,5 +401,3 @@ }
 
-  if (process.env.HUBSPOT_PORTAL_ID) {
-    portalId = parseInt(process.env.HUBSPOT_PORTAL_ID, 10);
-  } else if (!nameOrId) {
+  if (!nameOrId) {
     if (config && config.defaultPortal) {
@@ -562,6 +559,7 @@ name = config.defaultPortal;
     refreshToken: env[ENVIRONMENT_VARIABLES.HUBSPOT_REFRESH_TOKEN],
+    env: getValidEnv(env[ENVIRONMENT_VARIABLES.HUBSPOT_ENVIRONMENT]),
   };
 };
 
-const generatePersonalAccessKeyConfig = (portalId, personalAccessKey) => {
+const generatePersonalAccessKeyConfig = (portalId, personalAccessKey, env) => {
   return {
@@ -573,2 +571,3 @@ portals: [
         personalAccessKey,
+        env,
       },
@@ -584,3 +583,4 @@ ],
   refreshToken,
-  scopes
+  scopes,
+  env
 ) => {
@@ -600,2 +600,3 @@ return {
         },
+        env,
       },
@@ -606,3 +607,3 @@ ],
 
-const generateApiKeyConfig = (portalId, apiKey) => {
+const generateApiKeyConfig = (portalId, apiKey, env) => {
   return {
@@ -614,2 +615,3 @@ portals: [
         apiKey,
+        env,
       },
@@ -628,2 +630,3 @@ ],
     refreshToken,
+    env,
   } = getConfigVariablesFromEnv();
@@ -636,3 +639,3 @@
   if (personalAccessKey) {
-    return generatePersonalAccessKeyConfig(portalId, personalAccessKey);
+    return generatePersonalAccessKeyConfig(portalId, personalAccessKey, env);
   } else if (clientId && clientSecret && refreshToken) {
@@ -644,6 +647,7 @@ return generateOauthConfig(
       refreshToken,
-      OAUTH_SCOPES.map(scope => scope.value)
+      OAUTH_SCOPES.map(scope => scope.value),
+      env
     );
   } else if (apiKey) {
-    return generateApiKeyConfig(portalId, apiKey);
+    return generateApiKeyConfig(portalId, apiKey, env);
   } else {
@@ -650,0 +654,0 @@ return;

lib/constants.js

@@ -88,2 +88,3 @@ const ENVIRONMENTS = {
   HUBSPOT_REFRESH_TOKEN: 'HUBSPOT_REFRESH_TOKEN',
+  HUBSPOT_ENVIRONMENT: 'HUBSPOT_ENVIRONMENT',
 };
@@ -90,0 +91,0 @@

lib/scopes.js

 const { logger } = require('../logger');
-const { SCOPE_GROUPS } = require('./constants.js');
+const {
+  SCOPE_GROUPS,
+  PERSONAL_ACCESS_KEY_AUTH_METHOD,
+} = require('./constants.js');
 const { fetchScopeData } = require('../api/localDevAuth/authenticated');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('@hubspot/cms-lib/errorHandlers');
+const { logApiErrorInstance, ApiErrorContext } = require('../errorHandlers');
+const { getPortalConfig } = require('./config');
 
@@ -14,2 +15,7 @@ /**
 async function getScopeDataForFunctions(portalId) {
+  const portalConfig = getPortalConfig(portalId);
+  const { authType } = portalConfig;
+  if (authType !== PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
+    return null;
+  }
   try {
@@ -16,0 +22,0 @@ return await fetchScopeData(portalId, SCOPE_GROUPS.functions);

package.json

 {
   "name": "@hubspot/cms-lib",
-  "version": "2.0.2-beta.1",
+  "version": "2.0.2-beta.2",
   "description": "Library for working with the HubSpot CMS",
@@ -22,3 +22,2 @@ "license": "Apache-2.0",
     "moment": "^2.24.0",
-    "open": "^7.0.3",
     "p-queue": "^6.0.2",
@@ -36,3 +35,3 @@ "prettier": "^1.19.1",
   },
-  "gitHead": "0b8b2ffb98fd120a9e0830ea3ca1a5189ddce9b4"
+  "gitHead": "d352c878526fee39e59b59d6cda43e48840fe313"
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 1 instance in 1 package

Improved metrics

Dependency count

15

decreased by-6.25%

Number of low supply chain risk alerts

29

decreased by-6.45%

Worsened metrics

Total package byte prevSize

267373

decreased by-1.49%

Number of package files

82

decreased by-2.38%

Lines of code

8583

decreased by-1.47%

Dependency changes

• - Removedopen@^7.0.3

• - Removedis-docker@2.2.1(transitive)

• - Removedis-wsl@2.2.0(transitive)

• - Removedopen@7.4.2(transitive)