Add a noauto query param to login

1cda7003d1441769239ea06042ccf945aec23286

QuantumEntangledAndy <sheepchaan@gmail.com>

Signed

public/scripts/login.js+7 -1 Viewed

  * Preserves the query string.
  */
 function redirectToHome() {
 -    window.location.href = '/' + window.location.search;
 +    // After a login theres no need to preserve the
 +    // noauto (if present)
 +    const urlParams = new URLSearchParams(window.location.search);
++
 +    urlParams.delete('noauto');
++
 +    window.location.href = '/' + urlParams.toString();
+}
 /**

public/scripts/user.js+8 -1 Viewed

         headers: getRequestHeaders(),
     });
 -    window.location.reload();
 +    // On an explicit logout stop auto login
 +    // to allow user to change username even
 +    // when auto auth (such as authelia or basic)
 +    // would be valid
 +    const urlParams = new URLSearchParams(window.location.search);
 +    urlParams.set('noauto', 'true');
++
 +    window.location.search = urlParams.toString();
+}
 /**

src/users.js+4 -0 Viewed

 /**
  * Tries auto-login if there is only one user and it's not password protected.
 + * or another configured method such authlia or basic
  * @param {import('express').Request} request Request object
  * @returns {Promise<boolean>} Whether auto-login was performed
  */

@@ -577,6 +578,8 @@ async function tryAutoLogin(request) {
577	578	return false;
578	579	}
579	580
	581	+ console.warn(request.session.noauto);
	582	+ if (!request.query.noauto) {
580	583	if (await singleUserLogin(request)) {
581	584	return true;
582	585	}

@@ -588,6 +591,7 @@ async function tryAutoLogin(request) {
588	591	if (PERUSER_BASIC_AUTH && await basicUserLogin(request)) {
589	592	return true;
590	593	}
	594	+ }
591	595
592	596	return false;
593	597	}