bugfix

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>

frontend/src/App.svelte

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

translations/src/main/resources/de.json

@@ -48,10 +48,10 @@
     "connect_service": "mit Service verbinden",
     "connected_services": "verbundene Login-Services",
     "create_new": "Neuen Benutzer anlegen",
-    "CREATE_USERS": "NUTZER ANLEGEN",
+    "CREATE_USERS": "Nutzer anlegen",
     "data_sent": "Daten übermittelt",
     "delete": "löschen",
-    "DELETE_USERS": "NUTZER LÖSCHEN",
+    "DELETE_USERS": "Nutzer löschen",
     "edit": "Bearbeiten",
     "editing": "Nutzer {0} bearbeiten",
     "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}",
     "id": "Id",
     "impersonate": "zu Nutzer wechseln",
-    "IMPERSONATE": "NUTZER WECHSELN",
+    "IMPERSONATE": "Nutzer wechseln",
     "language": "Sprache",
     "list": "Benutzer-Liste",
-    "LIST_USERS": "NUTZER AUFLISTEN",
+    "LIST_USERS": "Nutzer auflisten",
     "loading_data": "Daten werden geladen…",
     "login": "Login",
     "login_services": "Login-Services",
-    "MANAGE_LOGIN_SERVICES": "LOGIN-SERVICES VERWALTEN",
+    "MANAGE_LOGIN_SERVICES": "Login-Services verwalten",
     "mismatch": "ungleich",
     "must_not_be_empty": "darf nicht leer sein",
     "name": "Name",

user/src/main/java/de/srsoftware/umbrella/user/Paths.java

@@ -19,6 +19,7 @@ public class Paths {
 	public static final String OPENID_LOGIN = "openid_login";
 	public static final String RESET_PW = "reset_pw";
 	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";
 }

user/src/main/java/de/srsoftware/umbrella/user/UserModule.java

@@ -158,7 +158,7 @@ public class UserModule extends BaseHandler {
 			case LIST: return getUserList(ex, user);
 			case LOGOUT: return logout(ex, sessionToken);
 			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);
 
 		};
@@ -567,7 +567,7 @@ public class UserModule extends BaseHandler {
 		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!");
 		var email = tokenMap.get(token);
 		tokenMap.remove(token);