@flink-app/generic-auth-plugin 0.6.1-alpha.0 → 0.6.1

package/.flink/generatedHandlers.ts

@@ -1,4 +1,4 @@
-// Generated Sat May 13 2023 14:44:46 GMT+0200 (Central European Summer Time)
+// Generated Mon May 22 2023 15:57:15 GMT+0200 (Central European Summer Time)
 import { autoRegisteredHandlers, HttpMethod } from "@flink-app/flink";
 import * as UserCreate_0 from "../src/handlers/UserCreate";
 import * as UserLogin_0 from "../src/handlers/UserLogin";

package/.flink/generatedJobs.ts

@@ -1,4 +1,4 @@
-// Generated Sat May 13 2023 14:44:46 GMT+0200 (Central European Summer Time)
+// Generated Mon May 22 2023 15:57:15 GMT+0200 (Central European Summer Time)
 import { autoRegisteredJobs } from "@flink-app/flink";
 export const jobs = [];
 autoRegisteredJobs.push(...jobs);

package/.flink/generatedRepos.ts

@@ -1,4 +1,4 @@
-// Generated Sat May 13 2023 14:44:46 GMT+0200 (Central European Summer Time)
+// Generated Mon May 22 2023 15:57:14 GMT+0200 (Central European Summer Time)
   import { autoRegisteredRepos } from "@flink-app/flink";
   export const repos = [];
   autoRegisteredRepos.push(...repos);

package/.flink/schemas/schemas.ts

@@ -30,7 +30,7 @@ import { PutManagementUserRolesByUseridRes } from "../../src/schemas/Management/
 import { PutManagementUserUsernameByUseridReq } from "../../src/schemas/Management/PutUserUsernameByUseridReq";
 import { PutManagementUserUsernameByUseridRes } from "../../src/schemas/Management/PutUserUsernameByUseridRes";
 
-// Generated Sat May 13 2023 14:44:47 GMT+0200 (Central European Summer Time)
+// Generated Mon May 22 2023 15:57:18 GMT+0200 (Central European Summer Time)
 export interface UserCreate_7_ReqSchema extends UserCreateReq {}
 
 export interface UserCreate_7_ResSchema extends UserCreateRes {}

package/.flink/start.ts

@@ -1,4 +1,4 @@
-// Generated Sat May 13 2023 14:44:46 GMT+0200 (Central European Summer Time)
+// Generated Mon May 22 2023 15:57:15 GMT+0200 (Central European Summer Time)
 import "./generatedHandlers";
 import "./generatedRepos";
 import "./generatedJobs";

package/dist/.flink/generatedHandlers.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handlers = void 0;
-// Generated Sat May 13 2023 14:44:46 GMT+0200 (Central European Summer Time)
+// Generated Mon May 22 2023 15:57:15 GMT+0200 (Central European Summer Time)
 var flink_1 = require("@flink-app/flink");
 exports.handlers = [];
 flink_1.autoRegisteredHandlers.push.apply(flink_1.autoRegisteredHandlers, exports.handlers);

package/dist/.flink/generatedJobs.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jobs = void 0;
-// Generated Sat May 13 2023 14:44:46 GMT+0200 (Central European Summer Time)
+// Generated Mon May 22 2023 15:57:15 GMT+0200 (Central European Summer Time)
 var flink_1 = require("@flink-app/flink");
 exports.jobs = [];
 flink_1.autoRegisteredJobs.push.apply(flink_1.autoRegisteredJobs, exports.jobs);

package/dist/.flink/generatedRepos.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.repos = void 0;
-// Generated Sat May 13 2023 14:44:46 GMT+0200 (Central European Summer Time)
+// Generated Mon May 22 2023 15:57:14 GMT+0200 (Central European Summer Time)
 var flink_1 = require("@flink-app/flink");
 exports.repos = [];
 flink_1.autoRegisteredRepos.push.apply(flink_1.autoRegisteredRepos, exports.repos);

package/dist/.flink/start.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// Generated Sat May 13 2023 14:44:46 GMT+0200 (Central European Summer Time)
+// Generated Mon May 22 2023 15:57:15 GMT+0200 (Central European Summer Time)
 require("./generatedHandlers");
 require("./generatedRepos");
 require("./generatedJobs");

package/dist/src/coreFunctions.d.ts

@@ -10,7 +10,7 @@ import { UserPasswordResetCompleteRes } from "./schemas/UserPasswordResetComplet
 import { GenericAuthsmsOptions } from "./genericAuthPluginOptions";
 export declare function getJtwTokenPlugin(secret: string, rolePermissions?: {
     [role: string]: string[];
-}, passwordPolicy?: RegExp): JwtAuthPlugin;
+}, passwordPolicy?: RegExp, tokenTTL?: number): JwtAuthPlugin;
 export declare function createUser(repo: FlinkRepo<any, User>, auth: JwtAuthPlugin, username: string, password: string, authentificationMethod: "password" | "sms", roles: string[], profile: UserProfile, createPasswordHashAndSaltMethod?: {
     (password: string): Promise<{
         hash: string;

package/dist/src/coreFunctions.js

@@ -42,7 +42,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.passwordResetComplete = exports.passwordResetStart = exports.changePassword = exports.loginUser = exports.loginByToken = exports.createUser = exports.getJtwTokenPlugin = void 0;
 var jwt_auth_plugin_1 = require("@flink-app/jwt-auth-plugin");
 var jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
-function getJtwTokenPlugin(secret, rolePermissions, passwordPolicy) {
+function getJtwTokenPlugin(secret, rolePermissions, passwordPolicy, tokenTTL) {
     if (passwordPolicy == undefined) {
         passwordPolicy = /.{1,}$/;
     }
@@ -66,6 +66,7 @@ function getJtwTokenPlugin(secret, rolePermissions, passwordPolicy) {
         },
         passwordPolicy: passwordPolicy,
         rolePermissions: rolePermissions,
+        tokenTTL: tokenTTL
     });
 }
 exports.getJtwTokenPlugin = getJtwTokenPlugin;

package/dist/src/handlers/UserPasswordResetStart.js

@@ -45,37 +45,33 @@ var handlebars_1 = __importDefault(require("handlebars"));
 var postPasswordResetStartHandler = function (_a) {
     var ctx = _a.ctx, req = _a.req, origin = _a.origin;
     return __awaiter(void 0, void 0, void 0, function () {
-        var pluginName, genericAuthPlugin, repo, _b, jwtSecret, numberOfDigits, lifeTime, resp, emailCtx, emailSettings, subject, html, email;
+        var pluginName, repo, _b, jwtSecret, numberOfDigits, lifeTime, resp, emailSettings, emailCtx, subject, html, email;
         var _c;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
                     pluginName = origin || "genericAuthPlugin";
-                    genericAuthPlugin = ctx.plugins[pluginName];
-                    repo = ctx.repos[genericAuthPlugin.repoName];
+                    repo = ctx.repos[ctx.plugins[pluginName].repoName];
                     if (((_c = ctx.plugins.emailPlugin) === null || _c === void 0 ? void 0 : _c.client) == null) {
                         return [2 /*return*/, flink_1.internalServerError("Email plugin have to be initialized to use /password/reset")];
                     }
-                    if (!genericAuthPlugin.passwordResetSettings) {
+                    if (ctx.plugins.genericAuthPlugin.passwordResetSettings == null) {
                         return [2 /*return*/, flink_1.internalServerError("Password reset settings is needed to use /password/reset")];
                     }
-                    _b = genericAuthPlugin.passwordResetSettings.code, jwtSecret = _b.jwtSecret, numberOfDigits = _b.numberOfDigits, lifeTime = _b.lifeTime;
-                    return [4 /*yield*/, genericAuthPlugin.passwordResetStart(repo, ctx.auth, jwtSecret, req.body.username, numberOfDigits, lifeTime)];
+                    _b = ctx.plugins[pluginName].passwordResetSettings.code, jwtSecret = _b.jwtSecret, numberOfDigits = _b.numberOfDigits, lifeTime = _b.lifeTime;
+                    return [4 /*yield*/, ctx.plugins.genericAuthPlugin.passwordResetStart(repo, ctx.auth, jwtSecret, req.body.username, numberOfDigits, lifeTime)];
                 case 1:
                     resp = _d.sent();
                     if (resp.status != "success") {
                         return [2 /*return*/, { data: { status: resp.status } }];
                     }
+                    emailSettings = ctx.plugins[pluginName].passwordResetSettings.email;
                     emailCtx = {
                         code: resp.code,
                         passwordResetToken: resp.passwordResetToken,
                         username: req.body.username,
                         profile: resp.profile,
                     };
-                    emailSettings = genericAuthPlugin.passwordResetSettings.email;
-                    if (typeof emailSettings == "function") {
-                        emailSettings = emailSettings(emailCtx);
-                    }
                     subject = handlebars_1.default.compile(emailSettings.subject)(emailCtx);
                     html = handlebars_1.default.compile(emailSettings.html)(emailCtx);
                     email = req.body.username;

package/dist/src/schemas/UserPasswordResetSettings.d.ts

@@ -1,17 +1,9 @@
-import { UserProfile } from "./UserProfile";
-interface EmailConfig {
-    from_address: string;
-    subject: string;
-    html: string;
-}
-interface EmailCtx {
-    code?: string;
-    passwordResetToken?: string;
-    username: string;
-    profile?: UserProfile;
-}
 export interface UserPasswordResetSettings {
-    email: EmailConfig | ((emailCtx: EmailCtx) => EmailConfig);
+    email: {
+        from_address: string;
+        subject: string;
+        html: string;
+    };
     code: {
         numberOfDigits: number;
         lifeTime: string;
@@ -20,4 +12,3 @@ export interface UserPasswordResetSettings {
     enablePasswordResetForm?: boolean;
     passwordResetForm?: string;
 }
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flink-app/generic-auth-plugin",
-  "version": "0.6.1-alpha.0",
+  "version": "0.6.1",
   "description": "Flink plugin that provides a generic user authentification solution.",
   "scripts": {
     "test": "echo \"Error: no test specified\"",
@@ -17,7 +17,7 @@
   "main": "dist/src/index.js",
   "dependencies": {
     "@flink-app/email-plugin": "^0.6.0",
-    "@flink-app/jwt-auth-plugin": "^0.6.0",
+    "@flink-app/jwt-auth-plugin": "^0.6.1",
     "@flink-app/management-api-plugin": "^0.6.0",
     "@flink-app/sms-plugin": "^0.6.0",
     "handlebars": "^4.7.7",
@@ -30,5 +30,5 @@
     "ts-node": "^9.1.1",
     "typescript": "^4.2.4"
   },
-  "gitHead": "f1abcb3fcc65d06feb68dccf873399a18618bb8d"
+  "gitHead": "86e5a311e8945c87f32d038a63658483076ffcff"
 }

package/src/coreFunctions.ts

@@ -12,7 +12,7 @@ import { UserPasswordResetCompleteRes } from "./schemas/UserPasswordResetComplet
 import jsonwebtoken from "jsonwebtoken";
 import { GenericAuthsmsOptions } from "./genericAuthPluginOptions";
 
-export function getJtwTokenPlugin(secret: string, rolePermissions?: { [role: string]: string[] }, passwordPolicy?: RegExp) {
+export function getJtwTokenPlugin(secret: string, rolePermissions?: { [role: string]: string[] }, passwordPolicy?: RegExp, tokenTTL? : number) {
     if (passwordPolicy == undefined) {
         passwordPolicy = /.{1,}$/;
     }
@@ -36,6 +36,7 @@ export function getJtwTokenPlugin(secret: string, rolePermissions?: { [role: str
         },
         passwordPolicy,
         rolePermissions,
+        tokenTTL
     });
 }
 

package/src/handlers/UserPasswordResetStart.ts

@@ -7,59 +7,67 @@ import { UserPasswordResetStartReq } from "../schemas/UserPasswordResetStartReq"
 import { UserPasswordResetStartResPublic } from "../schemas/UserPasswordResetStartResPublic";
 
 const postPasswordResetStartHandler: Handler<
-    FlinkContext<genericAuthContext & emailPluginContext>,
-    UserPasswordResetStartReq,
-    UserPasswordResetStartResPublic
+  FlinkContext<genericAuthContext & emailPluginContext>,
+  UserPasswordResetStartReq,
+  UserPasswordResetStartResPublic
 > = async ({ ctx, req, origin }) => {
-    let pluginName = origin || "genericAuthPlugin";
+  let pluginName = origin || "genericAuthPlugin";
+  let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
-    const genericAuthPlugin = (<any>ctx.plugins)[pluginName] as genericAuthContext["genericAuthPlugin"];
+  if (ctx.plugins.emailPlugin?.client == null) {
+    return internalServerError(
+      "Email plugin have to be initialized to use /password/reset"
+    );
+  }
 
-    let repo = ctx.repos[genericAuthPlugin.repoName];
+  if (ctx.plugins.genericAuthPlugin.passwordResetSettings == null) {
+    return internalServerError(
+      "Password reset settings is needed to use /password/reset"
+    );
+  }
 
-    if (ctx.plugins.emailPlugin?.client == null) {
-        return internalServerError("Email plugin have to be initialized to use /password/reset");
-    }
+  const { jwtSecret, numberOfDigits, lifeTime } =
+  (<any>ctx.plugins)[pluginName].passwordResetSettings.code;
 
-    if (!genericAuthPlugin.passwordResetSettings) {
-        return internalServerError("Password reset settings is needed to use /password/reset");
-    }
+   
 
-    const { jwtSecret, numberOfDigits, lifeTime } = genericAuthPlugin.passwordResetSettings.code;
+  const resp = await ctx.plugins.genericAuthPlugin.passwordResetStart(
+    repo,
+    <JwtAuthPlugin>ctx.auth,
+    jwtSecret,
+    req.body.username,
+    numberOfDigits,
+    lifeTime
+  );
 
-    const resp = await genericAuthPlugin.passwordResetStart(repo, <JwtAuthPlugin>ctx.auth, jwtSecret, req.body.username, numberOfDigits, lifeTime);
+  if (resp.status != "success") {
+    return { data: { status: resp.status } };
+  }
 
-    if (resp.status != "success") {
-        return { data: { status: resp.status } };
-    }
+  const emailSettings =
+  (<any>ctx.plugins)[pluginName].passwordResetSettings.email;
 
-    const emailCtx = {
-        code: resp.code,
-        passwordResetToken: resp.passwordResetToken,
-        username: req.body.username,
-        profile: resp.profile,
-    };
+  const emailCtx = {
+    code: resp.code,
+    passwordResetToken: resp.passwordResetToken,
+    username: req.body.username,
+    profile: resp.profile,
+  };
 
-    let emailSettings = genericAuthPlugin.passwordResetSettings.email;
+  const subject = Handlebars.compile(emailSettings.subject)(emailCtx);
+  const html = Handlebars.compile(emailSettings.html)(emailCtx);
+  const email = req.body.username;
 
-    if (typeof emailSettings == "function") {
-        emailSettings = emailSettings(emailCtx);
-    }
+  await ctx.plugins.emailPlugin.client.send({
+    from: emailSettings.from_address,
+    to: [email],
+    subject,
+    html,
+  });
 
-    const subject = Handlebars.compile(emailSettings.subject)(emailCtx);
-    const html = Handlebars.compile(emailSettings.html)(emailCtx);
-    const email = req.body.username;
-
-    await ctx.plugins.emailPlugin.client.send({
-        from: emailSettings.from_address,
-        to: [email],
-        subject,
-        html,
-    });
-
-    return {
-        data: { status: "success", passwordResetToken: resp.passwordResetToken },
-    };
+  return {
+    data: { status: "success", passwordResetToken: resp.passwordResetToken },
+  };
 };
 
 export default postPasswordResetStartHandler;

package/src/schemas/UserPasswordResetSettings.ts

@@ -1,25 +1,14 @@
-import { UserProfile } from "./UserProfile";
-
-interface EmailConfig {
+export interface UserPasswordResetSettings {
+  email: {
     from_address: string;
     subject: string;
     html: string;
-}
-
-interface EmailCtx {
-    code?: string;
-    passwordResetToken?: string;
-    username: string;
-    profile?: UserProfile;
-}
-
-export interface UserPasswordResetSettings {
-    email: EmailConfig | ((emailCtx: EmailCtx) => EmailConfig);
-    code: {
-        numberOfDigits: number;
-        lifeTime: string;
-        jwtSecret: string;
-    };
-    enablePasswordResetForm?: boolean;
-    passwordResetForm?: string;
+  };
+  code: {
+    numberOfDigits: number;
+    lifeTime: string;
+    jwtSecret: string;
+  };
+  enablePasswordResetForm?: boolean;
+  passwordResetForm?: string;
 }