@autofleet/zehut 3.0.1-beta1 → 3.0.1-beta2

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.
Files changed (5) hide show
  1. package/lib/index.d.ts +3 -3
  2. package/lib/index.js +3 -3
  3. package/lib/user/index.d.ts +1 -1
  4. package/lib/user/index.js +6 -3
  5. package/package.json +1 -1
package/lib/index.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import * as oubtreak from '@autofleet/outbreak';
2
- import User, { middleware, eagerLoadPermissionsMiddleware, middlewareWithDecode, getDecodedBearer, appMiddleware, setRabbitTrace } from './user';
2
+ import User, { middleware, eagerLoadPermissionsMiddleware, middlewareWithDecode, getDecodedBearer, appMiddleware, createOrSetRabbitTrace } from './user';
3
3
  import { newTrace, traceTypes } from './tracer';
4
4
  import { checkFleetPermission, checkBusinessModelPermission, checkDemandSourcePermission, isUserExist, getUser } from './check-permission';
5
5
  import { UnauthorizedAccessError } from './errors';
@@ -8,7 +8,7 @@ declare const getCurrentPayload: () => any;
8
8
  declare const enableTracing: ({ outbreakOptions }?: {
9
9
  outbreakOptions?: {};
10
10
  }) => void;
11
- export { traceTypes, newTrace, enableTracing, User, middleware, middlewareWithDecode, eagerLoadPermissionsMiddleware, getCurrentPayload, getDecodedBearer, checkFleetPermission, checkBusinessModelPermission, checkDemandSourcePermission, isUserExist, getUser, getRefreshTokenSecret, getTokenSecret, UnauthorizedAccessError, appMiddleware, setRabbitTrace, oubtreak, };
11
+ export { traceTypes, newTrace, enableTracing, User, middleware, middlewareWithDecode, eagerLoadPermissionsMiddleware, getCurrentPayload, getDecodedBearer, checkFleetPermission, checkBusinessModelPermission, checkDemandSourcePermission, isUserExist, getUser, getRefreshTokenSecret, getTokenSecret, UnauthorizedAccessError, appMiddleware, createOrSetRabbitTrace, oubtreak, };
12
12
  declare const _default: {
13
13
  traceTypes: {
14
14
  HTTP_REQUEST: string;
@@ -40,7 +40,7 @@ declare const _default: {
40
40
  appId: string;
41
41
  clientSecret: string;
42
42
  }) => (req: any, res: any, next: any) => Promise<void>;
43
- setRabbitTrace: (userId: any) => Promise<void>;
43
+ createOrSetRabbitTrace: (trace: any, userId: any) => Promise<void>;
44
44
  oubtreak: typeof oubtreak;
45
45
  };
46
46
  export default _default;
package/lib/index.js CHANGED
@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
19
19
  return result;
20
20
  };
21
21
  Object.defineProperty(exports, "__esModule", { value: true });
22
- exports.oubtreak = exports.setRabbitTrace = exports.appMiddleware = exports.UnauthorizedAccessError = exports.getTokenSecret = exports.getRefreshTokenSecret = exports.getUser = exports.isUserExist = exports.checkDemandSourcePermission = exports.checkBusinessModelPermission = exports.checkFleetPermission = exports.getDecodedBearer = exports.getCurrentPayload = exports.eagerLoadPermissionsMiddleware = exports.middlewareWithDecode = exports.middleware = exports.User = exports.enableTracing = exports.newTrace = exports.traceTypes = void 0;
22
+ exports.oubtreak = exports.createOrSetRabbitTrace = exports.appMiddleware = exports.UnauthorizedAccessError = exports.getTokenSecret = exports.getRefreshTokenSecret = exports.getUser = exports.isUserExist = exports.checkDemandSourcePermission = exports.checkBusinessModelPermission = exports.checkFleetPermission = exports.getDecodedBearer = exports.getCurrentPayload = exports.eagerLoadPermissionsMiddleware = exports.middlewareWithDecode = exports.middleware = exports.User = exports.enableTracing = exports.newTrace = exports.traceTypes = void 0;
23
23
  const oubtreak = __importStar(require("@autofleet/outbreak"));
24
24
  exports.oubtreak = oubtreak;
25
25
  const user_1 = __importStar(require("./user"));
@@ -29,7 +29,7 @@ Object.defineProperty(exports, "eagerLoadPermissionsMiddleware", { enumerable: t
29
29
  Object.defineProperty(exports, "middlewareWithDecode", { enumerable: true, get: function () { return user_1.middlewareWithDecode; } });
30
30
  Object.defineProperty(exports, "getDecodedBearer", { enumerable: true, get: function () { return user_1.getDecodedBearer; } });
31
31
  Object.defineProperty(exports, "appMiddleware", { enumerable: true, get: function () { return user_1.appMiddleware; } });
32
- Object.defineProperty(exports, "setRabbitTrace", { enumerable: true, get: function () { return user_1.setRabbitTrace; } });
32
+ Object.defineProperty(exports, "createOrSetRabbitTrace", { enumerable: true, get: function () { return user_1.createOrSetRabbitTrace; } });
33
33
  const tracer_1 = require("./tracer");
34
34
  Object.defineProperty(exports, "newTrace", { enumerable: true, get: function () { return tracer_1.newTrace; } });
35
35
  Object.defineProperty(exports, "traceTypes", { enumerable: true, get: function () { return tracer_1.traceTypes; } });
@@ -71,6 +71,6 @@ exports.default = {
71
71
  getUser: check_permission_1.getUser,
72
72
  UnauthorizedAccessError: errors_1.UnauthorizedAccessError,
73
73
  appMiddleware: user_1.appMiddleware,
74
- setRabbitTrace: user_1.setRabbitTrace,
74
+ createOrSetRabbitTrace: user_1.createOrSetRabbitTrace,
75
75
  oubtreak,
76
76
  };
package/lib/user/index.d.ts CHANGED
@@ -15,5 +15,5 @@ export declare const appMiddleware: (options: {
15
15
  }) => (req: any, res: any, next: any) => Promise<void>;
16
16
  export declare const eagerLoadPermissionsMiddleware: (req: any, res: any, next: any) => Promise<any>;
17
17
  export declare const getDecodedBearer: (req: any) => any;
18
- export declare const setRabbitTrace: (userId: any) => Promise<void>;
18
+ export declare const createOrSetRabbitTrace: (trace: any, userId: any) => Promise<void>;
19
19
  export default ApiUser;
package/lib/user/index.js CHANGED
@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
22
22
  return (mod && mod.__esModule) ? mod : { "default": mod };
23
23
  };
24
24
  Object.defineProperty(exports, "__esModule", { value: true });
25
- exports.setRabbitTrace = exports.getDecodedBearer = exports.eagerLoadPermissionsMiddleware = exports.appMiddleware = exports.middlewareWithDecode = exports.middleware = void 0;
25
+ exports.createOrSetRabbitTrace = exports.getDecodedBearer = exports.eagerLoadPermissionsMiddleware = exports.appMiddleware = exports.middlewareWithDecode = exports.middleware = void 0;
26
26
  const jsonwebtoken_1 = require("jsonwebtoken");
27
27
  const ApiUser_1 = __importStar(require("./ApiUser"));
28
28
  const tracer_1 = require("../tracer");
@@ -187,10 +187,13 @@ exports.getDecodedBearer = (req) => {
187
187
  }
188
188
  return null;
189
189
  };
190
- exports.setRabbitTrace = async (userId) => {
190
+ exports.createOrSetRabbitTrace = async (trace, userId) => {
191
191
  const userObject = new ApiUser_1.default(userId);
192
192
  await userObject.getUserPermissions();
193
- const trace = tracer_1.newTrace(tracer_1.traceTypes.RABBIT);
193
+ if (!trace) {
194
+ // eslint-disable-next-line no-param-reassign
195
+ trace = tracer_1.newTrace(tracer_1.traceTypes.RABBIT);
196
+ }
194
197
  trace.context.set('userObject', userObject);
195
198
  };
196
199
  exports.default = ApiUser_1.default;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@autofleet/zehut",
3
- "version": "3.0.1-beta1",
3
+ "version": "3.0.1-beta2",
4
4
  "description": "manage user's identity",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",