@autofleet/zehut 3.0.1 → 3.0.3

package/lib/index.d.ts

@@ -1,4 +1,5 @@
-import User, { middleware, eagerLoadPermissionsMiddleware, middlewareWithDecode, getDecodedBearer, appMiddleware } from './user';
+import * as outbreak from '@autofleet/outbreak';
+import User, { middleware, eagerLoadPermissionsMiddleware, middlewareWithDecode, getDecodedBearer, appMiddleware, createOrSetRabbitTrace } from './user';
 import { newTrace, traceTypes } from './tracer';
 import { checkFleetPermission, checkBusinessModelPermission, checkDemandSourcePermission, isUserExist, getUser } from './check-permission';
 import { UnauthorizedAccessError } from './errors';
@@ -7,7 +8,7 @@ declare const getCurrentPayload: () => any;
 declare const enableTracing: ({ outbreakOptions }?: {
     outbreakOptions?: {};
 }) => void;
-export { traceTypes, newTrace, enableTracing, User, middleware, middlewareWithDecode, eagerLoadPermissionsMiddleware, getCurrentPayload, getDecodedBearer, checkFleetPermission, checkBusinessModelPermission, checkDemandSourcePermission, isUserExist, getUser, getRefreshTokenSecret, getTokenSecret, UnauthorizedAccessError, appMiddleware, };
+export { traceTypes, newTrace, enableTracing, User, middleware, middlewareWithDecode, eagerLoadPermissionsMiddleware, getCurrentPayload, getDecodedBearer, checkFleetPermission, checkBusinessModelPermission, checkDemandSourcePermission, isUserExist, getUser, getRefreshTokenSecret, getTokenSecret, UnauthorizedAccessError, appMiddleware, createOrSetRabbitTrace, outbreak, };
 declare const _default: {
     traceTypes: {
         HTTP_REQUEST: string;
@@ -39,5 +40,7 @@ declare const _default: {
         appId: string;
         clientSecret: string;
     }) => (req: any, res: any, next: any) => Promise<void>;
+    createOrSetRabbitTrace: (trace: any, userId: any) => Promise<void>;
+    outbreak: typeof outbreak;
 };
 export default _default;

package/lib/index.js

@@ -22,12 +22,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
-const outbreak_1 = __importDefault(require("@autofleet/outbreak"));
+exports.outbreak = 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;
+const outbreak = __importStar(require("@autofleet/outbreak"));
+exports.outbreak = outbreak;
 const user_1 = __importStar(require("./user"));
 exports.User = user_1.default;
 Object.defineProperty(exports, "middleware", { enumerable: true, get: function () { return user_1.middleware; } });
@@ -35,6 +33,7 @@ Object.defineProperty(exports, "eagerLoadPermissionsMiddleware", { enumerable: t
 Object.defineProperty(exports, "middlewareWithDecode", { enumerable: true, get: function () { return user_1.middlewareWithDecode; } });
 Object.defineProperty(exports, "getDecodedBearer", { enumerable: true, get: function () { return user_1.getDecodedBearer; } });
 Object.defineProperty(exports, "appMiddleware", { enumerable: true, get: function () { return user_1.appMiddleware; } });
+Object.defineProperty(exports, "createOrSetRabbitTrace", { enumerable: true, get: function () { return user_1.createOrSetRabbitTrace; } });
 const tracer_1 = require("./tracer");
 Object.defineProperty(exports, "newTrace", { enumerable: true, get: function () { return tracer_1.newTrace; } });
 Object.defineProperty(exports, "traceTypes", { enumerable: true, get: function () { return tracer_1.traceTypes; } });
@@ -49,10 +48,11 @@ Object.defineProperty(exports, "UnauthorizedAccessError", { enumerable: true, ge
 const secret_getter_1 = require("./secret-getter");
 Object.defineProperty(exports, "getRefreshTokenSecret", { enumerable: true, get: function () { return secret_getter_1.getRefreshTokenSecret; } });
 Object.defineProperty(exports, "getTokenSecret", { enumerable: true, get: function () { return secret_getter_1.getTokenSecret; } });
+const headersTracer = outbreak.default;
 const getCurrentPayload = tracer_1.getCurrentTrace;
 exports.getCurrentPayload = getCurrentPayload;
 const enableTracing = ({ outbreakOptions = {} } = {}) => {
-    (0, outbreak_1.default)({
+    headersTracer({
         headersPrefix: 'x-af',
         ...outbreakOptions,
     });
@@ -75,4 +75,6 @@ exports.default = {
     getUser: check_permission_1.getUser,
     UnauthorizedAccessError: errors_1.UnauthorizedAccessError,
     appMiddleware: user_1.appMiddleware,
+    createOrSetRabbitTrace: user_1.createOrSetRabbitTrace,
+    outbreak,
 };

package/lib/user/index.d.ts

@@ -15,4 +15,5 @@ export declare const appMiddleware: (options: {
 }) => (req: any, res: any, next: any) => Promise<void>;
 export declare const eagerLoadPermissionsMiddleware: (req: any, res: any, next: any) => Promise<any>;
 export declare const getDecodedBearer: (req: any) => any;
+export declare const createOrSetRabbitTrace: (trace: any, userId: any) => Promise<void>;
 export default ApiUser;

package/lib/user/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDecodedBearer = exports.eagerLoadPermissionsMiddleware = exports.appMiddleware = exports.middlewareWithDecode = exports.middleware = void 0;
+exports.createOrSetRabbitTrace = exports.getDecodedBearer = exports.eagerLoadPermissionsMiddleware = exports.appMiddleware = exports.middlewareWithDecode = exports.middleware = void 0;
 const jsonwebtoken_1 = require("jsonwebtoken");
 const ApiUser_1 = __importStar(require("./ApiUser"));
 const tracer_1 = require("../tracer");
@@ -196,4 +196,14 @@ const getDecodedBearer = (req) => {
     return null;
 };
 exports.getDecodedBearer = getDecodedBearer;
+const createOrSetRabbitTrace = async (trace, userId) => {
+    const userObject = new ApiUser_1.default(userId);
+    await userObject.getUserPermissions();
+    if (!trace) {
+        // eslint-disable-next-line no-param-reassign
+        trace = (0, tracer_1.newTrace)(tracer_1.traceTypes.RABBIT);
+    }
+    trace.context.set('userObject', userObject);
+};
+exports.createOrSetRabbitTrace = createOrSetRabbitTrace;
 exports.default = ApiUser_1.default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/zehut",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "manage user's identity",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/Autofleet/zehut",
   "dependencies": {
     "@autofleet/network": "^1.4.2",
-    "@autofleet/outbreak": "0.2.1",
+    "@autofleet/outbreak": "^1.0.2",
     "axios": "^0.27.2",
     "express": "^4.18.1",
     "jsonwebtoken": "^8.5.1",
@@ -37,10 +37,10 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.5.0",
-    "@typescript-eslint/parser": "^6.5.0",
     "@types/jest": "^29.5.4",
     "@types/node": "^16.14.2",
+    "@typescript-eslint/eslint-plugin": "^6.5.0",
+    "@typescript-eslint/parser": "^6.5.0",
     "eslint": "^8.48.0",
     "eslint-config-airbnb-typescript": "^17.1.0",
     "eslint-plugin-import": "^2.28.1",