@flink-app/generic-auth-plugin 0.6.2 → 0.6.5

package/.flink/generatedHandlers.ts

@@ -1,4 +1,4 @@
-// Generated Fri Jun 16 2023 09:56:40 GMT+0200 (Central European Summer Time)
+// Generated Mon Nov 06 2023 09:51:29 GMT+0100 (Central European Standard 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 Fri Jun 16 2023 09:56:40 GMT+0200 (Central European Summer Time)
+// Generated Mon Nov 06 2023 09:51:29 GMT+0100 (Central European Standard Time)
 import { autoRegisteredJobs } from "@flink-app/flink";
 export const jobs = [];
 autoRegisteredJobs.push(...jobs);

package/.flink/generatedRepos.ts

@@ -1,4 +1,4 @@
-// Generated Fri Jun 16 2023 09:56:40 GMT+0200 (Central European Summer Time)
+// Generated Mon Nov 06 2023 09:51:29 GMT+0100 (Central European Standard Time)
   import { autoRegisteredRepos } from "@flink-app/flink";
   export const repos = [];
   autoRegisteredRepos.push(...repos);

package/.flink/schemas/schemas.ts

@@ -29,7 +29,7 @@ import { PutManagementUserRolesByUseridRes } from "../../src/schemas/Management/
 import { PutManagementUserUsernameByUseridReq } from "../../src/schemas/Management/PutUserUsernameByUseridReq";
 import { PutManagementUserUsernameByUseridRes } from "../../src/schemas/Management/PutUserUsernameByUseridRes";
 
-// Generated Fri Jun 16 2023 09:56:42 GMT+0200 (Central European Summer Time)
+// Generated Mon Nov 06 2023 09:51:31 GMT+0100 (Central European Standard Time)
 export interface UserCreate_7_ReqSchema extends UserCreateReq {}
 
 export interface UserCreate_7_ResSchema extends UserCreateRes {}

package/.flink/start.ts

@@ -1,4 +1,4 @@
-// Generated Fri Jun 16 2023 09:56:40 GMT+0200 (Central European Summer Time)
+// Generated Mon Nov 06 2023 09:51:29 GMT+0100 (Central European Standard 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 Fri Jun 16 2023 09:56:40 GMT+0200 (Central European Summer Time)
+// Generated Mon Nov 06 2023 09:51:29 GMT+0100 (Central European Standard 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 Fri Jun 16 2023 09:56:40 GMT+0200 (Central European Summer Time)
+// Generated Mon Nov 06 2023 09:51:29 GMT+0100 (Central European Standard 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 Fri Jun 16 2023 09:56:40 GMT+0200 (Central European Summer Time)
+// Generated Mon Nov 06 2023 09:51:29 GMT+0100 (Central European Standard 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 Fri Jun 16 2023 09:56:40 GMT+0200 (Central European Summer Time)
+// Generated Mon Nov 06 2023 09:51:29 GMT+0100 (Central European Standard Time)
 require("./generatedHandlers");
 require("./generatedRepos");
 require("./generatedJobs");

package/dist/src/coreFunctions.js

@@ -297,17 +297,22 @@ function changePassword(repo, auth, userId, newPassword, createPasswordHashAndSa
 exports.changePassword = changePassword;
 function passwordResetStart(repo, auth, jwtSecret, username, numberOfDigits, lifeTime) {
     return __awaiter(this, void 0, void 0, function () {
-        var user, payload, code, secret, options, token;
+        var user, fakepayload, fakeToken, payload, code, secret, options, token;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, repo.getOne({ username: username.toLowerCase() })];
                 case 1:
                     user = _a.sent();
+                    fakepayload = {
+                        type: "passwordReset",
+                        username: username.toLocaleLowerCase(),
+                    };
+                    fakeToken = jsonwebtoken_1.default.sign(fakepayload, "fake_payload", { expiresIn: lifeTime });
                     if (user == null) {
-                        return [2 /*return*/, { status: "userNotFound" }];
+                        return [2 /*return*/, { status: "userNotFound", passwordResetToken: fakeToken }];
                     }
                     if (user.authentificationMethod != "password") {
-                        return [2 /*return*/, { status: "userNotFound" }];
+                        return [2 /*return*/, { status: "userNotFound", passwordResetToken: fakeToken }];
                     }
                     if (numberOfDigits == null)
                         numberOfDigits = 6;

package/dist/src/handlers/UserPasswordResetStart.js

@@ -45,33 +45,37 @@ 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, repo, _b, jwtSecret, numberOfDigits, lifeTime, resp, emailSettings, emailCtx, subject, html, email;
+        var pluginName, genericAuthPlugin, repo, _b, jwtSecret, numberOfDigits, lifeTime, resp, emailCtx, emailSettings, subject, html, email;
         var _c;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
                     pluginName = origin || "genericAuthPlugin";
-                    repo = ctx.repos[ctx.plugins[pluginName].repoName];
+                    genericAuthPlugin = ctx.plugins[pluginName];
+                    repo = ctx.repos[genericAuthPlugin.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 (ctx.plugins.genericAuthPlugin.passwordResetSettings == null) {
+                    if (!genericAuthPlugin.passwordResetSettings) {
                         return [2 /*return*/, flink_1.internalServerError("Password reset settings is needed to use /password/reset")];
                     }
-                    _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)];
+                    _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)];
                 case 1:
                     resp = _d.sent();
                     if (resp.status != "success") {
-                        return [2 /*return*/, { data: { status: resp.status } }];
+                        return [2 /*return*/, { data: { status: "success", passwordResetToken: resp.passwordResetToken } }];
                     }
-                    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,9 +1,17 @@
+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: {
-        from_address: string;
-        subject: string;
-        html: string;
-    };
+    email: EmailConfig | ((emailCtx: EmailCtx) => EmailConfig);
     code: {
         numberOfDigits: number;
         lifeTime: string;
@@ -12,3 +20,4 @@ export interface UserPasswordResetSettings {
     enablePasswordResetForm?: boolean;
     passwordResetForm?: string;
 }
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flink-app/generic-auth-plugin",
-  "version": "0.6.2",
+  "version": "0.6.5",
   "description": "Flink plugin that provides a generic user authentification solution.",
   "scripts": {
     "test": "echo \"Error: no test specified\"",
@@ -16,7 +16,7 @@
   "types": "dist/src/index.d.ts",
   "main": "dist/src/index.js",
   "dependencies": {
-    "@flink-app/email-plugin": "^0.6.0",
+    "@flink-app/email-plugin": "^0.6.5",
     "@flink-app/jwt-auth-plugin": "^0.6.1",
     "@flink-app/management-api-plugin": "^0.6.0",
     "@flink-app/sms-plugin": "^0.6.0",
@@ -30,5 +30,5 @@
     "ts-node": "^9.1.1",
     "typescript": "^4.2.4"
   },
-  "gitHead": "25e6eb796366ff9801118b760c722869f1c09620"
+  "gitHead": "677244548e84f65f0709312010345e9e309d2e28"
 }

package/src/coreFunctions.ts

@@ -281,12 +281,21 @@ export async function passwordResetStart(
     lifeTime?: string
 ): Promise<UserPasswordResetStartRes> {
     const user = await repo.getOne({ username: username.toLowerCase() });
+
+    const fakepayload = {
+        type: "passwordReset",
+        username: username.toLocaleLowerCase(),
+    };
+    const fakeToken = jsonwebtoken.sign(fakepayload, "fake_payload", { expiresIn: lifeTime });
+
+
+
     if (user == null) {
-        return { status: "userNotFound" };
+        return { status: "userNotFound", passwordResetToken : fakeToken };
     }
 
     if (user.authentificationMethod != "password") {
-        return { status: "userNotFound" };
+        return { status: "userNotFound", passwordResetToken : fakeToken };
     }
 
     if (numberOfDigits == null) numberOfDigits = 6;

package/src/handlers/UserPasswordResetStart.ts

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

package/src/schemas/UserPasswordResetSettings.ts

@@ -1,14 +1,25 @@
-export interface UserPasswordResetSettings {
-  email: {
+import { UserProfile } from "./UserProfile";
+
+interface EmailConfig {
     from_address: string;
     subject: string;
     html: string;
-  };
-  code: {
-    numberOfDigits: number;
-    lifeTime: string;
-    jwtSecret: string;
-  };
-  enablePasswordResetForm?: boolean;
-  passwordResetForm?: 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;
 }