@autofleet/zehut 1.7.3-beta3 → 1.7.3-beta5

package/lib/index.d.ts

@@ -10,14 +10,10 @@ 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>;

package/lib/user/ApiUser.d.ts

@@ -27,6 +27,6 @@ export default class ApiUser {
     get permissions(): UserPayload | undefined;
     getUserPermissionsLegacy(): Promise<any>;
     get permissionsLegacy(): any;
-    getUserAppPermissions(appId: any): Promise<any>;
+    getUserAppPermissions(appId: any, clientSecret: any): Promise<any>;
 }
 export {};

package/lib/user/ApiUser.js

@@ -94,10 +94,10 @@ class ApiUser {
         }
         return this.privatePermissionsLegacy;
     }
-    getUserAppPermissions(appId) {
+    getUserAppPermissions(appId, clientSecret) {
         return __awaiter(this, void 0, void 0, function* () {
             console.log('getUserAppPermissions1', appId, this.id);
-            if (!this.id || appId) {
+            if (!this.id || !appId || !clientSecret) {
                 return;
             }
             const currentAppPermission = this.appPermission[appId];
@@ -113,6 +113,10 @@ class ApiUser {
             }
             const { data } = yield services_1.AutofleetApiNetwork.post(`/api/v1/apps/${appId}/get-user-payload`, {
                 userId: this.id,
+            }, {
+                headers: {
+                    'x-autofleet-apps-secret': clientSecret,
+                },
             });
             console.log('getUserAppPermissions4', data);
             userCache.set(this.id, data);

package/lib/user/index.d.ts

@@ -3,14 +3,10 @@ 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 appMiddleware: (options: {

package/lib/user/index.js

@@ -18,7 +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 { eagerLoadUserPermissions, eagerLoadUserPermissionsLegacy, customPermissionLoader, } = options;
     const userId = req.headers['x-af-user-id'];
     const trace = tracer_1.newTrace('userPayload');
     if (!userId) {
@@ -37,10 +37,6 @@ exports.middleware = (options = {}) => (req, res, next) => __awaiter(void 0, voi
     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.
@@ -49,7 +45,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 { eagerLoadUserPermissions, eagerLoadUserPermissionsLegacy, returnErrorIfNoToken, } = options;
     const trace = tracer_1.newTrace('userPayload');
     let decoded;
     if (req.headers.authorization) {
@@ -88,10 +84,6 @@ exports.middlewareWithDecode = (options = {}) => (req, res, next) => __awaiter(v
         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.
@@ -139,9 +131,7 @@ exports.appMiddleware = (options) => (req, res, next) => __awaiter(void 0, void
             errors: ['Server error while parsing token'],
         });
     }
-    console.log('decoded', decoded);
     const userId = decoded === null || decoded === void 0 ? void 0 : decoded.userId;
-    console.log('decoded2', userId, decoded);
     if (userId) {
         req.headers['X-AF-USER-ID'] = userId;
     }
@@ -149,7 +139,7 @@ exports.appMiddleware = (options) => (req, res, next) => __awaiter(void 0, void
     if (appId && clientSecret) {
         req.headers['x-autofleet-apps-secret'] = clientSecret;
         // Won't work until we find a better solution for identity ms
-        yield userObject.getUserAppPermissions(appId);
+        yield userObject.getUserAppPermissions(appId, clientSecret);
     }
     req.user = userObject;
     trace.context.set('userObject', userObject);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/zehut",
-  "version": "1.7.3-beta3",
+  "version": "1.7.3-beta5",
   "description": "manage user's identity",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",