rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-02-01 11:56:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Preserve a query string when redirecting to and from login

Browse Source
This commit is contained in:
Cohee 2024-04-16 18:44:11 +03:00
parent f947c1304a
commit 3dcea41c4e
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/scripts/login.js
View File

@ -177,9 +177,10 @@ function displayError(message) {
/** /**
* Redirects the user to the home page. * Redirects the user to the home page.
* Preserves the query string.
*/ */
function redirectToHome() { function redirectToHome() {
window.location.href = '/'; window.location.href = '/' + window.location.search;
} }
/** /**

4
server.js
View File

@ -248,7 +248,9 @@ if (!disableCsrf) {
// Host index page // Host index page
app.get('/', (request, response) => { app.get('/', (request, response) => {
if (userModule.shouldRedirectToLogin(request)) { if (userModule.shouldRedirectToLogin(request)) {
return response.redirect('/login'); const query = request.url.split('?')[1];
const redirectUrl = query ? `/login?${query}` : '/login';
return response.redirect(redirectUrl);
} }
return response.sendFile('index.html', { root: path.join(process.cwd(), 'public') }); return response.sendFile('index.html', { root: path.join(process.cwd(), 'public') });

6
src/users.js
View File

@ -326,7 +326,7 @@ function toAvatarKey(handle) {
} }
/** /**
* Initializes the user storage. Currently a no-op. * Initializes the user storage.
* @param {string} dataRoot The root directory for user data * @param {string} dataRoot The root directory for user data
* @returns {Promise<void>} * @returns {Promise<void>}
*/ */
@ -655,6 +655,10 @@ async function createBackupArchive(handle, response) {
archive.finalize(); archive.finalize();
} }
/**
* Checks if any admin users are not password protected. If so, logs a warning.
* @returns {Promise<void>}
*/
async function checkAccountsProtection() { async function checkAccountsProtection() {
if (!ENABLE_ACCOUNTS) { if (!ENABLE_ACCOUNTS) {
return; return;