@flink-app/jwt-auth-plugin 0.5.3 → 0.6.1

package/dist/FlinkJwtAuthPlugin.d.ts

@@ -5,6 +5,7 @@ export interface JwtAuthPluginOptions {
     algo?: jwtSimple.TAlgorithm;
     getUser: (tokenData: any) => Promise<FlinkAuthUser>;
     passwordPolicy?: RegExp;
+    tokenTTL?: number;
     rolePermissions: {
         [role: string]: string[];
     };
@@ -37,4 +38,4 @@ export interface JwtAuthPlugin extends FlinkAuthPlugin {
 /**
  * Configures and creates authentication plugin.
  */
-export declare function jwtAuthPlugin({ secret, getUser, rolePermissions, algo, passwordPolicy, }: JwtAuthPluginOptions): JwtAuthPlugin;
+export declare function jwtAuthPlugin({ secret, getUser, rolePermissions, algo, passwordPolicy, tokenTTL, }: JwtAuthPluginOptions): JwtAuthPlugin;

package/dist/FlinkJwtAuthPlugin.js

@@ -65,7 +65,7 @@ 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;
+    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;
     return {
         authenticateRequest: function (req, permissions) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -77,7 +77,7 @@ function jwtAuthPlugin(_a) {
             });
         }); },
         createToken: function (payload, roles) {
-            return createToken(__assign(__assign({}, payload), { roles: roles }), { algo: algo, secret: secret });
+            return createToken(__assign(__assign({}, payload), { roles: roles }), { algo: algo, secret: secret, tokenTTL: tokenTTL });
         },
         createPasswordHashAndSalt: function (password) {
             return createPasswordHashAndSalt(password, passwordPolicy);
@@ -132,16 +132,19 @@ function getTokenFromReq(req) {
     return;
 }
 function createToken(payload, _a) {
-    var secret = _a.secret, algo = _a.algo;
+    var secret = _a.secret, algo = _a.algo, tokenTTL = _a.tokenTTL;
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_b) {
             if (!payload) {
                 throw new Error("Cannot create token - payload is missing");
             }
-            return [2 /*return*/, jwt_simple_1.default.encode(payload, secret, algo)];
+            return [2 /*return*/, jwt_simple_1.default.encode(__assign({ exp: _calculateExpiration(tokenTTL || 1000 * 60 * 60 * 24 * 365 * 100) }, payload), secret, algo)];
         });
     });
 }
+function _calculateExpiration(expiresInMs) {
+    return Math.floor((Date.now() + expiresInMs) / 1000);
+}
 function createPasswordHashAndSalt(password, passwordPolicy) {
     return __awaiter(this, void 0, void 0, function () {
         var salt, hash;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flink-app/jwt-auth-plugin",
-  "version": "0.5.3",
+  "version": "0.6.1",
   "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",
@@ -20,7 +20,7 @@
     "jwt-simple": "^0.5.6"
   },
   "devDependencies": {
-    "@flink-app/flink": "^0.5.0",
+    "@flink-app/flink": "^0.6.0",
     "@types/bcrypt": "^5.0.0",
     "@types/jasmine": "^3.7.1",
     "@types/node": "^15.6.2",
@@ -31,5 +31,5 @@
     "tsc-watch": "^4.2.9",
     "typescript": "^4.2.4"
   },
-  "gitHead": "c5e47bae95b9e157f77936d7b8996a2534c26a3f"
+  "gitHead": "86e5a311e8945c87f32d038a63658483076ffcff"
 }

package/src/FlinkJwtAuthPlugin.ts

@@ -19,6 +19,7 @@ export interface JwtAuthPluginOptions {
   algo?: jwtSimple.TAlgorithm;
   getUser: (tokenData: any) => Promise<FlinkAuthUser>;
   passwordPolicy?: RegExp;
+  tokenTTL? : number;
   rolePermissions: {
     [role: string]: string[];
   };
@@ -64,6 +65,7 @@ export function jwtAuthPlugin({
   rolePermissions,
   algo = "HS256",
   passwordPolicy = defaultPasswordPolicy,
+  tokenTTL = 1000 * 60 * 60 * 24 * 365 * 100, //Defaults to hundred year
 }: JwtAuthPluginOptions): JwtAuthPlugin {
   return {
     authenticateRequest: async (req, permissions) =>
@@ -73,7 +75,7 @@ export function jwtAuthPlugin({
         getUser,
       }),
     createToken: (payload, roles) =>
-      createToken({ ...payload, roles }, { algo, secret }),
+      createToken({ ...payload, roles }, { algo, secret, tokenTTL }),
     createPasswordHashAndSalt: (password: string) =>
       createPasswordHashAndSalt(password, passwordPolicy),
     validatePassword,
@@ -140,15 +142,20 @@ function getTokenFromReq(req: FlinkRequest) {
 
 async function createToken(
   payload: any,
-  { secret, algo }: Pick<JwtAuthPluginOptions, "algo" | "secret">
+  { secret, algo, tokenTTL }: Pick<JwtAuthPluginOptions, "algo" | "secret" | "tokenTTL" >
 ) {
   if (!payload) {
     throw new Error("Cannot create token - payload is missing");
   }
 
-  return jwtSimple.encode(payload, secret, algo);
+  return jwtSimple.encode({exp : _calculateExpiration(tokenTTL || 1000 * 60 * 60 * 24 * 365 * 100),  ...payload}, secret, algo);
 }
 
+function _calculateExpiration(expiresInMs : number) {
+    return Math.floor((Date.now() + expiresInMs) / 1000);
+}
+
+
 async function createPasswordHashAndSalt(
   password: string,
   passwordPolicy: RegExp