SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

bugfix

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
Stephan Richter
2025-07-08 21:19:34 +02:00
parent 5dc7c22b03
commit e6e3ed4052
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/App.svelte
View File

@@ -47,7 +47,7 @@
<Route path="/user/reset/pw" component={ResetPw} /> <Route path="/user/reset/pw" component={ResetPw} />
<Route path="/oidc_callback" component={Callback} /> <Route path="/oidc_callback" component={Callback} />
<Route> <Route>
<Login /> <Login />
</Route> </Route>
{/if} {/if}
</Router> </Router>

10
translations/src/main/resources/de.json
View File

@@ -48,10 +48,10 @@
"connect_service": "mit Service verbinden", "connect_service": "mit Service verbinden",
"connected_services": "verbundene Login-Services", "connected_services": "verbundene Login-Services",
"create_new": "Neuen Benutzer anlegen", "create_new": "Neuen Benutzer anlegen",
"CREATE_USERS": "NUTZER ANLEGEN", "CREATE_USERS": "Nutzer anlegen",
"data_sent": "Daten übermittelt", "data_sent": "Daten übermittelt",
"delete": "löschen", "delete": "löschen",
"DELETE_USERS": "NUTZER LÖSCHEN", "DELETE_USERS": "Nutzer löschen",
"edit": "Bearbeiten", "edit": "Bearbeiten",
"editing": "Nutzer {0} bearbeiten", "editing": "Nutzer {0} bearbeiten",
"edit_password": "Passwort ändern", "edit_password": "Passwort ändern",
@@ -62,14 +62,14 @@
"go_to_url_to_reset_password": "Um ein neues Passwort zu erhalten, öffnen Sie bitte den folgenden Link: {url}", "go_to_url_to_reset_password": "Um ein neues Passwort zu erhalten, öffnen Sie bitte den folgenden Link: {url}",
"id": "Id", "id": "Id",
"impersonate": "zu Nutzer wechseln", "impersonate": "zu Nutzer wechseln",
"IMPERSONATE": "NUTZER WECHSELN", "IMPERSONATE": "Nutzer wechseln",
"language": "Sprache", "language": "Sprache",
"list": "Benutzer-Liste", "list": "Benutzer-Liste",
"LIST_USERS": "NUTZER AUFLISTEN", "LIST_USERS": "Nutzer auflisten",
"loading_data": "Daten werden geladen…", "loading_data": "Daten werden geladen…",
"login": "Login", "login": "Login",
"login_services": "Login-Services", "login_services": "Login-Services",
"MANAGE_LOGIN_SERVICES": "LOGIN-SERVICES VERWALTEN", "MANAGE_LOGIN_SERVICES": "Login-Services verwalten",
"mismatch": "ungleich", "mismatch": "ungleich",
"must_not_be_empty": "darf nicht leer sein", "must_not_be_empty": "darf nicht leer sein",
"name": "Name", "name": "Name",

3
user/src/main/java/de/srsoftware/umbrella/user/Paths.java
View File

@@ -19,6 +19,7 @@ public class Paths {
public static final String OPENID_LOGIN = "openid_login"; public static final String OPENID_LOGIN = "openid_login";
public static final String RESET_PW = "reset_pw"; public static final String RESET_PW = "reset_pw";
public static final String SESSION = "session"; public static final String SESSION = "session";
public static final String VALIDATE_TOKEN = "validate"; public static final String VALIDATE_OTP = "validate";
public static final String VALIDATE_TOKEN = "validateToken";
public static final String WHOAMI = "whoami"; public static final String WHOAMI = "whoami";
} }

4
user/src/main/java/de/srsoftware/umbrella/user/UserModule.java
View File

@@ -158,7 +158,7 @@ public class UserModule extends BaseHandler {
case LIST: return getUserList(ex, user); case LIST: return getUserList(ex, user);
case LOGOUT: return logout(ex, sessionToken); case LOGOUT: return logout(ex, sessionToken);
case OIDC: return getOIDC(ex,user,path); case OIDC: return getOIDC(ex,user,path);
case VALIDATE_TOKEN: return validateToken(ex,path.pop()); case VALIDATE_OTP: return validateOtpToken(ex,path.pop());
case WHOAMI: return getUser(ex, user); case WHOAMI: return getUser(ex, user);
}; };
@@ -567,7 +567,7 @@ public class UserModule extends BaseHandler {
return sendContent(ex,HTTP_OK,saved); return sendContent(ex,HTTP_OK,saved);
} }
private boolean validateToken(HttpExchange ex, String token) throws IOException { private boolean validateOtpToken(HttpExchange ex, String token) throws IOException {
if (token == null) return sendContent(ex,HTTP_UNPROCESSABLE,"No token provided!"); if (token == null) return sendContent(ex,HTTP_UNPROCESSABLE,"No token provided!");
var email = tokenMap.get(token); var email = tokenMap.get(token);
tokenMap.remove(token); tokenMap.remove(token);