rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

[bug] Don't try per user auto-login if basic auth disabled

Browse Source
This commit is contained in:
Cohee
2024-10-09 02:04:47 +03:00
parent 0ada5407ee
commit a1352d817a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server.js
View File

@ -363,7 +363,7 @@ app.get('/login', async (request, response) => {
} }
try { try {
const autoLogin = await userModule.tryAutoLogin(request); const autoLogin = await userModule.tryAutoLogin(request, basicAuthMode);
if (autoLogin) { if (autoLogin) {
return response.redirect('/'); return response.redirect('/');

5
src/users.js
View File

@ -571,9 +571,10 @@ function shouldRedirectToLogin(request) {
* Tries auto-login if there is only one user and it's not password protected. * Tries auto-login if there is only one user and it's not password protected.
* or another configured method such authlia or basic * or another configured method such authlia or basic
* @param {import('express').Request} request Request object * @param {import('express').Request} request Request object
* @param {boolean} basicAuthMode If Basic auth mode is enabled
* @returns {Promise<boolean>} Whether auto-login was performed * @returns {Promise<boolean>} Whether auto-login was performed
*/ */
async function tryAutoLogin(request) { async function tryAutoLogin(request, basicAuthMode) {
if (!ENABLE_ACCOUNTS || request.user || !request.session) { if (!ENABLE_ACCOUNTS || request.user || !request.session) {
return false; return false;
} }
@ -587,7 +588,7 @@ async function tryAutoLogin(request) {
return true; return true;
} }
if (PER_USER_BASIC_AUTH && await basicUserLogin(request)) { if (basicAuthMode && PER_USER_BASIC_AUTH && await basicUserLogin(request)) {
return true; return true;
} }
} }