@flink-app/generic-auth-plugin 0.2.0-beta.7 → 0.3.1

package/src/handlers/Management/PutUserProfileByUserid.ts

@@ -1,25 +1,31 @@
-import { FlinkContext, Handler, HttpMethod, notFound, RouteProps } from "@flink-app/flink";
+import {
+  FlinkContext,
+  Handler,
+  HttpMethod,
+  notFound,
+  RouteProps,
+} from "@flink-app/flink";
 import { PutManagementUserProfileByUseridReq } from "../../schemas/Management/PutUserProfileByUseridReq";
 import { PutManagementUserProfileByUseridRes } from "../../schemas/Management/PutUserProfileByUseridRes";
 
-
-const PutManagementUserProfileByUserid: Handler<FlinkContext, PutManagementUserProfileByUseridReq, PutManagementUserProfileByUseridRes> = async ({ ctx, req, origin }) => {
+const PutManagementUserProfileByUserid: Handler<
+  FlinkContext,
+  PutManagementUserProfileByUseridReq,
+  PutManagementUserProfileByUseridRes
+> = async ({ ctx, req, origin }) => {
   let pluginName = origin || "genericAuthPlugin";
-  let repo = ctx.repos[ (<any>ctx.plugins)[pluginName].repoName ];
+  let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
-  const user = await repo.getBydId(req.params.userid);
-  if(user == null){
+  const user = await repo.getById(req.params.userid);
+  if (user == null) {
     return notFound();
   }
 
-  
-  await repo.updateOne(user._id, { profile : req.body });
-
-
-    return {
-      data: {},
-      status : 200
-    };
+  await repo.updateOne(user._id, { profile: req.body });
 
-}
-export default PutManagementUserProfileByUserid;
+  return {
+    data: {},
+    status: 200,
+  };
+};
+export default PutManagementUserProfileByUserid;

package/src/handlers/Management/PutUserProfileByUseridAppend.ts

@@ -1,32 +1,38 @@
-import { FlinkContext, Handler, HttpMethod, notFound, RouteProps } from "@flink-app/flink";
+import {
+  FlinkContext,
+  Handler,
+  HttpMethod,
+  notFound,
+  RouteProps,
+} from "@flink-app/flink";
 import { PutManagementUserProfileByUseridReq } from "../../schemas/Management/PutUserProfileByUseridReq";
 import { PutManagementUserProfileByUseridRes } from "../../schemas/Management/PutUserProfileByUseridRes";
 
-
-const PutManagementUserProfileByUserid: Handler<FlinkContext, PutManagementUserProfileByUseridReq, PutManagementUserProfileByUseridRes> = async ({ ctx, req, origin }) => {
+const PutManagementUserProfileByUserid: Handler<
+  FlinkContext,
+  PutManagementUserProfileByUseridReq,
+  PutManagementUserProfileByUseridRes
+> = async ({ ctx, req, origin }) => {
   let pluginName = origin || "genericAuthPlugin";
-  let repo = ctx.repos[ (<any>ctx.plugins)[pluginName].repoName ];
+  let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
-  const user = await repo.getBydId(req.params.userid);
-  if(user == null){
+  const user = await repo.getById(req.params.userid);
+  if (user == null) {
     return notFound();
   }
 
-  if(user.profile == null) user.profile = {};
-  
+  if (user.profile == null) user.profile = {};
+
   const profile = {
     ...user.profile,
-    ...req.body
-  }
-
-  
-  await repo.updateOne(user._id, { profile : profile });
-
+    ...req.body,
+  };
 
-    return {
-      data: {},
-      status : 200
-    };
+  await repo.updateOne(user._id, { profile: profile });
 
-}
-export default PutManagementUserProfileByUserid;
+  return {
+    data: {},
+    status: 200,
+  };
+};
+export default PutManagementUserProfileByUserid;

package/src/handlers/Management/PutUserRolesByUserid.ts

@@ -1,26 +1,31 @@
-import { FlinkContext, Handler, HttpMethod, notFound, RouteProps } from "@flink-app/flink";
+import {
+  FlinkContext,
+  Handler,
+  HttpMethod,
+  notFound,
+  RouteProps,
+} from "@flink-app/flink";
 import { PutManagementUserRolesByUseridReq } from "../../schemas/Management/PutUserRolesByUseridReq";
 import { PutManagementUserRolesByUseridRes } from "../../schemas/Management/PutUserRolesByUseridRes";
 
-
-
-const PutManagementUserRolesByUserid: Handler<FlinkContext, PutManagementUserRolesByUseridReq, PutManagementUserRolesByUseridRes> = async ({ ctx, req, origin }) => {
-
+const PutManagementUserRolesByUserid: Handler<
+  FlinkContext,
+  PutManagementUserRolesByUseridReq,
+  PutManagementUserRolesByUseridRes
+> = async ({ ctx, req, origin }) => {
   let pluginName = origin || "genericAuthPlugin";
-  let repo = ctx.repos[ (<any>ctx.plugins)[pluginName].repoName ];
+  let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
-  const user = await repo.getBydId(req.params.userid);
-  if(user == null){
+  const user = await repo.getById(req.params.userid);
+  if (user == null) {
     return notFound();
   }
 
-  
-  await repo.updateOne(user._id, { roles : req.body.roles });
-
+  await repo.updateOne(user._id, { roles: req.body.roles });
 
-    return {
-      data: {},
-      status : 200
-    };
-}
-export default PutManagementUserRolesByUserid;
+  return {
+    data: {},
+    status: 200,
+  };
+};
+export default PutManagementUserRolesByUserid;

package/src/handlers/Management/PutUserUsernameByUserid.ts

@@ -1,32 +1,41 @@
-import { conflict, FlinkContext, Handler, HttpMethod, notFound, RouteProps } from "@flink-app/flink";
+import {
+  conflict,
+  FlinkContext,
+  Handler,
+  HttpMethod,
+  notFound,
+  RouteProps,
+} from "@flink-app/flink";
 import { PutManagementUserUsernameByUseridReq } from "../../schemas/Management/PutUserUsernameByUseridReq";
 import { PutManagementUserUsernameByUseridRes } from "../../schemas/Management/PutUserUsernameByUseridRes";
 
-
-const PutManagementUserUsernameByUserid: Handler<FlinkContext, PutManagementUserUsernameByUseridReq, PutManagementUserUsernameByUseridRes> = async ({ ctx, req, origin }) => {
-
+const PutManagementUserUsernameByUserid: Handler<
+  FlinkContext,
+  PutManagementUserUsernameByUseridReq,
+  PutManagementUserUsernameByUseridRes
+> = async ({ ctx, req, origin }) => {
   let pluginName = origin || "genericAuthPlugin";
-  let repo = ctx.repos[ (<any>ctx.plugins)[pluginName].repoName ];
+  let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
-  const user = await repo.getBydId(req.params.userid);
-  if(user == null){
+  const user = await repo.getById(req.params.userid);
+  if (user == null) {
     return notFound();
   }
 
-  const existingUser = await repo.getOne({ username : req.body.username.toLowerCase() });
-  if(existingUser != null){
-    if(existingUser._id + "" != user._id + ""){
+  const existingUser = await repo.getOne({
+    username: req.body.username.toLowerCase(),
+  });
+  if (existingUser != null) {
+    if (existingUser._id + "" != user._id + "") {
       return conflict("Username already taken");
     }
   }
-  
-  await repo.updateOne(user._id, { username : req.body.username.toLowerCase() });
-
 
-    return {
-      data: {},
-      status : 200
-    };
+  await repo.updateOne(user._id, { username: req.body.username.toLowerCase() });
 
-}
-export default PutManagementUserUsernameByUserid;
+  return {
+    data: {},
+    status: 200,
+  };
+};
+export default PutManagementUserUsernameByUserid;

package/src/handlers/UserPasswordResetComplete.ts

@@ -1,4 +1,3 @@
-import { emailPlugin, emailPluginContext } from "@flink-app/email-plugin";
 import {
   badRequest,
   FlinkContext,
@@ -12,27 +11,20 @@ import { UserPasswordResetCompleteReq } from "../schemas/UserPasswordResetComple
 import { UserPasswordResetCompleteRes } from "../schemas/UserPasswordResetCompleteRes";
 
 const postPasswordResetCompleteHandler: Handler<
-  FlinkContext<genericAuthContext & emailPluginContext>,
+  FlinkContext<genericAuthContext>,
   UserPasswordResetCompleteReq,
   UserPasswordResetCompleteRes
 > = async ({ ctx, req, origin }) => {
   let pluginName = origin || "genericAuthPlugin";
   let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
-  const emailPlguin = ctx.plugins.emailPlugin;
-  if (emailPlugin == null) {
-    return internalServerError(
-      "Email plugin have to be initialized to use password-reset"
-    );
-  }
-
   if (ctx.plugins.genericAuthPlugin.passwordResetSettings == null) {
     return internalServerError(
       "Password reset settings is needed to use password-reset"
     );
   }
 
-  const { jwtSecret, numberOfDigits, lifeTime } =
+  const { jwtSecret /*, numberOfDigits, lifeTime*/ } =
     ctx.plugins.genericAuthPlugin.passwordResetSettings.code;
 
   const resp = await ctx.plugins.genericAuthPlugin.passwordResetComplete(

package/src/handlers/UserPasswordResetForm.ts

@@ -0,0 +1,144 @@
+import { ExpressRequest, ExpressResponse } from "@flink-app/flink";
+import fs from "fs/promises";
+import { log } from "@flink-app/flink";
+import Handlebars from "handlebars";
+
+const defaultTemplate = `<html>
+<head>
+  <title>Password reset</title>
+  <style>
+    * {
+      box-sizing: border-box;
+      font-family: Arial, Helvetica, sans-serif;
+    }
+
+    p {
+      margin: 0.5rem 0;
+    }
+
+    body {
+      padding: 1rem;
+    }
+
+    form {
+      display: block;
+      max-width: 320px;
+    }
+
+    input {
+      width: 100%;
+      display: block;
+      margin: 0.5rem 0;
+    }
+
+    #success {
+      display: none;
+      font-size: 1.2rem;
+      color: rgb(0, 177, 115);
+      max-width: 350px;
+    }
+  </style>
+  <script>
+    window.onload = () => {
+      const urlSearchParams = new URLSearchParams(window.location.search);
+      const params = Object.fromEntries(urlSearchParams.entries());
+      const { token, code } = params;
+
+      if (!token) {
+        alert("Missing token");
+      } else if (!code) {
+        alert("Missing code");
+      }
+
+      const submitBtnEl = document.getElementById("submit-btn");
+      const [passwordInputEl, confirmPasswordEl] =
+        document.getElementsByTagName("input");
+
+      submitBtnEl.onclick = async (e) => {
+        e.preventDefault();
+        e.stopPropagation();
+
+        if (!passwordInputEl.value) {
+          return alert("Enter a new password");
+        } else if (passwordInputEl.value !== confirmPasswordEl.value) {
+          return alert(
+            "Passwords does not match, make sure that new and confirmed passwords are the same"
+          );
+        }
+
+        const res = await window.fetch("{{completeUrl}}", {
+          method: "POST",
+          headers: {
+            Accept: "application/json",
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({
+            passwordResetToken: token,
+            code: code,
+            password: passwordInputEl.value,
+          }),
+        });
+
+        if (res.status > 399) {
+          alert("Failed to set new password");
+        } else {
+          document.getElementById("form").style.display = "none";
+          document.getElementById("success").style.display = "block";
+        }
+      };
+    };
+  </script>
+</head>
+<body>
+  <form id="form">
+    <p>Please enter new password</p>
+    <input type="password" name="password" placeholder="Enter new password" />
+    <input
+      type="password"
+      name="confirmPassword"
+      placeholder="Confirm new password"
+    />
+    <button id="submit-btn">Submit</button>
+  </form>
+  <div id="success">Password has been updated, please proceed to login.</div>
+</body>
+</html>
+`;
+
+export async function handleUserPasswordResetForm(
+  _req: ExpressRequest,
+  res: ExpressResponse,
+  { templateFile, completeUrl }: { templateFile?: string; completeUrl: string }
+) {
+  const tpl = await readTemplate(templateFile);
+
+  const html = Handlebars.compile(tpl)({
+    completeUrl,
+  });
+
+  res.send(html);
+}
+
+let cachedTemplate = "";
+
+async function readTemplate(templateFilename?: string) {
+  if (!cachedTemplate) {
+    if (templateFilename) {
+      try {
+        const buff = await fs.readFile(templateFilename);
+        cachedTemplate = buff.toString();
+      } catch (err) {
+        log.error(
+          "Failed reading template file for password reset",
+          templateFilename,
+          err
+        );
+        throw err;
+      }
+    } else {
+      cachedTemplate = defaultTemplate;
+    }
+  }
+
+  return cachedTemplate;
+}

package/src/handlers/UserPasswordResetStart.ts

@@ -47,6 +47,7 @@ const postPasswordResetStartHandler: Handler<
 
   const emailCtx = {
     code: resp.code,
+    passwordResetToken: resp.passwordResetToken,
     username: req.body.username,
     profile: resp.profile,
   };

package/src/handlers/UserProfileGet.ts

@@ -10,7 +10,7 @@ const getProfileHandler: Handler<
   let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
   let userId = req.user._id;
-  let user = await repo.getBydId(userId);
+  let user = await repo.getById(userId);
   if (user == null) {
     return notFound();
   }

package/src/handlers/UserProfilePut.ts

@@ -11,7 +11,7 @@ const putUserProfileHandler: Handler<
   let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
   let userId = req.user._id;
-  let user = await repo.getBydId(userId);
+  let user = await repo.getById(userId);
   if (user == null) {
     return notFound();
   }
@@ -19,7 +19,7 @@ const putUserProfileHandler: Handler<
   user.profile = req.body;
   await repo.updateOne(userId, { profile: req.body });
 
-  user = await repo.getBydId(userId);
+  user = await repo.getById(userId);
 
   return {
     data: user.profile,

package/src/handlers/UserPushRegisterToken.ts

@@ -12,7 +12,7 @@ const postUserPushRegisterTokenHandler: Handler<
   let pluginName = origin || "genericAuthPlugin";
   let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
-  const user = <User>await repo.getBydId(req.user._id);
+  const user = <User>await repo.getById(req.user._id);
 
   if (user == null) {
     return notFound("User not found");

package/src/handlers/UserPushRemoveToken.ts

@@ -12,7 +12,7 @@ const postUserRemoveTokenHandler: Handler<
   let pluginName = origin || "genericAuthPlugin";
   let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
-  const user = <User>await repo.getBydId(req.user._id);
+  const user = <User>await repo.getById(req.user._id);
 
   if (user == null) {
     return notFound("User not found");

package/src/handlers/UserToken.ts

@@ -14,7 +14,7 @@ const getUserTokenHandler: Handler<
   let pluginName = origin || "genericAuthPlugin";
   let repo = ctx.repos[(<any>ctx.plugins)[pluginName].repoName];
 
-  const user = await repo.getBydId(req.user._id);
+  const user = await repo.getById(req.user._id);
   if (user == null) {
     return notFound("User not found");
   }

package/src/init.ts

@@ -10,6 +10,7 @@ import { GenericAuthPluginOptions } from "./genericAuthPluginOptions";
 import * as postUserPushRegisterTokenHandler from "./handlers/UserPushRegisterToken";
 import * as postUserRemoveTokenHandler from "./handlers/UserPushRemoveToken";
 import * as getUserTokenHandler from "./handlers/UserToken";
+import { handleUserPasswordResetForm } from "./handlers/UserPasswordResetForm";
 
 export function init(app: FlinkApp<any>, options: GenericAuthPluginOptions) {
   if (options.enableUserCreation == null) options.enableUserCreation = true;
@@ -83,6 +84,17 @@ export function init(app: FlinkApp<any>, options: GenericAuthPluginOptions) {
         docs: "Completes a password reset for a user",
         origin: options.pluginId,
       });
+
+      if (options.passwordResetSettings?.enablePasswordResetForm) {
+        app.expressApp?.get(
+          options.baseUrl + "/password/reset/form",
+          (req, res) =>
+            handleUserPasswordResetForm(req, res, {
+              templateFile: options.passwordResetSettings?.passwordResetForm,
+              completeUrl: options.baseUrl + "/password/reset/complete",
+            })
+        );
+      }
     }
 
     if (options.enablePushNotificationTokens) {

package/src/schemas/UserPasswordResetCompleteReq.ts

@@ -1,5 +1,5 @@
-export interface UserPasswordResetCompleteReq{
-    passwordResetToken : string;
-    code : string,
-    password : string
-}
+export interface UserPasswordResetCompleteReq {
+  passwordResetToken: string;
+  code: string;
+  password: string;
+}

package/src/schemas/UserPasswordResetSettings.ts

@@ -1,12 +1,14 @@
-export interface UserPasswordResetSettings{
-    email : {
-        from_address : string,
-        subject : string, 
-        html : string,
-    },
-    code : {
-        numberOfDigits : number,
-        lifeTime : string,
-        jwtSecret : string
-    }
-}
+export interface UserPasswordResetSettings {
+  email: {
+    from_address: string;
+    subject: string;
+    html: string;
+  };
+  code: {
+    numberOfDigits: number;
+    lifeTime: string;
+    jwtSecret: string;
+  };
+  enablePasswordResetForm?: boolean;
+  passwordResetForm?: string;
+}

package/src/schemas/UserPasswordResetStartRes.ts

@@ -1,8 +1,8 @@
 import { UserProfile } from "./UserProfile";
 
 export interface UserPasswordResetStartRes {
-    status : "success" | "userNotFound",
-    passwordResetToken? : string,
-    code? : string,
-    profile? : UserProfile
-}
+  status: "success" | "userNotFound";
+  passwordResetToken?: string;
+  code?: string;
+  profile?: UserProfile;
+}