@intuned/runtime-dev 1.3.1-api-token.5 → 1.3.1-api-token.6

package/dist/commands/intuned-cli/controller/save.js

@@ -43,7 +43,7 @@ async function runSaveProject(projectName, auth) {
   const baseUrl = (0, _helpers.getBaseUrl)();
   const url = `${baseUrl}/api/v1/workspace/${workspaceId}/projects/${projectName}`;
   const headers = {
-    "x-api-key": apiKey,
+    [_constants2.API_KEY_HEADER_NAME]: apiKey,
     "Content-Type": "application/json"
   };
   const projectPath = process.cwd();

package/dist/common/jwtTokenManager.d.ts

@@ -10,7 +10,7 @@ declare class JwtTokenManager {
     private scheduleTokenRefresh;
     private refreshToken;
     fetchWithToken(...[input, init]: Parameters<typeof fetch>): Promise<Response>;
-    get backendFunctionsBaseUrl(): string;
+    get backendFunctionsBaseUrl(): string | undefined;
 }
 export declare const backendFunctionsTokenManager: JwtTokenManager;
 export declare function callBackendFunctionWithToken(path: string, init?: Parameters<typeof fetch>[1]): Promise<Response>;

package/dist/common/jwtTokenManager.js

@@ -9,7 +9,6 @@ var _crossFetch = _interopRequireDefault(require("cross-fetch"));
 var jwt = _interopRequireWildcard(require("jsonwebtoken"));
 var _neverthrow = require("neverthrow");
 var _constants = require("./constants");
-var _helpers = require("../commands/intuned-cli/helpers");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -82,19 +81,25 @@ class JwtTokenManager {
     return result;
   }
   get backendFunctionsBaseUrl() {
-    if (!process.env.FUNCTIONS_DOMAIN && !(0, _helpers.getBaseUrl)()) {
-      throw new Error(`Cannot call backend function - FUNCTIONS_DOMAIN or ${_constants.API_BASE_URL_ENV_VAR_KEY} not set`);
-    }
-    const domain = process.env.FUNCTIONS_DOMAIN ?? (0, _helpers.getBaseUrl)().replace(/\/+$/, "");
-    if (!process.env[_constants.WORKSPACE_ID_ENV_VAR_KEY]) {
-      throw new Error(`Cannot call backend function - ${_constants.WORKSPACE_ID_ENV_VAR_KEY} not set`);
-    }
-    const workspaceId = process.env[_constants.WORKSPACE_ID_ENV_VAR_KEY];
-    if (!process.env[_constants.PROJECT_ID_ENV_VAR_KEY] && !process.env.INTUNED_INTEGRATION_ID) {
-      throw new Error(`Cannot call backend function - ${_constants.PROJECT_ID_ENV_VAR_KEY} or INTUNED_INTEGRATION_ID not set`);
+    try {
+      if (!process.env.FUNCTIONS_DOMAIN) {
+        throw new Error(`Cannot call backend function - FUNCTIONS_DOMAIN not set`);
+      }
+      const domain = process.env.FUNCTIONS_DOMAIN;
+      if (!process.env[_constants.WORKSPACE_ID_ENV_VAR_KEY]) {
+        throw new Error(`Cannot call backend function - ${_constants.WORKSPACE_ID_ENV_VAR_KEY} not set`);
+      }
+      const workspaceId = process.env[_constants.WORKSPACE_ID_ENV_VAR_KEY];
+      if (!process.env[_constants.PROJECT_ID_ENV_VAR_KEY] && !process.env.INTUNED_INTEGRATION_ID) {
+        throw new Error(`Cannot call backend function - ${_constants.PROJECT_ID_ENV_VAR_KEY} or INTUNED_INTEGRATION_ID not set`);
+      }
+      const projectId = process.env.INTUNED_INTEGRATION_ID ?? process.env[_constants.PROJECT_ID_ENV_VAR_KEY];
+      return `${domain}/api/${workspaceId}/functions/${projectId}`;
+    } catch (e) {
+      if (process.env[_constants.CLI_ENV_VAR_KEY] === "true") {
+        throw new Error(`API credentials not set - make sure to save your project to Intuned to set up the correct API credentials.\nOriginal error: ${e.message}`);
+      }
     }
-    const projectId = process.env.INTUNED_INTEGRATION_ID ?? process.env[_constants.PROJECT_ID_ENV_VAR_KEY];
-    return `${domain}/api/${workspaceId}/functions/${projectId}`;
   }
 }
 const backendFunctionsTokenManager = exports.backendFunctionsTokenManager = new JwtTokenManager(`refreshBackendFunctionsToken`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "1.3.1-api-token.5",
+  "version": "1.3.1-api-token.6",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",