mirror of
https://github.com/moku-project/Moku.git
synced 2026-06-13 01:09:56 -05:00
Fix: Preserve Token for NONE Path
This commit is contained in:
@@ -79,23 +79,22 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function saveAuth() {
|
async function saveAuth() {
|
||||||
if ((authMode === "BASIC_AUTH" || authMode === "UI_LOGIN") && (!authUsername.trim() || !authPassword.trim())) {
|
if (authMode === "NONE") { await clearAuth(); return; }
|
||||||
|
if (!authUsername.trim() || !authPassword.trim()) {
|
||||||
secError = "Username and password are required"; return;
|
secError = "Username and password are required"; return;
|
||||||
}
|
}
|
||||||
secLoading = true; secError = null;
|
secLoading = true; secError = null;
|
||||||
const prev = { mode: store.settings.serverAuthMode, user: store.settings.serverAuthUser, pass: store.settings.serverAuthPass };
|
const prev = { mode: store.settings.serverAuthMode, user: store.settings.serverAuthUser, pass: store.settings.serverAuthPass };
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const newUser = authMode !== "NONE" ? authUsername.trim() : "";
|
const newUser = authUsername.trim();
|
||||||
const newPass = authMode !== "NONE" ? authPassword.trim() : "";
|
const newPass = authPassword.trim();
|
||||||
authSession.clearTokens();
|
|
||||||
if (authMode === "UI_LOGIN") {
|
if (authMode === "UI_LOGIN") {
|
||||||
await loginUI(newUser, newPass);
|
await loginUI(newUser, newPass);
|
||||||
updateSettings({ serverAuthMode: "UI_LOGIN", serverAuthUser: newUser, serverAuthPass: "" });
|
updateSettings({ serverAuthMode: "UI_LOGIN", serverAuthUser: newUser, serverAuthPass: "" });
|
||||||
} else if (authMode === "BASIC_AUTH") {
|
|
||||||
updateSettings({ serverAuthMode: "BASIC_AUTH", serverAuthUser: newUser, serverAuthPass: newPass });
|
|
||||||
} else {
|
} else {
|
||||||
updateSettings({ serverAuthMode: "NONE", serverAuthUser: "", serverAuthPass: "" });
|
authSession.clearTokens();
|
||||||
|
updateSettings({ serverAuthMode: "BASIC_AUTH", serverAuthUser: newUser, serverAuthPass: newPass });
|
||||||
}
|
}
|
||||||
|
|
||||||
await gql(SET_SERVER_AUTH, { authMode, authUsername: newUser, authPassword: newPass });
|
await gql(SET_SERVER_AUTH, { authMode, authUsername: newUser, authPassword: newPass });
|
||||||
|
|||||||
Reference in New Issue
Block a user