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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,12 +1,15 @@
1
1
  "use strict";
2
2
 
3
3
  var _dotenv = _interopRequireDefault(require("dotenv"));
4
+ var _constants = require("../../common/constants");
4
5
  var _commands = require("./commands");
5
6
  var _helpers = require("./helpers");
6
7
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
7
8
  _dotenv.default.config({
8
9
  path: `.env`
9
10
  });
11
+ process.env[_constants.CLI_ENV_VAR_KEY] = "true";
12
+ process.env.RUN_ENVIRONMENT = "authoring";
10
13
  _commands.program.configureHelp({
11
14
  sortSubcommands: true
12
15
  });
@@ -6,3 +6,4 @@ export declare const PROJECT_ID_ENV_VAR_KEY = "INTUNED_PROJECT_ID";
6
6
  export declare const API_KEY_ENV_VAR_KEY = "INTUNED_API_KEY";
7
7
  export declare const API_KEY_HEADER_NAME = "x-api-key";
8
8
  export declare const API_BASE_URL_ENV_VAR_KEY = "INTUNED_API_BASE_URL";
9
+ export declare const CLI_ENV_VAR_KEY = "INTUNED_CLI";
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- 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;
6
+ exports.WORKSPACE_ID_ENV_VAR_KEY = exports.PROJECT_ID_ENV_VAR_KEY = exports.CLI_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;
7
7
  const API_FOLDER_NAME = exports.API_FOLDER_NAME = "api";
8
8
  const AUTH_SESSIONS_FOLDER_NAME = exports.AUTH_SESSIONS_FOLDER_NAME = "auth-sessions";
9
9
  const AUTH_SESSIONS_INSTANCES_FOLDER_NAME = exports.AUTH_SESSIONS_INSTANCES_FOLDER_NAME = "auth-sessions-instances";
@@ -11,4 +11,5 @@ const WORKSPACE_ID_ENV_VAR_KEY = exports.WORKSPACE_ID_ENV_VAR_KEY = "INTUNED_WOR
11
11
  const PROJECT_ID_ENV_VAR_KEY = exports.PROJECT_ID_ENV_VAR_KEY = "INTUNED_PROJECT_ID";
12
12
  const API_KEY_ENV_VAR_KEY = exports.API_KEY_ENV_VAR_KEY = "INTUNED_API_KEY";
13
13
  const API_KEY_HEADER_NAME = exports.API_KEY_HEADER_NAME = "x-api-key";
14
- const API_BASE_URL_ENV_VAR_KEY = exports.API_BASE_URL_ENV_VAR_KEY = "INTUNED_API_BASE_URL";
14
+ const API_BASE_URL_ENV_VAR_KEY = exports.API_BASE_URL_ENV_VAR_KEY = "INTUNED_API_BASE_URL";
15
+ const CLI_ENV_VAR_KEY = exports.CLI_ENV_VAR_KEY = "INTUNED_CLI";
@@ -53,7 +53,7 @@ class JwtTokenManager {
53
53
  }
54
54
  async refreshToken() {
55
55
  if (process.env.RUN_ENVIRONMENT?.toLowerCase() !== "authoring") return;
56
- const res = await this.fetchWithToken(`${this.backendFunctionsBaseUrl}/refreshBackendFunctionsToken`, {
56
+ const res = await this.fetchWithToken(`${this.backendFunctionsBaseUrl}/${this.refreshTokenPath}`, {
57
57
  method: "GET"
58
58
  });
59
59
  if (res.status === 401) {
@@ -68,15 +68,16 @@ class JwtTokenManager {
68
68
  const headers = new Headers(init?.headers);
69
69
  if (process.env[_constants.API_KEY_ENV_VAR_KEY]) {
70
70
  headers.set(_constants.API_KEY_HEADER_NAME, process.env[_constants.API_KEY_ENV_VAR_KEY]);
71
- } else if (this.token !== undefined) {
71
+ }
72
+ if (this.token !== undefined) {
72
73
  headers.set("Authorization", `Bearer ${this.token}`);
73
74
  }
74
75
  const result = await (0, _crossFetch.default)(input, {
75
76
  ...init,
76
77
  headers
77
78
  });
78
- if (result.status === 401) {
79
- console.warn("Unauthorized backend function call - make sure you are running in an Intuned environment or have set your API key");
79
+ if (result.status === 401 && process.env[_constants.CLI_ENV_VAR_KEY] === "true") {
80
+ console.warn("Unauthorized backend function call - make sure to save your project to Intuned to set up the correct API credentials");
80
81
  }
81
82
  return result;
82
83
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@intuned/runtime-dev",
3
- "version": "1.3.1-api-token.2",
3
+ "version": "1.3.1-api-token.4",
4
4
  "description": "Intuned runtime",
5
5
  "exports": {
6
6
  ".": "./dist/index.js",