@autofleet/zehut 1.7.0 → 1.7.2

package/lib/index.d.ts

@@ -10,10 +10,15 @@ declare const _default: {
         eagerLoadUserPermissions?: boolean;
         eagerLoadUserPermissionsLegacy?: boolean;
         customPermissionLoader?: import("./user/ApiUser").CustomPermissionLoader;
+        appId?: string;
+        clientSecret?: string;
     }) => (req: any, res: any, next: any) => Promise<any>;
     middlewareWithDecode: (options?: {
         eagerLoadUserPermissions?: boolean;
         eagerLoadUserPermissionsLegacy?: boolean;
+        appId?: string;
+        clientSecret?: string;
+        returnErrorIfNoToken?: boolean;
     }) => (req: any, res: any, next: any) => Promise<void>;
     eagerLoadPermissionsMiddleware: (req: any, res: any, next: any) => Promise<any>;
     getCurrentPayload: () => any;

package/lib/user/ApiUser.d.ts

@@ -13,6 +13,9 @@ export default class ApiUser {
     id: string | undefined;
     privatePermissions: UserPayload | undefined;
     privatePermissionsLegacy: any;
+    appPermission: {
+        [key: string]: any;
+    };
     emptyUser: boolean;
     constructor(id?: string);
     getUserPermissions(): Promise<UserPayload>;
@@ -24,5 +27,6 @@ export default class ApiUser {
     get permissions(): UserPayload | undefined;
     getUserPermissionsLegacy(): Promise<any>;
     get permissionsLegacy(): any;
+    getUserAppPermissions(appId: any): Promise<any>;
 }
 export {};

package/lib/user/ApiUser.js

@@ -20,6 +20,7 @@ class ApiUser {
     constructor(id) {
         this.id = id;
         this.emptyUser = !!id;
+        this.appPermission = {};
     }
     getUserPermissions() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -48,7 +49,7 @@ class ApiUser {
                 return cachedResult;
             }
             const data = yield customPermissionLoader(this.id);
-            userCache.set(this.id, data, data);
+            userCache.set(this.id, data);
             this.privatePermissions = data;
             return this.privatePermissions;
         });
@@ -93,5 +94,27 @@ class ApiUser {
         }
         return this.privatePermissionsLegacy;
     }
+    getUserAppPermissions(appId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.id) {
+                return;
+            }
+            const currentAppPermission = this.appPermission[appId];
+            if (currentAppPermission) {
+                return currentAppPermission;
+            }
+            const cachedResult = userCache.get(`${this.id}:${appId}`);
+            if (cachedResult) {
+                this.appPermission[appId] = cachedResult;
+                return cachedResult;
+            }
+            const { data } = yield services_1.IdentityNetwork.post(`/api/v1/apps/${appId}/get-user-payload`, {
+                userId: this.id,
+            });
+            userCache.set(this.id, data);
+            this.appPermission[appId] = data;
+            return this.appPermission[appId];
+        });
+    }
 }
 exports.default = ApiUser;

package/lib/user/index.d.ts

@@ -3,10 +3,15 @@ export declare const middleware: (options?: {
     eagerLoadUserPermissions?: boolean;
     eagerLoadUserPermissionsLegacy?: boolean;
     customPermissionLoader?: CustomPermissionLoader;
+    appId?: string;
+    clientSecret?: string;
 }) => (req: any, res: any, next: any) => Promise<any>;
 export declare const middlewareWithDecode: (options?: {
     eagerLoadUserPermissions?: boolean;
     eagerLoadUserPermissionsLegacy?: boolean;
+    appId?: string;
+    clientSecret?: string;
+    returnErrorIfNoToken?: boolean;
 }) => (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;

package/lib/user/index.js

@@ -18,6 +18,7 @@ const ApiUser_1 = __importDefault(require("./ApiUser"));
 const utils_1 = require("../utils");
 const tracer_1 = require("../tracer");
 exports.middleware = (options = {}) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+    const { eagerLoadUserPermissions, eagerLoadUserPermissionsLegacy, customPermissionLoader, appId, clientSecret, } = options;
     const userId = req.headers['x-af-user-id'];
     const trace = tracer_1.newTrace('userPayload');
     if (!userId) {
@@ -25,17 +26,21 @@ exports.middleware = (options = {}) => (req, res, next) => __awaiter(void 0, voi
         return next();
     }
     const userObject = new ApiUser_1.default(userId);
-    if (options.eagerLoadUserPermissions) {
-        if (options.customPermissionLoader) {
-            yield userObject.useCustomPermissionLoader(options.customPermissionLoader);
+    if (eagerLoadUserPermissions) {
+        if (customPermissionLoader) {
+            yield userObject.useCustomPermissionLoader(customPermissionLoader);
         }
         else {
             yield userObject.getUserPermissions();
         }
     }
-    if (options.eagerLoadUserPermissionsLegacy) {
+    if (eagerLoadUserPermissionsLegacy) {
         yield userObject.getUserPermissionsLegacy();
     }
+    if (appId && clientSecret) {
+        req.headers['x-autofleet-apps-secret'] = clientSecret;
+        yield userObject.getUserAppPermissions(appId);
+    }
     req.user = userObject;
     trace.context.set('userObject', userObject);
     // Added in order to support outbreak.
@@ -44,6 +49,7 @@ exports.middleware = (options = {}) => (req, res, next) => __awaiter(void 0, voi
 });
 exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
+    const { eagerLoadUserPermissions, eagerLoadUserPermissionsLegacy, appId, clientSecret, returnErrorIfNoToken, } = options;
     const trace = tracer_1.newTrace('userPayload');
     let decoded;
     if (req.headers.authorization) {
@@ -76,17 +82,28 @@ exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(v
             req.headers['X-AF-USER-ID'] = userId;
         }
         const userObject = new ApiUser_1.default(userId);
-        if (options.eagerLoadUserPermissions) {
+        if (eagerLoadUserPermissions) {
             yield userObject.getUserPermissions();
         }
-        if (options.eagerLoadUserPermissionsLegacy) {
+        if (eagerLoadUserPermissionsLegacy) {
             yield userObject.getUserPermissionsLegacy();
         }
+        if (appId && clientSecret) {
+            req.headers['x-autofleet-apps-secret'] = clientSecret;
+            yield userObject.getUserAppPermissions(appId);
+        }
         req.user = userObject;
         trace.context.set('userObject', userObject);
         // Added in order to support outbreak.
         req.headers['x-af-user-permissions'] = userObject;
     }
+    else if (returnErrorIfNoToken) {
+        res.status(401);
+        // eslint-disable-next-line consistent-return
+        return res.json({
+            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.7.0",
+  "version": "1.7.2",
   "description": "manage user's identity",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",