1
0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-11-09 20:00:12 +00:00

userpage: add password reset direct link

for #363, adds /my/account/password/reset. Navigate to it to skip
    pressing the "forgot password?" button on the login screen. Works
    with the nice-ish onpopstate override thing I put in setup.ts a
    while ago. Maybe I should make it a module.
This commit is contained in:
Harvey Tindall 2024-08-27 14:56:24 +01:00
parent 848b532b3c
commit b5dea7755b
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2
5 changed files with 33 additions and 9 deletions

View File

@ -159,6 +159,7 @@ func (app *appContext) loadRoutes(router *gin.Engine) {
}
if userPageEnabled {
router.GET(p+"/my/account", app.MyUserPage)
router.GET(p+"/my/account/password/reset", app.MyUserPage)
router.GET(p+"/my/token/login", app.getUserTokenLogin)
router.GET(p+"/my/token/refresh", app.getUserTokenRefresh)
router.GET(p+"/my/confirm/:jwt", app.ConfirmMyAction)

View File

@ -2,6 +2,7 @@ import { Modal } from "../modules/modal.js";
import { toggleLoader, _post } from "../modules/common.js";
export class Login {
loggedIn: boolean = false;
private _modal: Modal;
private _form: HTMLFormElement;
private _url: string;
@ -91,6 +92,7 @@ export class Login {
} else {
const data = req.response;
window.token = data["token"];
this.loggedIn = true;
if (this._onLogin) {
this._onLogin(username, password);
}

View File

@ -525,7 +525,6 @@ const pageNames: string[][] = [];
})();
window.onpopstate = (event: PopStateEvent) => {
console.log("CALLLLLLLL", event);
if (event.state === "welcome") {
cards[0].classList.remove("unfocused");
for (let i = 1; i < cards.length; i++) { cards[i].classList.add("unfocused"); }

View File

@ -2,7 +2,7 @@ declare interface Modal {
modal: HTMLElement;
closeButton: HTMLSpanElement
show: () => void;
close: (event?: Event) => void;
close: (event?: Event, noDispatch?: boolean) => void;
toggle: () => void;
onopen: (f: () => void) => void;
onclose: (f: () => void) => void;

View File

@ -50,19 +50,37 @@ window.modals = {} as Modals;
if (window.pwrEnabled) {
window.modals.pwr = new Modal(document.getElementById("modal-pwr"), false);
window.modals.pwr.onclose = () => {
window.modals.login.show();
window.history.pushState("", "", window.location.pathname.replace("/password/reset", ""));
};
const resetButton = document.getElementById("modal-login-pwr");
resetButton.onclick = () => {
const usernameInput = document.getElementById("login-user") as HTMLInputElement;
const input = document.getElementById("pwr-address") as HTMLInputElement;
input.value = usernameInput.value;
window.modals.login.close();
window.modals.pwr.show();
window.history.pushState("reset", "", window.location.pathname+"/password/reset");
}
window.onpopstate = (event: PopStateEvent) => {
if ((event.state == "reset" || window.location.pathname.includes("/password/reset")) && window.pwrEnabled) {
const usernameInput = document.getElementById("login-user") as HTMLInputElement;
const input = document.getElementById("pwr-address") as HTMLInputElement;
input.value = usernameInput.value;
window.modals.login.close();
window.modals.pwr.show();
} else {
window.modals.pwr.close(null, true);
if (!login.loggedIn) login.login("", "");
}
};
}
})();
(() => {
const pushState = window.history.pushState;
window.history.pushState = function (data: any, __: string, _: string | URL) {
pushState.apply(window.history, arguments);
let ev = { state: data as string } as PopStateEvent;
window.onpopstate(ev);
};
})();
window.notifications = new notificationBox(document.getElementById('notification-box') as HTMLDivElement, 5);
if (window.pwrEnabled && window.linkResetEnabled) {
@ -780,4 +798,8 @@ const generatePermutations = (xs: number[]): [number[], number[]][] => {
login.bindLogout(document.getElementById("logout-button"));
login.login("", "");
(() => {
let data = "";
if (window.location.pathname.endsWith("/password/reset")) data = "reset";
window.history.pushState(data, "", window.location.pathname);
})();