@intuned/runtime-dev 1.3.1-api-token.1 → 1.3.1-api-token.2

package/dist/commands/intuned-cli/helpers/backend.js

@@ -23,5 +23,5 @@ async function getAuthCredentials(options) {
   };
 }
 function getBaseUrl() {
-  return process.env.INTUNED_API_BASE_URL || process.env.INTUNED_API_DOMAIN || `https://app.intuned.io`;
+  return process.env[_constants.API_BASE_URL_ENV_VAR_KEY] || process.env.INTUNED_API_DOMAIN || `https://app.intuned.io`;
 }

package/dist/common/constants.d.ts

@@ -5,3 +5,4 @@ export declare const WORKSPACE_ID_ENV_VAR_KEY = "INTUNED_WORKSPACE_ID";
 export declare const PROJECT_ID_ENV_VAR_KEY = "INTUNED_PROJECT_ID";
 export declare const API_KEY_ENV_VAR_KEY = "INTUNED_API_KEY";
 export declare const API_KEY_HEADER_NAME = "x-api-key";
+export declare const API_BASE_URL_ENV_VAR_KEY = "INTUNED_API_BASE_URL";

package/dist/common/constants.js

@@ -3,11 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WORKSPACE_ID_ENV_VAR_KEY = exports.PROJECT_ID_ENV_VAR_KEY = exports.AUTH_SESSIONS_INSTANCES_FOLDER_NAME = exports.AUTH_SESSIONS_FOLDER_NAME = exports.API_KEY_HEADER_NAME = exports.API_KEY_ENV_VAR_KEY = exports.API_FOLDER_NAME = void 0;
+exports.WORKSPACE_ID_ENV_VAR_KEY = exports.PROJECT_ID_ENV_VAR_KEY = exports.AUTH_SESSIONS_INSTANCES_FOLDER_NAME = exports.AUTH_SESSIONS_FOLDER_NAME = exports.API_KEY_HEADER_NAME = exports.API_KEY_ENV_VAR_KEY = exports.API_FOLDER_NAME = exports.API_BASE_URL_ENV_VAR_KEY = void 0;
 const API_FOLDER_NAME = exports.API_FOLDER_NAME = "api";
 const AUTH_SESSIONS_FOLDER_NAME = exports.AUTH_SESSIONS_FOLDER_NAME = "auth-sessions";
 const AUTH_SESSIONS_INSTANCES_FOLDER_NAME = exports.AUTH_SESSIONS_INSTANCES_FOLDER_NAME = "auth-sessions-instances";
 const WORKSPACE_ID_ENV_VAR_KEY = exports.WORKSPACE_ID_ENV_VAR_KEY = "INTUNED_WORKSPACE_ID";
 const PROJECT_ID_ENV_VAR_KEY = exports.PROJECT_ID_ENV_VAR_KEY = "INTUNED_PROJECT_ID";
 const API_KEY_ENV_VAR_KEY = exports.API_KEY_ENV_VAR_KEY = "INTUNED_API_KEY";
-const API_KEY_HEADER_NAME = exports.API_KEY_HEADER_NAME = "x-api-key";
+const API_KEY_HEADER_NAME = exports.API_KEY_HEADER_NAME = "x-api-key";
+const API_BASE_URL_ENV_VAR_KEY = exports.API_BASE_URL_ENV_VAR_KEY = "INTUNED_API_BASE_URL";

package/dist/common/jwtTokenManager.js

@@ -9,6 +9,7 @@ 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 }; }
@@ -63,26 +64,36 @@ class JwtTokenManager {
     const newToken = jsonResult.value.token;
     if (newToken) this._token = newToken;
   }
-  fetchWithToken(...[input, init]) {
+  async fetchWithToken(...[input, init]) {
     const headers = new Headers(init?.headers);
     if (process.env[_constants.API_KEY_ENV_VAR_KEY]) {
       headers.set(_constants.API_KEY_HEADER_NAME, process.env[_constants.API_KEY_ENV_VAR_KEY]);
     } else if (this.token !== undefined) {
       headers.set("Authorization", `Bearer ${this.token}`);
     }
-    return (0, _crossFetch.default)(input, {
+    const result = await (0, _crossFetch.default)(input, {
       ...init,
       headers
     });
+    if (result.status === 401) {
+      console.warn("Unauthorized backend function call - make sure you are running in an Intuned environment or have set your API key");
+    }
+    return result;
   }
   get backendFunctionsBaseUrl() {
-    if (!process.env.FUNCTIONS_DOMAIN || !process.env[_constants.WORKSPACE_ID_ENV_VAR_KEY]) {
-      throw new Error(`Cannot call backend function - FUNCTIONS_DOMAIN or ${_constants.WORKSPACE_ID_ENV_VAR_KEY} not set`);
+    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`);
     }
-    return `${process.env.FUNCTIONS_DOMAIN}/api/${process.env[_constants.WORKSPACE_ID_ENV_VAR_KEY]}/functions/${process.env[_constants.PROJECT_ID_ENV_VAR_KEY] ?? process.env.INTUNED_INTEGRATION_ID}`;
+    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.1",
+  "version": "1.3.1-api-token.2",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",