@flink-app/generic-auth-plugin 0.11.14 → 0.11.16

package/.flink/generatedHandlers.ts

@@ -1,4 +1,4 @@
-// Generated Mon Feb 24 2025 14:41:52 GMT+0100 (Central European Standard Time)
+// Generated Tue Feb 25 2025 12:57:55 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 Mon Feb 24 2025 14:41:52 GMT+0100 (Central European Standard Time)
+// Generated Tue Feb 25 2025 12:57:55 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 Mon Feb 24 2025 14:41:52 GMT+0100 (Central European Standard Time)
+// Generated Tue Feb 25 2025 12:57:55 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 Mon Feb 24 2025 14:41:53 GMT+0100 (Central European Standard Time)
+// Generated Tue Feb 25 2025 12:57:56 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 Mon Feb 24 2025 14:41:52 GMT+0100 (Central European Standard Time)
+// Generated Tue Feb 25 2025 12:57:55 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 Mon Feb 24 2025 14:41:52 GMT+0100 (Central European Standard Time)
+// Generated Tue Feb 25 2025 12:57:55 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 Mon Feb 24 2025 14:41:52 GMT+0100 (Central European Standard Time)
+// Generated Tue Feb 25 2025 12:57:55 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 Mon Feb 24 2025 14:41:52 GMT+0100 (Central European Standard Time)
+// Generated Tue Feb 25 2025 12:57:55 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 Mon Feb 24 2025 14:41:52 GMT+0100 (Central European Standard Time)
+// Generated Tue Feb 25 2025 12:57:55 GMT+0100 (Central European Standard Time)
 require("./generatedHandlers");
 require("./generatedRepos");
 require("./generatedJobs");

package/dist/src/handlers/UserPasswordResetForm.d.ts

@@ -3,4 +3,8 @@ export declare function handleUserPasswordResetForm(_req: ExpressRequest, res: E
     templateFile?: string;
     completeUrl: string;
 }): Promise<void>;
+export declare function resetPasswordFormScript(req: ExpressRequest, res: ExpressResponse, { completeUrl }: {
+    completeUrl: string;
+}): Promise<void>;
+export declare function resetPasswordFormCss(res: ExpressResponse): Promise<void>;
 export declare const __assumedHttpMethod = "", __file = "UserPasswordResetForm.ts", __query: never[], __params: never[];

package/dist/src/handlers/UserPasswordResetForm.js

@@ -39,11 +39,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.__params = exports.__query = exports.__file = exports.__assumedHttpMethod = exports.handleUserPasswordResetForm = void 0;
+exports.__params = exports.__query = exports.__file = exports.__assumedHttpMethod = exports.resetPasswordFormCss = exports.resetPasswordFormScript = exports.handleUserPasswordResetForm = void 0;
 var promises_1 = __importDefault(require("fs/promises"));
 var flink_1 = require("@flink-app/flink");
 var handlebars_1 = __importDefault(require("handlebars"));
-var defaultTemplate = "<html>\n<head>\n  <title>Password reset</title>\n  <style>\n    * {\n      box-sizing: border-box;\n      font-family: Arial, Helvetica, sans-serif;\n    }\n\n    p {\n      margin: 0.5rem 0;\n    }\n\n    body {\n      padding: 1rem;\n    }\n\n    form {\n      display: block;\n      max-width: 320px;\n    }\n\n    input {\n      width: 100%;\n      display: block;\n      margin: 0.5rem 0;\n    }\n\n    #success {\n      display: none;\n      font-size: 1.2rem;\n      color: rgb(0, 177, 115);\n      max-width: 350px;\n    }\n  </style>\n  <script>\n    window.onload = () => {\n      const urlSearchParams = new URLSearchParams(window.location.search);\n      const params = Object.fromEntries(urlSearchParams.entries());\n      const { token, code } = params;\n\n      if (!token) {\n        alert(\"Missing token\");\n      } else if (!code) {\n        alert(\"Missing code\");\n      }\n\n      const submitBtnEl = document.getElementById(\"submit-btn\");\n      const [passwordInputEl, confirmPasswordEl] =\n        document.getElementsByTagName(\"input\");\n\n      submitBtnEl.onclick = async (e) => {\n        e.preventDefault();\n        e.stopPropagation();\n\n        if (!passwordInputEl.value) {\n          return alert(\"Enter a new password\");\n        } else if (passwordInputEl.value !== confirmPasswordEl.value) {\n          return alert(\n            \"Passwords does not match, make sure that new and confirmed passwords are the same\"\n          );\n        }\n\n        const res = await window.fetch(\"{{completeUrl}}\", {\n          method: \"POST\",\n          headers: {\n            Accept: \"application/json\",\n            \"Content-Type\": \"application/json\",\n          },\n          body: JSON.stringify({\n            passwordResetToken: token,\n            code: code,\n            password: passwordInputEl.value,\n          }),\n        });\n\n        if (res.status > 399) {\n          alert(\"Failed to set new password\");\n        } else {\n          document.getElementById(\"form\").style.display = \"none\";\n          document.getElementById(\"success\").style.display = \"block\";\n        }\n      };\n    };\n  </script>\n</head>\n<body>\n  <form id=\"form\">\n    <p>Please enter new password</p>\n    <input type=\"password\" name=\"password\" placeholder=\"Enter new password\" />\n    <input\n      type=\"password\"\n      name=\"confirmPassword\"\n      placeholder=\"Confirm new password\"\n    />\n    <button id=\"submit-btn\">Submit</button>\n  </form>\n  <div id=\"success\">Password has been updated, please proceed to login.</div>\n</body>\n</html>\n";
+var defaultTemplate = "<html>\n<head>\n  <title>Password reset</title>\n  <link rel=\"stylesheet\" href=\"form/style.css\" />\n  <script src=\"form/script.js\" type=\"text/javascript\"></script>\n</head>\n<body>\n  <form id=\"form\">\n    <p>Please enter new password</p>\n    <input type=\"password\" name=\"password\" placeholder=\"Enter new password\" />\n    <input\n      type=\"password\"\n      name=\"confirmPassword\"\n      placeholder=\"Confirm new password\"\n    />\n    <button id=\"submit-btn\">Submit</button>\n  </form>\n  <div id=\"success\">Password has been updated, please proceed to login.</div>\n</body>\n</html>\n";
+var script = "\n      window.onload = () => {\n      const urlSearchParams = new URLSearchParams(window.location.search);\n      const params = Object.fromEntries(urlSearchParams.entries());\n      const { token, code } = params;\n\n      if (!token) {\n        alert(\"Missing token\");\n      } else if (!code) {\n        alert(\"Missing code\");\n      }\n\n      const submitBtnEl = document.getElementById(\"submit-btn\");\n      const [passwordInputEl, confirmPasswordEl] =\n        document.getElementsByTagName(\"input\");\n\n      submitBtnEl.onclick = async (e) => {\n        e.preventDefault();\n        e.stopPropagation();\n\n        if (!passwordInputEl.value) {\n          return alert(\"Enter a new password\");\n        } else if (passwordInputEl.value !== confirmPasswordEl.value) {\n          return alert(\n            \"Passwords does not match, make sure that new and confirmed passwords are the same\"\n          );\n        }\n\n        const res = await window.fetch(\"{{completeUrl}}\", {\n          method: \"POST\",\n          headers: {\n            Accept: \"application/json\",\n            \"Content-Type\": \"application/json\",\n          },\n          body: JSON.stringify({\n            passwordResetToken: token,\n            code: code,\n            password: passwordInputEl.value,\n          }),\n        });\n\n        if (res.status > 399) {\n          alert(\"Failed to set new password\");\n        } else {\n          document.getElementById(\"form\").style.display = \"none\";\n          document.getElementById(\"success\").style.display = \"block\";\n        }\n      };\n    };\n";
+var style = " * {\n      box-sizing: border-box;\n      font-family: Arial, Helvetica, sans-serif;\n    }\n\n    p {\n      margin: 0.5rem 0;\n    }\n\n    body {\n      padding: 1rem;\n    }\n\n    form {\n      display: block;\n      max-width: 320px;\n    }\n\n    input {\n      width: 100%;\n      display: block;\n      margin: 0.5rem 0;\n    }\n\n    #success {\n      display: none;\n      font-size: 1.2rem;\n      color: rgb(0, 177, 115);\n      max-width: 350px;\n    }\n";
 function handleUserPasswordResetForm(_req, res, _a) {
     var templateFile = _a.templateFile, completeUrl = _a.completeUrl;
     return __awaiter(this, void 0, void 0, function () {
@@ -63,6 +65,29 @@ function handleUserPasswordResetForm(_req, res, _a) {
     });
 }
 exports.handleUserPasswordResetForm = handleUserPasswordResetForm;
+function resetPasswordFormScript(req, res, _a) {
+    var completeUrl = _a.completeUrl;
+    return __awaiter(this, void 0, void 0, function () {
+        var js;
+        return __generator(this, function (_b) {
+            res.header("Content-Type", "application/javascript");
+            js = handlebars_1.default.compile(script)({ completeUrl: completeUrl });
+            res.send(js);
+            return [2 /*return*/];
+        });
+    });
+}
+exports.resetPasswordFormScript = resetPasswordFormScript;
+function resetPasswordFormCss(res) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            res.header("Content-Type", "text/css");
+            res.send(style);
+            return [2 /*return*/];
+        });
+    });
+}
+exports.resetPasswordFormCss = resetPasswordFormCss;
 var cachedTemplate = "";
 function readTemplate(templateFilename) {
     return __awaiter(this, void 0, void 0, function () {

package/dist/src/init.js

@@ -34,7 +34,7 @@ var postUserRemoveTokenHandler = __importStar(require("./handlers/UserPushRemove
 var getUserTokenHandler = __importStar(require("./handlers/UserToken"));
 var UserPasswordResetForm_1 = require("./handlers/UserPasswordResetForm");
 function init(app, options) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     if (options.enableUserCreation == null)
         options.enableUserCreation = true;
     if (options.enableProfileUpdate == null)
@@ -123,6 +123,12 @@ function init(app, options) {
                         completeUrl: options.baseUrl + "/password/reset/complete",
                     });
                 });
+                (_c = app.expressApp) === null || _c === void 0 ? void 0 : _c.get(options.baseUrl + "/password/reset/form/script.js", function (req, res) {
+                    UserPasswordResetForm_1.resetPasswordFormScript(req, res, { completeUrl: options.baseUrl + "/password/reset/complete" });
+                });
+                (_d = app.expressApp) === null || _d === void 0 ? void 0 : _d.get(options.baseUrl + "/password/reset/form/style.css", function (req, res) {
+                    UserPasswordResetForm_1.resetPasswordFormCss(res);
+                });
             }
         }
         if (options.enablePushNotificationTokens) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flink-app/generic-auth-plugin",
-  "version": "0.11.14",
+  "version": "0.11.16",
   "description": "Flink plugin that provides a generic user authentification solution.",
   "scripts": {
     "test": "echo \"Error: no test specified\"",
@@ -30,5 +30,5 @@
     "ts-node": "^9.1.1",
     "typescript": "^4.2.4"
   },
-  "gitHead": "8172291cf7330d13c7958d170100fe9771fd7dfb"
+  "gitHead": "639288292e47f6d1d6329e2929d0cefba3b3e603"
 }

package/src/handlers/UserPasswordResetForm.ts

@@ -6,40 +6,27 @@ 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;
-    }
+  <link rel="stylesheet" href="form/style.css" />
+  <script src="form/script.js" type="text/javascript"></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>
+`;
 
-    #success {
-      display: none;
-      font-size: 1.2rem;
-      color: rgb(0, 177, 115);
-      max-width: 350px;
-    }
-  </style>
-  <script>
-    window.onload = () => {
+const script = `
+      window.onload = () => {
       const urlSearchParams = new URLSearchParams(window.location.search);
       const params = Object.fromEntries(urlSearchParams.entries());
       const { token, code } = params;
@@ -87,22 +74,38 @@ const defaultTemplate = `<html>
         }
       };
     };
-  </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>
+`;
+
+const 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;
+    }
 `;
 
 export async function handleUserPasswordResetForm(
@@ -119,6 +122,17 @@ export async function handleUserPasswordResetForm(
   res.send(html);
 }
 
+export async function resetPasswordFormScript(req: ExpressRequest, res: ExpressResponse, { completeUrl }: { completeUrl: string }) {
+    res.header("Content-Type", "application/javascript");
+    const js = Handlebars.compile(script)({completeUrl});
+    res.send(js);
+}
+
+export async function resetPasswordFormCss(res: ExpressResponse) {
+  res.header("Content-Type", "text/css");
+  res.send(style);
+}
+
 let cachedTemplate = "";
 
 async function readTemplate(templateFilename?: string) {

package/src/init.ts

@@ -11,7 +11,11 @@ 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";
+import {
+  handleUserPasswordResetForm,
+  resetPasswordFormCss,
+  resetPasswordFormScript,
+} from "./handlers/UserPasswordResetForm";
 
 export function init(app: FlinkApp<any>, options: GenericAuthPluginOptions) {
   if (options.enableUserCreation == null) options.enableUserCreation = true;
@@ -107,6 +111,19 @@ export function init(app: FlinkApp<any>, options: GenericAuthPluginOptions) {
               completeUrl: options.baseUrl + "/password/reset/complete",
             })
         );
+        app.expressApp?.get(
+            options.baseUrl + "/password/reset/form/script.js",
+            (req, res) => {
+              resetPasswordFormScript(req, res, { completeUrl: options.baseUrl + "/password/reset/complete"});
+            }
+        );
+
+        app.expressApp?.get(
+            options.baseUrl + "/password/reset/form/style.css",
+            (req, res) => {
+              resetPasswordFormCss(res);
+            }
+        );
       }
     }