@mondaydotcomorg/monday-authorization 1.1.9-featurebelkaauthz-sdk-improved-error-handling.2402 → 1.1.9-featureliorshonehourjwttoken.464

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.
package/CHANGELOG.md CHANGED
@@ -5,16 +5,6 @@ All notable changes to this project will be documented in this file.
5
5
  The format is based on [Keep a Changelog](http://keepachangelog.com/)
6
6
  and this project adheres to [Semantic Versioning](http://semver.org/).
7
7
 
8
- ## [1.2.3] - 2024-06-10
9
- ### Added
10
-
11
- - [`feature/yarden/resource-attributes-api-support-authz-sdk (#5826)`](https://github.com/DaPulse/monday-npm-packages/pull/5826)
12
- - `AuthorizationAttributesService` - now supports upsert (`upsertResourceAttributesSync`) and delete (`deleteResourceAttributesSync`) resource attributes in the authorization MS
13
-
14
- ## [1.2.0] - 2024-01-05
15
- ### Added
16
- - `isAuthorized` now return the unauthorized objects - regardless to the unauthorized ids (which may be missing resource ids if resource has no id, like `feature` e.g.)
17
-
18
8
  ## [1.1.0] - 2023-08-09
19
9
 
20
10
  ### ⚠ BREAKING CHANGES
package/README.md CHANGED
@@ -136,35 +136,3 @@ const canActionInScopeMultipleResponse: ScopedActionResponseObject[] =
136
136
  * ]
137
137
  * /
138
138
  ```
139
-
140
- ### Authorization Attributes API
141
-
142
- Use `AuthorizationAttributesService.upsertResourceAttributesSync` to upsert multiple resource attributes in the authorization MS synchronously.
143
-
144
- ```ts
145
- import { AuthorizationAttributesService, ResourceAttributeAssignment, ResourceAttributeResponse } from '@mondaydotcomorg/monday-authorization';
146
-
147
- const accountId = 739630;
148
- const userId = 4;
149
- const resourceAttributesAssignments: ResourceAttributeAssignment[] = [
150
- { resourceId: 18, resourceType: 'workspace', key: 'is_default_workspace', value: 'true' },
151
- { resourceId: 23, resourceType: 'board', key: 'board_kind', value: 'private' }
152
- ];
153
-
154
- const response: ResourceAttributeResponse = await AuthorizationAttributesService.upsertResourceAttributesSync(accountId, userId, resourceAttributesAssignments);
155
- ```
156
-
157
- Use `AuthorizationAttributesService.deleteResourceAttributesSync` to delete single resource's attributes in the authorization MS synchronously.
158
-
159
-
160
- ```ts
161
- import { AuthorizationAttributesService, ResourceAttributeResponse, Resource } from '@mondaydotcomorg/monday-authorization';
162
-
163
- const accountId = 739630;
164
- const userId = 4;
165
- const resource: Resource = { type: 'workspace', id: 18 };
166
- const attributeKeys: string[] = ['is_default_workspace', 'workspace_kind'];
167
-
168
- const response: ResourceAttributeResponse = await AuthorizationAttributesService.deleteResourceAttributesSync(accountId, userId, resource, attributeKeys);
169
- ```
170
-
package/dist/index.d.ts CHANGED
@@ -1,5 +1,4 @@
1
1
  import { MondayFetchOptions } from '@mondaydotcomorg/monday-fetch';
2
- import * as TestKit from './lib/testKit';
3
2
  export interface InitOptions {
4
3
  prometheus?: any;
5
4
  mondayFetchOptions?: MondayFetchOptions;
@@ -9,5 +8,3 @@ export interface InitOptions {
9
8
  export declare function init(options?: InitOptions): void;
10
9
  export { authorizationCheckMiddleware, getAuthorizationMiddleware, skipAuthorizationMiddleware, } from './lib/authorization-middleware';
11
10
  export { AuthorizationService } from './lib/authorization-service';
12
- export { AuthorizationAttributesService } from './lib/authorization-attributes-service';
13
- export { TestKit };
package/dist/index.js CHANGED
@@ -1,33 +1,8 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
2
  Object.defineProperty(exports, "__esModule", { value: true });
26
- exports.TestKit = exports.AuthorizationAttributesService = exports.AuthorizationService = exports.skipAuthorizationMiddleware = exports.getAuthorizationMiddleware = exports.authorizationCheckMiddleware = exports.init = void 0;
3
+ exports.AuthorizationService = exports.skipAuthorizationMiddleware = exports.getAuthorizationMiddleware = exports.authorizationCheckMiddleware = exports.init = void 0;
27
4
  const prometheus_service_1 = require("./lib/prometheus-service");
28
5
  const authorization_service_1 = require("./lib/authorization-service");
29
- const TestKit = __importStar(require("./lib/testKit"));
30
- exports.TestKit = TestKit;
31
6
  function init(options = {}) {
32
7
  if (options.prometheus) {
33
8
  (0, prometheus_service_1.setPrometheus)(options.prometheus);
@@ -46,5 +21,3 @@ Object.defineProperty(exports, "getAuthorizationMiddleware", { enumerable: true,
46
21
  Object.defineProperty(exports, "skipAuthorizationMiddleware", { enumerable: true, get: function () { return authorization_middleware_1.skipAuthorizationMiddleware; } });
47
22
  var authorization_service_2 = require("./lib/authorization-service");
48
23
  Object.defineProperty(exports, "AuthorizationService", { enumerable: true, get: function () { return authorization_service_2.AuthorizationService; } });
49
- var authorization_attributes_service_1 = require("./lib/authorization-attributes-service");
50
- Object.defineProperty(exports, "AuthorizationAttributesService", { enumerable: true, get: function () { return authorization_attributes_service_1.AuthorizationAttributesService; } });
@@ -1,15 +1,6 @@
1
- /// <reference types="bunyan" />
2
1
  import { Request } from 'express';
3
- import { fetch, MondayFetchOptions } from '@mondaydotcomorg/monday-fetch';
4
- import * as MondayLogger from '@mondaydotcomorg/monday-logger';
5
- export declare const logger: MondayLogger.Logger;
6
2
  export declare class AuthorizationInternalService {
7
3
  static skipAuthorization(requset: Request): void;
8
4
  static markAuthorized(request: Request): void;
9
5
  static failIfNotCoveredByAuthorization(request: Request): void;
10
- static throwOnHttpErrorIfNeeded(response: Awaited<ReturnType<typeof fetch>>, placement: string): void;
11
- static generateInternalAuthToken(accountId: number, userId: number): string;
12
- static setRequestFetchOptions(customMondayFetchOptions: MondayFetchOptions): void;
13
- static getRequestFetchOptions(): MondayFetchOptions;
14
- static getRequestTimeout(): 60000 | 2000;
15
6
  }
@@ -1,46 +1,6 @@
1
1
  "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
2
  Object.defineProperty(exports, "__esModule", { value: true });
26
- exports.AuthorizationInternalService = exports.logger = void 0;
27
- const monday_jwt_1 = require("@mondaydotcomorg/monday-jwt");
28
- const MondayLogger = __importStar(require("@mondaydotcomorg/monday-logger"));
29
- const INTERNAL_APP_NAME = 'internal_ms';
30
- const defaultMondayFetchOptions = {
31
- retries: 3,
32
- callback: logOnFetchFail,
33
- };
34
- function logOnFetchFail(retriesLeft, error) {
35
- if (retriesLeft == 0) {
36
- exports.logger.error({ retriesLeft, error }, 'Authorization attempt failed due to network issues');
37
- }
38
- else {
39
- exports.logger.info({ retriesLeft, error }, 'Authorization attempt failed due to network issues, trying again');
40
- }
41
- }
42
- let mondayFetchOptions = defaultMondayFetchOptions;
43
- exports.logger = MondayLogger.getLogger();
3
+ exports.AuthorizationInternalService = void 0;
44
4
  class AuthorizationInternalService {
45
5
  static skipAuthorization(requset) {
46
6
  requset.authorizationSkipPerformed = true;
@@ -53,26 +13,5 @@ class AuthorizationInternalService {
53
13
  throw 'Endpoint is not covered by authorization check';
54
14
  }
55
15
  }
56
- static throwOnHttpErrorIfNeeded(response, placement) {
57
- if (response.ok) {
58
- return;
59
- }
60
- const status = response.status;
61
- exports.logger.error({ tag: 'authorization-service', placement, status }, 'AuthorizationService: authorization request failed');
62
- throw new Error(`AuthorizationService: [${placement}] authorization request failed with status ${status}`);
63
- }
64
- static generateInternalAuthToken(accountId, userId) {
65
- return (0, monday_jwt_1.signAuthorizationHeader)({ appName: INTERNAL_APP_NAME, accountId, userId });
66
- }
67
- static setRequestFetchOptions(customMondayFetchOptions) {
68
- mondayFetchOptions = Object.assign(Object.assign({}, defaultMondayFetchOptions), customMondayFetchOptions);
69
- }
70
- static getRequestFetchOptions() {
71
- return mondayFetchOptions;
72
- }
73
- static getRequestTimeout() {
74
- const isDevEnv = process.env.NODE_ENV === 'development';
75
- return isDevEnv ? 60000 : 2000;
76
- }
77
16
  }
78
17
  exports.AuthorizationInternalService = AuthorizationInternalService;
@@ -1,6 +1,5 @@
1
1
  import { NextFunction } from 'express';
2
- import { Action, BaseRequest, BaseResponse, Context, ContextGetter, ResourceGetter } from './types/general';
2
+ import { Action, BaseRequest, BaseResponse, ContextGetter, ResourceGetter } from './types/general';
3
3
  export declare function getAuthorizationMiddleware(action: Action, resourceGetter: ResourceGetter, contextGetter?: ContextGetter): (request: BaseRequest, response: BaseResponse, next: NextFunction) => Promise<void>;
4
4
  export declare function skipAuthorizationMiddleware(request: BaseRequest, response: BaseResponse, next: NextFunction): void;
5
5
  export declare function authorizationCheckMiddleware(request: BaseRequest, response: BaseResponse, next: NextFunction): void;
6
- export declare function defaultContextGetter(request: BaseRequest): Context;
@@ -12,12 +12,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
12
12
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
- exports.defaultContextGetter = exports.authorizationCheckMiddleware = exports.skipAuthorizationMiddleware = exports.getAuthorizationMiddleware = void 0;
15
+ exports.authorizationCheckMiddleware = exports.skipAuthorizationMiddleware = exports.getAuthorizationMiddleware = void 0;
16
16
  const on_headers_1 = __importDefault(require("on-headers"));
17
17
  const authorization_internal_service_1 = require("./authorization-internal-service");
18
18
  const authorization_service_1 = require("./authorization-service");
19
- // getAuthorizationMiddleware is duplicated in testKit/index.ts
20
- // If you are making changes to this function, please make sure to update the other file as well
21
19
  function getAuthorizationMiddleware(action, resourceGetter, contextGetter) {
22
20
  return function authorizationMiddleware(request, response, next) {
23
21
  return __awaiter(this, void 0, void 0, function* () {
@@ -54,4 +52,3 @@ exports.authorizationCheckMiddleware = authorizationCheckMiddleware;
54
52
  function defaultContextGetter(request) {
55
53
  return request.payload;
56
54
  }
57
- exports.defaultContextGetter = defaultContextGetter;
@@ -1,10 +1,9 @@
1
1
  import { MondayFetchOptions } from '@mondaydotcomorg/monday-fetch';
2
2
  import { Action, AuthorizationObject, Resource } from './types/general';
3
- import { ScopedAction, ScopedActionPermit, ScopedActionResponseObject, ScopeOptions } from './types/scoped-actions-contracts';
3
+ import { ScopedAction, ScopedActionPermit, ScopedActionResponseObject, ScopeOptions } from 'lib/types/scoped-actions-contracts';
4
4
  export interface AuthorizeResponse {
5
5
  isAuthorized: boolean;
6
6
  unauthorizedIds?: number[];
7
- unauthorizedObjects?: AuthorizationObject[];
8
7
  }
9
8
  export declare function setRequestFetchOptions(customMondayFetchOptions: MondayFetchOptions): void;
10
9
  export declare function setRedisClient(client: any, grantedFeatureRedisExpirationInSeconds?: number): void;
@@ -1,4 +1,27 @@
1
1
  "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
2
25
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
26
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
27
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -12,13 +35,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
12
35
  exports.AuthorizationService = exports.setRedisClient = exports.setRequestFetchOptions = void 0;
13
36
  const lodash_1 = require("lodash");
14
37
  const perf_hooks_1 = require("perf_hooks");
38
+ const monday_jwt_1 = require("@mondaydotcomorg/monday-jwt");
39
+ const MondayLogger = __importStar(require("@mondaydotcomorg/monday-logger"));
15
40
  const monday_fetch_1 = require("@mondaydotcomorg/monday-fetch");
16
41
  const prometheus_service_1 = require("./prometheus-service");
17
- const authorization_internal_service_1 = require("./authorization-internal-service");
18
- const attributions_service_1 = require("./attributions-service");
42
+ const INTERNAL_APP_NAME = 'internal_ms';
43
+ const logger = MondayLogger.getLogger();
19
44
  const GRANTED_FEATURE_CACHE_EXPIRATION_SECONDS = 5 * 60;
45
+ const defaultMondayFetchOptions = {
46
+ retries: 3,
47
+ callback: logOnFetchFail,
48
+ };
49
+ let mondayFetchOptions = defaultMondayFetchOptions;
20
50
  function setRequestFetchOptions(customMondayFetchOptions) {
21
- authorization_internal_service_1.AuthorizationInternalService.setRequestFetchOptions(customMondayFetchOptions);
51
+ mondayFetchOptions = Object.assign(Object.assign({}, defaultMondayFetchOptions), customMondayFetchOptions);
22
52
  }
23
53
  exports.setRequestFetchOptions = setRequestFetchOptions;
24
54
  function setRedisClient(client, grantedFeatureRedisExpirationInSeconds = GRANTED_FEATURE_CACHE_EXPIRATION_SECONDS) {
@@ -27,7 +57,7 @@ function setRedisClient(client, grantedFeatureRedisExpirationInSeconds = GRANTED
27
57
  AuthorizationService.grantedFeatureRedisExpirationInSeconds = grantedFeatureRedisExpirationInSeconds;
28
58
  }
29
59
  else {
30
- authorization_internal_service_1.logger.warn({ grantedFeatureRedisExpirationInSeconds }, 'Invalid input for grantedFeatureRedisExpirationInSeconds, must be positive number. using default ttl.');
60
+ logger.warn({ grantedFeatureRedisExpirationInSeconds }, 'Invalid input for grantedFeatureRedisExpirationInSeconds, must be positive number. using default ttl.');
31
61
  AuthorizationService.grantedFeatureRedisExpirationInSeconds = GRANTED_FEATURE_CACHE_EXPIRATION_SECONDS;
32
62
  }
33
63
  }
@@ -87,27 +117,26 @@ class AuthorizationService {
87
117
  }
88
118
  static canActionInScopeMultiple(accountId, userId, scopedActions) {
89
119
  return __awaiter(this, void 0, void 0, function* () {
90
- const internalAuthToken = authorization_internal_service_1.AuthorizationInternalService.generateInternalAuthToken(accountId, userId);
120
+ const internalAuthToken = (0, monday_jwt_1.signAuthorizationHeader)({ appName: INTERNAL_APP_NAME, accountId, userId });
91
121
  const scopedActionsPayload = scopedActions.map(scopedAction => {
92
122
  return Object.assign(Object.assign({}, scopedAction), { scope: (0, lodash_1.mapKeys)(scopedAction.scope, (_, key) => (0, lodash_1.snakeCase)(key)) }); // for example: { workspaceId: 1 } => { workspace_id: 1 }
93
123
  });
94
- const attributionHeaders = (0, attributions_service_1.getAttributionsFromApi)();
95
124
  const response = yield (0, monday_fetch_1.fetch)(getCanActionsInScopesUrl(), {
96
125
  method: 'POST',
97
- headers: Object.assign({ Authorization: internalAuthToken, 'Content-Type': 'application/json' }, attributionHeaders),
98
- timeout: authorization_internal_service_1.AuthorizationInternalService.getRequestTimeout(),
126
+ headers: { Authorization: internalAuthToken, 'Content-Type': 'application/json' },
127
+ timeout: getRequestTimeout(),
99
128
  body: JSON.stringify({
100
129
  user_id: userId,
101
130
  scoped_actions: scopedActionsPayload,
102
131
  }),
103
- }, authorization_internal_service_1.AuthorizationInternalService.getRequestFetchOptions());
104
- authorization_internal_service_1.AuthorizationInternalService.throwOnHttpErrorIfNeeded(response, 'canActionInScopeMultiple');
132
+ }, mondayFetchOptions);
133
+ throwOnHttpErrorIfNeeded(response, 'canActionInScopeMultiple');
105
134
  const responseBody = yield response.json();
106
- const camelCaseKeys = obj => Object.fromEntries(Object.entries(obj).map(([key, value]) => [(0, lodash_1.camelCase)(key), value]));
135
+ const camelCaseKeys = (obj) => Object.fromEntries(Object.entries(obj).map(([key, value]) => [(0, lodash_1.camelCase)(key), value]));
107
136
  const scopedActionsResponseObjects = responseBody.result.map(responseObject => {
108
137
  const { scopedAction, permit } = responseObject;
109
138
  const { scope } = scopedAction;
110
- const transformKeys = obj => camelCaseKeys(obj);
139
+ const transformKeys = (obj) => camelCaseKeys(obj);
111
140
  return Object.assign(Object.assign({}, responseObject), { scopedAction: Object.assign(Object.assign({}, scopedAction), { scope: transformKeys(scope) }), permit: transformKeys(permit) });
112
141
  });
113
142
  return scopedActionsResponseObjects;
@@ -121,23 +150,22 @@ class AuthorizationService {
121
150
  }
122
151
  static isAuthorizedMultiple(accountId, userId, authorizationRequestObjects) {
123
152
  return __awaiter(this, void 0, void 0, function* () {
124
- const internalAuthToken = authorization_internal_service_1.AuthorizationInternalService.generateInternalAuthToken(accountId, userId);
153
+ const internalAuthToken = (0, monday_jwt_1.signAuthorizationHeader)({ appName: INTERNAL_APP_NAME, accountId, userId });
125
154
  const startTime = perf_hooks_1.performance.now();
126
- const attributionHeaders = (0, attributions_service_1.getAttributionsFromApi)();
127
155
  const response = yield (0, monday_fetch_1.fetch)(getAuthorizeUrl(), {
128
156
  method: 'POST',
129
- headers: Object.assign({ Authorization: internalAuthToken, 'Content-Type': 'application/json' }, attributionHeaders),
130
- timeout: authorization_internal_service_1.AuthorizationInternalService.getRequestTimeout(),
157
+ headers: { Authorization: internalAuthToken, 'Content-Type': 'application/json' },
158
+ timeout: getRequestTimeout(),
131
159
  body: JSON.stringify({
132
160
  user_id: userId,
133
161
  authorize_request_objects: authorizationRequestObjects,
134
162
  }),
135
- }, authorization_internal_service_1.AuthorizationInternalService.getRequestFetchOptions());
163
+ }, mondayFetchOptions);
136
164
  const endTime = perf_hooks_1.performance.now();
137
165
  const time = endTime - startTime;
138
166
  const responseStatus = response.status;
139
167
  (0, prometheus_service_1.sendAuthorizationChecksPerRequestMetric)(responseStatus, authorizationRequestObjects.length);
140
- authorization_internal_service_1.AuthorizationInternalService.throwOnHttpErrorIfNeeded(response, 'isAuthorizedMultiple');
168
+ throwOnHttpErrorIfNeeded(response, 'isAuthorizedMultiple');
141
169
  const responseBody = yield response.json();
142
170
  const unauthorizedObjects = [];
143
171
  responseBody.result.forEach(function (isAuthorized, index) {
@@ -148,13 +176,13 @@ class AuthorizationService {
148
176
  (0, prometheus_service_1.sendAuthorizationCheckResponseTimeMetric)(authorizationObject.resource_type, authorizationObject.action, isAuthorized, responseStatus, time);
149
177
  });
150
178
  if (unauthorizedObjects.length > 0) {
151
- authorization_internal_service_1.logger.info({
179
+ logger.info({
152
180
  resources: JSON.stringify(unauthorizedObjects),
153
181
  }, 'AuthorizationService: resource is unauthorized');
154
182
  const unauthorizedIds = unauthorizedObjects
155
183
  .filter(obj => !!obj.resource_id)
156
184
  .map(obj => obj.resource_id);
157
- return { isAuthorized: false, unauthorizedIds, unauthorizedObjects };
185
+ return { isAuthorized: false, unauthorizedIds };
158
186
  }
159
187
  return { isAuthorized: true };
160
188
  });
@@ -177,9 +205,29 @@ function createAuthorizationParams(resources, action) {
177
205
  };
178
206
  return params;
179
207
  }
208
+ function logOnFetchFail(retriesLeft, error) {
209
+ if (retriesLeft == 0) {
210
+ logger.error({ retriesLeft, error }, 'Authorization attempt failed due to network issues');
211
+ }
212
+ else {
213
+ logger.info({ retriesLeft, error }, 'Authorization attempt failed due to network issues, trying again');
214
+ }
215
+ }
180
216
  function getAuthorizeUrl() {
181
217
  return `${process.env.MONDAY_INTERNAL_URL}/internal_ms/authorization/authorize`;
182
218
  }
183
219
  function getCanActionsInScopesUrl() {
184
220
  return `${process.env.MONDAY_INTERNAL_URL}/internal_ms/authorization/can_actions_in_scopes`;
185
221
  }
222
+ function getRequestTimeout() {
223
+ const isDevEnv = process.env.NODE_ENV === 'development';
224
+ return isDevEnv ? 60000 : 2000;
225
+ }
226
+ function throwOnHttpErrorIfNeeded(response, placement) {
227
+ if (response.ok) {
228
+ return;
229
+ }
230
+ const status = response.status;
231
+ logger.error({ tag: 'authorization-service', placement, status }, 'AuthorizationService: authorization request failed');
232
+ throw new Error(`AuthorizationService: [${placement}] authorization request failed with status ${status}`);
233
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mondaydotcomorg/monday-authorization",
3
- "version": "1.1.9-featurebelkaauthz-sdk-improved-error-handling.2402+93ed96694",
3
+ "version": "1.1.9-featureliorshonehourjwttoken.464+129cb4f21",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "license": "BSD-3-Clause",
@@ -10,11 +10,9 @@
10
10
  },
11
11
  "dependencies": {
12
12
  "@mondaydotcomorg/monday-fetch": "^0.0.7",
13
- "@mondaydotcomorg/monday-jwt": "^3.0.10",
13
+ "@mondaydotcomorg/monday-jwt": "^3.0.9-featureliorshonehourjwttoken.464+129cb4f21",
14
14
  "@mondaydotcomorg/monday-logger": "^3.0.10",
15
- "@mondaydotcomorg/trident-backend-api": "^0.21.0",
16
15
  "node-fetch": "^2.6.7",
17
- "on-headers": "^1.0.2",
18
16
  "ts-node": "^10.0.0"
19
17
  },
20
18
  "devDependencies": {
@@ -26,6 +24,7 @@
26
24
  "ioredis": "^5.2.4",
27
25
  "ioredis-mock": "^8.2.2",
28
26
  "mocha": "^9.0.1",
27
+ "on-headers": "^1.0.2",
29
28
  "supertest": "^6.1.3",
30
29
  "tsconfig-paths": "^3.9.0",
31
30
  "typescript": "^5.1.6"
@@ -33,5 +32,5 @@
33
32
  "files": [
34
33
  "dist/"
35
34
  ],
36
- "gitHead": "93ed96694fd3288d74d2d15e68980bb4fb767621"
35
+ "gitHead": "129cb4f2133298672f7589229834f11b50a5fc43"
37
36
  }
@@ -1,3 +0,0 @@
1
- export declare function getAttributionsFromApi(): {
2
- [key: string]: string;
3
- };
@@ -1,54 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getAttributionsFromApi = void 0;
4
- const trident_backend_api_1 = require("@mondaydotcomorg/trident-backend-api");
5
- const authorization_internal_service_1 = require("./authorization-internal-service");
6
- const APP_NAME_VARIABLE_KEY = 'APP_NAME';
7
- const APP_NAME_HEADER_NAME = 'x-caller-app-name-from-sdk';
8
- const FROM_SDK_HEADER_SUFFIX = `-from-sdk`;
9
- let didSendFailureLogOnce = false;
10
- function getAttributionsFromApi() {
11
- let callerAppNameFromSdk = {
12
- [APP_NAME_HEADER_NAME]: tryJsonParse(getEnvVariable(APP_NAME_VARIABLE_KEY)),
13
- };
14
- try {
15
- const tridentContext = trident_backend_api_1.Api.getPart('context');
16
- if (!tridentContext) {
17
- return callerAppNameFromSdk;
18
- }
19
- const { runtimeAttributions } = tridentContext;
20
- let runtimeAttributionsOutgoingHeaders = runtimeAttributions === null || runtimeAttributions === void 0 ? void 0 : runtimeAttributions.buildOutgoingHeaders('HTTP_INTERNAL');
21
- if (!runtimeAttributionsOutgoingHeaders) {
22
- return callerAppNameFromSdk;
23
- }
24
- const attributionsHeaders = Object.fromEntries(runtimeAttributionsOutgoingHeaders);
25
- const attributionHeadersFromSdk = {};
26
- Object.keys(attributionsHeaders).forEach(function (key) {
27
- attributionHeadersFromSdk[`${key}${FROM_SDK_HEADER_SUFFIX}`] = attributionsHeaders[key];
28
- });
29
- return attributionHeadersFromSdk;
30
- }
31
- catch (error) {
32
- if (!didSendFailureLogOnce) {
33
- authorization_internal_service_1.logger.warn({ tag: 'authorization-service', error }, 'Failed to generate attributions headers from the API. Unexpected error while extracting headers. It may be caused by out of date Trident version.');
34
- didSendFailureLogOnce = true;
35
- }
36
- return callerAppNameFromSdk;
37
- }
38
- }
39
- exports.getAttributionsFromApi = getAttributionsFromApi;
40
- function getEnvVariable(key) {
41
- const envVar = process.env[key] || process.env[key.toUpperCase()] || process.env[key.toLowerCase()];
42
- return envVar;
43
- }
44
- function tryJsonParse(value) {
45
- if (!value) {
46
- return value;
47
- }
48
- try {
49
- return JSON.parse(value);
50
- }
51
- catch (_err) {
52
- return value;
53
- }
54
- }
@@ -1,23 +0,0 @@
1
- import { ResourceAttributeAssignment, ResourceAttributeResponse } from './types/authorization-attributes-contracts';
2
- import { Resource } from './types/general';
3
- export declare class AuthorizationAttributesService {
4
- /**
5
- * Upsert resource attributes synchronously, performing http call to the authorization MS to assign the given attributes to the given resource.
6
- * @param accountId
7
- * @param userId
8
- * @param resourceAttributeAssignments - Array of resource (resourceType, resourceId) and attribute (key, value) pairs to upsert in the authorization MS.
9
- * e.g. [{ resourceType: 'board', resourceId: 123, key: 'board_kind', value: 'private' }]
10
- * @returns ResourceAttributeResponse - The affected (created and updated_ resource attributes assignments in the `attributes` field.
11
- */
12
- static upsertResourceAttributes(accountId: number, userId: number, resourceAttributeAssignments: ResourceAttributeAssignment[]): Promise<ResourceAttributeResponse>;
13
- /**
14
- * Delete resource attributes assignments synchronously, performing http call to the authorization MS to delete the given attributes from the given singular resource.
15
- * @param accountId
16
- * @param userId
17
- * @param resource - The resource (resourceType, resourceId) to delete the attributes for.
18
- * @param attributeKeys - Array of attribute keys to delete for the resource.
19
- * @returns ResourceAttributeResponse - The affected (deleted) resource attributes assignments in the `attributes` field.
20
- */
21
- static deleteResourceAttributes(accountId: number, userId: number, resource: Resource, attributeKeys: string[]): Promise<ResourceAttributeResponse>;
22
- private static getResourceAttributesUrl;
23
- }
@@ -1,68 +0,0 @@
1
- "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
- Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.AuthorizationAttributesService = void 0;
13
- const monday_fetch_1 = require("@mondaydotcomorg/monday-fetch");
14
- const authorization_internal_service_1 = require("./authorization-internal-service");
15
- const attributions_service_1 = require("./attributions-service");
16
- class AuthorizationAttributesService {
17
- /**
18
- * Upsert resource attributes synchronously, performing http call to the authorization MS to assign the given attributes to the given resource.
19
- * @param accountId
20
- * @param userId
21
- * @param resourceAttributeAssignments - Array of resource (resourceType, resourceId) and attribute (key, value) pairs to upsert in the authorization MS.
22
- * e.g. [{ resourceType: 'board', resourceId: 123, key: 'board_kind', value: 'private' }]
23
- * @returns ResourceAttributeResponse - The affected (created and updated_ resource attributes assignments in the `attributes` field.
24
- */
25
- static upsertResourceAttributes(accountId, userId, resourceAttributeAssignments) {
26
- return __awaiter(this, void 0, void 0, function* () {
27
- const internalAuthToken = authorization_internal_service_1.AuthorizationInternalService.generateInternalAuthToken(accountId, userId);
28
- const attributionHeaders = (0, attributions_service_1.getAttributionsFromApi)();
29
- const response = yield (0, monday_fetch_1.fetch)(this.getResourceAttributesUrl(accountId), {
30
- method: 'POST',
31
- headers: Object.assign({ Authorization: internalAuthToken, 'Content-Type': 'application/json' }, attributionHeaders),
32
- timeout: authorization_internal_service_1.AuthorizationInternalService.getRequestTimeout(),
33
- body: JSON.stringify({ resourceAttributeAssignments }),
34
- }, authorization_internal_service_1.AuthorizationInternalService.getRequestFetchOptions());
35
- const responseBody = yield response.json();
36
- authorization_internal_service_1.AuthorizationInternalService.throwOnHttpErrorIfNeeded(response, 'upsertResourceAttributesSync');
37
- return { attributes: responseBody['attributes'] };
38
- });
39
- }
40
- /**
41
- * Delete resource attributes assignments synchronously, performing http call to the authorization MS to delete the given attributes from the given singular resource.
42
- * @param accountId
43
- * @param userId
44
- * @param resource - The resource (resourceType, resourceId) to delete the attributes for.
45
- * @param attributeKeys - Array of attribute keys to delete for the resource.
46
- * @returns ResourceAttributeResponse - The affected (deleted) resource attributes assignments in the `attributes` field.
47
- */
48
- static deleteResourceAttributes(accountId, userId, resource, attributeKeys) {
49
- return __awaiter(this, void 0, void 0, function* () {
50
- const internalAuthToken = authorization_internal_service_1.AuthorizationInternalService.generateInternalAuthToken(accountId, userId);
51
- const url = `${this.getResourceAttributesUrl(accountId)}/${resource.type}/${resource.id}`;
52
- const attributionHeaders = (0, attributions_service_1.getAttributionsFromApi)();
53
- const response = yield (0, monday_fetch_1.fetch)(url, {
54
- method: 'DELETE',
55
- headers: Object.assign({ Authorization: internalAuthToken, 'Content-Type': 'application/json' }, attributionHeaders),
56
- timeout: authorization_internal_service_1.AuthorizationInternalService.getRequestTimeout(),
57
- body: JSON.stringify({ keys: attributeKeys }),
58
- }, authorization_internal_service_1.AuthorizationInternalService.getRequestFetchOptions());
59
- const responseBody = yield response.json();
60
- authorization_internal_service_1.AuthorizationInternalService.throwOnHttpErrorIfNeeded(response, 'deleteResourceAttributesSync');
61
- return { attributes: responseBody['attributes'] };
62
- });
63
- }
64
- static getResourceAttributesUrl(accountId) {
65
- return `${process.env.AUTHORIZATION_URL}/attributes/${accountId}/resource`;
66
- }
67
- }
68
- exports.AuthorizationAttributesService = AuthorizationAttributesService;
@@ -1,11 +0,0 @@
1
- import { NextFunction } from "express";
2
- import { Action, BaseRequest, BaseResponse, ContextGetter, Resource, ResourceGetter } from "../types/general";
3
- export type TestPermittedAction = {
4
- accountId: number;
5
- userId: number;
6
- resources: Resource[];
7
- action: Action;
8
- };
9
- export declare const addTestPermittedAction: (accountId: number, userId: number, resources: Resource[], action: Action) => void;
10
- export declare const clearTestPermittedActions: () => void;
11
- export declare const getTestAuthorizationMiddleware: (action: Action, resourceGetter: ResourceGetter, contextGetter?: ContextGetter) => (request: BaseRequest, response: BaseResponse, next: NextFunction) => Promise<void>;
@@ -1,58 +0,0 @@
1
- "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
- Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.getTestAuthorizationMiddleware = exports.clearTestPermittedActions = exports.addTestPermittedAction = void 0;
13
- const authorization_middleware_1 = require("../authorization-middleware");
14
- const authorization_internal_service_1 = require("../authorization-internal-service");
15
- let testPermittedActions = [];
16
- const addTestPermittedAction = (accountId, userId, resources, action) => {
17
- testPermittedActions.push({ accountId, userId, resources, action });
18
- };
19
- exports.addTestPermittedAction = addTestPermittedAction;
20
- const clearTestPermittedActions = () => {
21
- testPermittedActions = [];
22
- };
23
- exports.clearTestPermittedActions = clearTestPermittedActions;
24
- const isActionAuthorized = (accountId, userId, resources, action) => {
25
- return {
26
- isAuthorized: resources.every(resource => {
27
- return testPermittedActions.some(combination => {
28
- return combination.accountId === accountId &&
29
- combination.userId === userId &&
30
- combination.action === action &&
31
- combination.resources.some(combinationResource => {
32
- return resources.some(resource => {
33
- return combinationResource.id === resource.id &&
34
- combinationResource.type === resource.type &&
35
- JSON.stringify(combinationResource.wrapperData) === JSON.stringify(resource.wrapperData);
36
- });
37
- });
38
- });
39
- })
40
- };
41
- };
42
- const getTestAuthorizationMiddleware = (action, resourceGetter, contextGetter) => {
43
- return function authorizationMiddleware(request, response, next) {
44
- return __awaiter(this, void 0, void 0, function* () {
45
- contextGetter || (contextGetter = authorization_middleware_1.defaultContextGetter);
46
- const { userId, accountId } = contextGetter(request);
47
- const resources = resourceGetter(request);
48
- const { isAuthorized } = isActionAuthorized(accountId, userId, resources, action);
49
- authorization_internal_service_1.AuthorizationInternalService.markAuthorized(request);
50
- if (!isAuthorized) {
51
- response.status(403).json({ message: 'Access denied' });
52
- return;
53
- }
54
- next();
55
- });
56
- };
57
- };
58
- exports.getTestAuthorizationMiddleware = getTestAuthorizationMiddleware;
@@ -1,10 +0,0 @@
1
- import { Resource } from './general';
2
- export interface ResourceAttributeAssignment {
3
- resourceType: Resource['type'];
4
- resourceId: Resource['id'];
5
- key: string;
6
- value: string;
7
- }
8
- export interface ResourceAttributeResponse {
9
- attributes: ResourceAttributeAssignment[];
10
- }
@@ -1,2 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });