@autofleet/zehut 1.8.0-beta12 → 1.8.0-beta2

package/lib/check-permission.d.ts

@@ -1,6 +1,6 @@
 import ApiUser from './user/ApiUser';
 export declare const getUser: () => ApiUser | undefined;
-export declare const isUserExist: () => string;
+export declare const isUserExist: () => boolean;
 export declare const checkFleetPermission: (fleetId: any) => boolean;
 export declare const checkBusinessModelPermission: (businessModelId: any) => boolean;
 export declare const checkDemandSourcePermission: (demandSourceId: any) => boolean;

package/lib/check-permission.js

@@ -3,27 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkDemandSourcePermission = exports.checkBusinessModelPermission = exports.checkFleetPermission = exports.isUserExist = exports.getUser = void 0;
 const tracer_1 = require("./tracer");
 exports.getUser = () => { var _a, _b; return (_b = (_a = tracer_1.getCurrentTrace()) === null || _a === void 0 ? void 0 : _a.context) === null || _b === void 0 ? void 0 : _b.get('userObject'); };
-exports.isUserExist = () => {
-    const u = exports.getUser();
-    return u && u.id;
-};
+exports.isUserExist = () => !!exports.getUser();
 exports.checkFleetPermission = (fleetId) => {
     if (exports.isUserExist()) {
-        const user = exports.getUser();
+        const { context } = tracer_1.getCurrentTrace();
+        const user = context === null || context === void 0 ? void 0 : context.get('userObject');
         return !user || Object.keys(user.permissions.fleets).includes(fleetId);
     }
     return true;
 };
 exports.checkBusinessModelPermission = (businessModelId) => {
     if (exports.isUserExist()) {
-        const user = exports.getUser();
+        const { context } = tracer_1.getCurrentTrace();
+        const user = context === null || context === void 0 ? void 0 : context.get('userObject');
         return !user || Object.keys(user.permissions.businessModels).includes(businessModelId);
     }
     return true;
 };
 exports.checkDemandSourcePermission = (demandSourceId) => {
     if (exports.isUserExist()) {
-        const user = exports.getUser();
+        const { context } = tracer_1.getCurrentTrace();
+        const user = context === null || context === void 0 ? void 0 : context.get('userObject');
         return !user || Object.keys(user.permissions.demandSources).includes(demandSourceId);
     }
     return true;

package/lib/index.d.ts

@@ -25,7 +25,7 @@ declare const _default: {
     checkFleetPermission: (fleetId: any) => boolean;
     checkBusinessModelPermission: (businessModelId: any) => boolean;
     checkDemandSourcePermission: (demandSourceId: any) => boolean;
-    isUserExist: () => string;
+    isUserExist: () => boolean;
     getUser: () => User;
     UnauthorizedAccessError: typeof UnauthorizedAccessError;
     appMiddleware: (options: {

package/lib/index.js

@@ -18,12 +18,9 @@ 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 = void 0;
-const outbreak_1 = __importDefault(require("@autofleet/outbreak"));
+const outbreak_1 = require("@autofleet/outbreak");
 const user_1 = __importStar(require("./user"));
 exports.User = user_1.default;
 Object.defineProperty(exports, "middleware", { enumerable: true, get: function () { return user_1.middleware; } });
@@ -46,7 +43,7 @@ Object.defineProperty(exports, "getTokenSecret", { enumerable: true, get: functi
 const getCurrentPayload = tracer_1.getCurrentTrace;
 exports.getCurrentPayload = getCurrentPayload;
 const enableTracing = ({ outbreakOptions = {} } = {}) => {
-    outbreak_1.default(Object.assign({ headersPrefix: 'x-af' }, outbreakOptions));
+    outbreak_1.headersTracer(Object.assign({ headersPrefix: 'x-af' }, outbreakOptions));
     tracer_1.enable();
 };
 exports.enableTracing = enableTracing;

package/lib/user/index.js

@@ -38,6 +38,7 @@ exports.middleware = (options = {}) => (req, res, next) => __awaiter(void 0, voi
     const userId = req.headers['x-af-user-id'];
     const trace = tracer_1.newTrace('userPayload');
     if (!userId) {
+        trace.context.set('userObject', {});
         return next();
     }
     const elevatedPermissionsFromHeader = req.headers[ApiUser_1.ELEVATED_PERMISSIONS_HEADER] && req.headers[ApiUser_1.ELEVATED_PERMISSIONS_HEADER].length > 0
@@ -114,6 +115,7 @@ exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(v
             errors: ['No token provided'],
         });
     }
+    trace.context.set('userObject', {});
     // eslint-disable-next-line consistent-return
     return next();
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/zehut",
-  "version": "1.8.0-beta12",
+  "version": "1.8.0-beta2",
   "description": "manage user's identity",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -28,7 +28,7 @@
   "homepage": "https://github.com/Autofleet/zehut",
   "dependencies": {
     "@autofleet/network": "^1.4.2",
-    "@autofleet/outbreak": "^0.2.0-beta-2",
+    "@autofleet/outbreak": "^0.1.0-beta-2",
     "@types/jest": "^22.0.0",
     "axios": "^0.27.2",
     "express": "^4.18.1",