@autofleet/zehut 1.7.1 → 1.7.3-alpha

package/lib/index.d.ts

@@ -16,6 +16,9 @@ declare const _default: {
     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/secret-getter.d.ts

@@ -1,2 +1,3 @@
+export declare const getAppSecret: (appId: any) => Promise<any>;
 export declare const getRefreshTokenSecret: (token?: any) => string;
 export declare const getTokenSecret: (token?: any) => string;

package/lib/secret-getter.js

@@ -1,11 +1,40 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTokenSecret = exports.getRefreshTokenSecret = void 0;
+exports.getTokenSecret = exports.getRefreshTokenSecret = exports.getAppSecret = void 0;
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const moment_1 = __importDefault(require("moment"));
+const identityNetwork = __importStar(require("./services"));
 const { DEPRECATED_JWT_SECRET, JWT_NEW_SECRET, DEPRECATED_REFRESH_JWT_SECRET, REFRESH_JWT_SECRET, DEPRECATION_UNIX_TIMESTAMP, } = process.env;
 const getRelevantSecret = (token, deprecatedSecret, newSecret) => {
     const deprecationTime = moment_1.default(parseInt(DEPRECATION_UNIX_TIMESTAMP, 10) * 1000);
@@ -24,5 +53,9 @@ const getRelevantSecret = (token, deprecatedSecret, newSecret) => {
         return newSecret;
     }
 };
+exports.getAppSecret = (appId) => __awaiter(void 0, void 0, void 0, function* () {
+    const app = yield identityNetwork.getAppSecret(appId);
+    return app.appSecret;
+});
 exports.getRefreshTokenSecret = (token) => getRelevantSecret(token, DEPRECATED_REFRESH_JWT_SECRET, REFRESH_JWT_SECRET);
 exports.getTokenSecret = (token) => getRelevantSecret(token, DEPRECATED_JWT_SECRET, JWT_NEW_SECRET);

package/lib/services.d.ts

@@ -1 +1,2 @@
 export declare const IdentityNetwork: any;
+export declare const getAppSecret: (appId: any) => Promise<any>;

package/lib/services.js

@@ -1,9 +1,18 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IdentityNetwork = void 0;
+exports.getAppSecret = exports.IdentityNetwork = void 0;
 const network_1 = __importDefault(require("@autofleet/network"));
 const CACHE_LIFETIME_IN_SEC = 10;
 // eslint-disable-next-line import/prefer-default-export
@@ -15,3 +24,7 @@ exports.IdentityNetwork = new network_1.default({
         maxAge: CACHE_LIFETIME_IN_SEC * 1000,
     } : undefined,
 });
+exports.getAppSecret = (appId) => __awaiter(void 0, void 0, void 0, function* () {
+    const { data } = yield exports.IdentityNetwork.get(`/api/v1/apps/${appId}`);
+    return data;
+});

package/lib/user/index.d.ts

@@ -9,6 +9,9 @@ export declare const middleware: (options?: {
 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

@@ -49,11 +49,17 @@ 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) {
         try {
-            decoded = utils_1.decodeBearer(req.headers.authorization);
+            if (appId) {
+                decoded = yield utils_1.decodeAppBearer(req.headers.authorization, appId);
+            }
+            else {
+                decoded = utils_1.decodeBearer(req.headers.authorization);
+            }
         }
         catch (e) {
             if (e instanceof jsonwebtoken_1.TokenExpiredError) {
@@ -81,17 +87,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/lib/utils.d.ts

@@ -1,4 +1,5 @@
 export declare const getAuthFromBearer: (bearer: string) => string;
+export declare const decodeAppBearer: (bearer: string, appId: string) => Promise<any>;
 export declare const decodeBearer: (bearer: string) => any;
 export declare const parsePermissions: (contextId: any, decodedToken: any) => any;
 export declare const getEntitiesFromContext: (contextId: string, decodedToken: any) => any;

package/lib/utils.js

@@ -18,8 +18,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getContextAttributes = exports.getEntitiesFromContext = exports.parsePermissions = exports.decodeBearer = exports.getAuthFromBearer = void 0;
+exports.getContextAttributes = exports.getEntitiesFromContext = exports.parsePermissions = exports.decodeBearer = exports.decodeAppBearer = exports.getAuthFromBearer = void 0;
 /* eslint-disable prefer-destructuring */
 const jwt = __importStar(require("jsonwebtoken"));
 const secret_getter_1 = require("./secret-getter");
@@ -30,6 +39,12 @@ const CONTEXT_MAP_PROPS = {
     demand: 'demandSources',
 };
 exports.getAuthFromBearer = (bearer) => bearer.replace('Bearer ', '');
+exports.decodeAppBearer = (bearer, appId) => __awaiter(void 0, void 0, void 0, function* () {
+    const token = exports.getAuthFromBearer(bearer);
+    const secret = yield secret_getter_1.getAppSecret(appId);
+    const decoded = jwt.verify(token, secret);
+    return decoded;
+});
 exports.decodeBearer = (bearer) => {
     const token = bearer.replace('Bearer ', '');
     const decoded = jwt.verify(token, secret_getter_1.getTokenSecret(token));

package/package.json

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