@flink-app/jwt-auth-plugin 0.12.1-alpha.4 → 0.12.1-alpha.41

package/dist/FlinkJwtAuthPlugin.d.ts

@@ -1,14 +1,57 @@
-import { FlinkAuthPlugin, FlinkAuthUser } from "@flink-app/flink";
+import { FlinkAuthPlugin, FlinkAuthUser, FlinkRequest } from "@flink-app/flink";
 import jwtSimple from "jwt-simple";
+/**
+ * Custom token extraction callback.
+ *
+ * Return values:
+ * - `string`: Token found, use this token
+ * - `null`: No token found, authentication should fail
+ * - `undefined`: Skip custom extraction, use default Bearer token extraction
+ */
+export type TokenExtractor = (req: FlinkRequest) => string | null | undefined;
+/**
+ * Custom permission validation callback.
+ *
+ * Called after getUser to validate if the user has required permissions.
+ * Useful for dynamic permissions stored in database.
+ *
+ * @param user - The authenticated user object returned from getUser
+ * @param routePermissions - Array of permissions required by the route
+ * @returns true if user has required permissions, false otherwise
+ */
+export type PermissionChecker = (user: FlinkAuthUser, routePermissions: string[]) => Promise<boolean> | boolean;
 export interface JwtAuthPluginOptions {
     secret: string;
     algo?: jwtSimple.TAlgorithm;
-    getUser: (tokenData: any) => Promise<FlinkAuthUser>;
+    getUser: (tokenData: any) => Promise<FlinkAuthUser | null | undefined>;
     passwordPolicy?: RegExp;
     tokenTTL?: number;
     rolePermissions: {
         [role: string]: string[];
     };
+    /**
+     * Optional custom token extraction callback.
+     *
+     * Allows conditional token extraction based on request properties (path, method, headers, etc.).
+     * Return `undefined` to fall back to default Bearer token extraction.
+     */
+    tokenExtractor?: TokenExtractor;
+    /**
+     * Optional custom permission checker for dynamic permissions.
+     *
+     * When provided, replaces static rolePermissions checking.
+     * Called after getUser with the full user object.
+     *
+     * Example:
+     * ```typescript
+     * checkPermissions: async (user, routePermissions) => {
+     *   return routePermissions.every(perm =>
+     *     user.permissions?.includes(perm)
+     *   );
+     * }
+     * ```
+     */
+    checkPermissions?: PermissionChecker;
 }
 export interface JwtAuthPlugin extends FlinkAuthPlugin {
     /**
@@ -38,4 +81,5 @@ export interface JwtAuthPlugin extends FlinkAuthPlugin {
 /**
  * Configures and creates authentication plugin.
  */
-export declare function jwtAuthPlugin({ secret, getUser, rolePermissions, algo, passwordPolicy, tokenTTL, }: JwtAuthPluginOptions): JwtAuthPlugin;
+export declare function jwtAuthPlugin({ secret, getUser, rolePermissions, algo, passwordPolicy, tokenTTL, //Defaults to hundred year
+tokenExtractor, checkPermissions, }: JwtAuthPluginOptions): JwtAuthPlugin;

package/dist/FlinkJwtAuthPlugin.js

@@ -65,7 +65,8 @@ var defaultPasswordPolicy = /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,}$/;
  */
 function jwtAuthPlugin(_a) {
     var _this = this;
-    var secret = _a.secret, getUser = _a.getUser, rolePermissions = _a.rolePermissions, _b = _a.algo, algo = _b === void 0 ? "HS256" : _b, _c = _a.passwordPolicy, passwordPolicy = _c === void 0 ? defaultPasswordPolicy : _c, _d = _a.tokenTTL, tokenTTL = _d === void 0 ? 1000 * 60 * 60 * 24 * 365 * 100 : _d;
+    var secret = _a.secret, getUser = _a.getUser, rolePermissions = _a.rolePermissions, _b = _a.algo, algo = _b === void 0 ? "HS256" : _b, _c = _a.passwordPolicy, passwordPolicy = _c === void 0 ? defaultPasswordPolicy : _c, _d = _a.tokenTTL, tokenTTL = _d === void 0 ? 1000 * 60 * 60 * 24 * 365 * 100 : _d, //Defaults to hundred year
+    tokenExtractor = _a.tokenExtractor, checkPermissions = _a.checkPermissions;
     return {
         authenticateRequest: function (req, permissions) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -73,41 +74,50 @@ function jwtAuthPlugin(_a) {
                         algo: algo,
                         secret: secret,
                         getUser: getUser,
+                        tokenExtractor: tokenExtractor,
+                        checkPermissions: checkPermissions,
                     })];
             });
         }); },
-        createToken: function (payload, roles) {
-            return createToken(__assign(__assign({}, payload), { roles: roles }), { algo: algo, secret: secret, tokenTTL: tokenTTL });
-        },
-        createPasswordHashAndSalt: function (password) {
-            return createPasswordHashAndSalt(password, passwordPolicy);
-        },
+        createToken: function (payload, roles) { return createToken(__assign(__assign({}, payload), { roles: roles }), { algo: algo, secret: secret, tokenTTL: tokenTTL }); },
+        createPasswordHashAndSalt: function (password) { return createPasswordHashAndSalt(password, passwordPolicy); },
         validatePassword: validatePassword,
     };
 }
 exports.jwtAuthPlugin = jwtAuthPlugin;
 function authenticateRequest(req_1, routePermissions_1, rolePermissions_1, _a) {
     return __awaiter(this, arguments, void 0, function (req, routePermissions, rolePermissions, _b) {
-        var token, decodedToken, permissionsArr, validPerms, user;
-        var secret = _b.secret, algo = _b.algo, getUser = _b.getUser;
+        var token, decodedToken, permissionsArr, validPerms, user, hasPermission;
+        var secret = _b.secret, algo = _b.algo, getUser = _b.getUser, tokenExtractor = _b.tokenExtractor, checkPermissions = _b.checkPermissions;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
-                    token = getTokenFromReq(req);
-                    if (!token) return [3 /*break*/, 2];
+                    if (tokenExtractor) {
+                        token = tokenExtractor(req);
+                        // If tokenExtractor returns undefined, fall back to default
+                        if (token === undefined) {
+                            token = getTokenFromReq(req);
+                        }
+                        // If it returns null, token stays null (no default fallback)
+                        // If it returns string, token is the string
+                    }
+                    else {
+                        // No custom extractor, use default
+                        token = getTokenFromReq(req);
+                    }
+                    if (!token) return [3 /*break*/, 4];
                     decodedToken = void 0;
                     try {
                         decodedToken = jwt_simple_1.default.decode(token, secret, false, algo);
                     }
                     catch (err) {
-                        flink_1.log.debug("Failed to decode token: ".concat(err));
+                        flink_1.log.debug("[JWT AUTH PLUGIN] Failed to decode token: ".concat(err));
                         decodedToken = null;
                     }
-                    if (!decodedToken) return [3 /*break*/, 2];
-                    permissionsArr = Array.isArray(routePermissions)
-                        ? routePermissions
-                        : [routePermissions];
-                    if (permissionsArr && permissionsArr.length > 0) {
+                    if (!decodedToken) return [3 /*break*/, 4];
+                    permissionsArr = Array.isArray(routePermissions) ? routePermissions : [routePermissions];
+                    // Static permission check - only if custom checker NOT provided
+                    if (!checkPermissions && permissionsArr && permissionsArr.length > 0) {
                         validPerms = (0, PermissionValidator_1.hasValidPermissions)(decodedToken.roles || [], rolePermissions, permissionsArr);
                         if (!validPerms) {
                             return [2 /*return*/, false];
@@ -116,9 +126,23 @@ function authenticateRequest(req_1, routePermissions_1, rolePermissions_1, _a) {
                     return [4 /*yield*/, getUser(decodedToken)];
                 case 1:
                     user = _c.sent();
+                    if (!user) {
+                        flink_1.log.debug("[JWT AUTH PLUGIN] User not returned from getUser callback");
+                        return [2 /*return*/, false];
+                    }
+                    if (!(checkPermissions && permissionsArr && permissionsArr.length > 0)) return [3 /*break*/, 3];
+                    return [4 /*yield*/, checkPermissions(user, permissionsArr)];
+                case 2:
+                    hasPermission = _c.sent();
+                    if (!hasPermission) {
+                        flink_1.log.debug("[JWT AUTH PLUGIN] Custom permission check failed");
+                        return [2 /*return*/, false];
+                    }
+                    _c.label = 3;
+                case 3:
                     req.user = user;
                     return [2 /*return*/, true];
-                case 2: return [2 /*return*/, false];
+                case 4: return [2 /*return*/, false];
             }
         });
     });

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@flink-app/jwt-auth-plugin",
-    "version": "0.12.1-alpha.4",
+    "version": "0.12.1-alpha.41",
     "description": "Flink plugin for JWT auth",
     "scripts": {
         "test": "node --preserve-symlinks -r ts-node/register -- node_modules/jasmine/bin/jasmine --config=./spec/support/jasmine.json",
         "test:watch": "nodemon --ext ts --exec 'jasmine-ts  --config=./spec/support/jasmine.json'",
-        "prepublish": "tsc --project tsconfig.dist.json",
+        "prepare": "tsc --project tsconfig.dist.json",
         "watch": "tsc-watch --project tsconfig.dist.json"
     },
     "author": "joel@frost.se",
@@ -20,7 +20,7 @@
         "jwt-simple": "^0.5.6"
     },
     "devDependencies": {
-        "@flink-app/flink": "^0.12.1-alpha.4",
+        "@flink-app/flink": "^0.12.1-alpha.40",
         "@types/bcrypt": "^5.0.0",
         "@types/jasmine": "^3.7.1",
         "@types/node": "22.13.10",
@@ -31,5 +31,5 @@
         "tsc-watch": "^4.2.9",
         "typescript": "5.4.5"
     },
-    "gitHead": "8f06a4ab98e7179322d36546756d4305fd196f5a"
+    "gitHead": "76b54ee31f2c10c8c8f18af91facf5322b14ebf5"
 }