From 58aa3b03b63bda8496a953a936ef847a611a52c9 Mon Sep 17 00:00:00 2001
From: ulrich <ulrich>
Date: Tue, 19 May 2020 14:02:12 +0000
Subject: [PATCH] Abmelden fertig, neues UI und neues Profil aktiviert
---
src/java/de/uhilger/um/api/UserMgr.java | 120 ++++++++++++++++++++++++++----------------------------------
1 files changed, 52 insertions(+), 68 deletions(-)
diff --git a/src/java/de/uhilger/um/api/UserMgr.java b/src/java/de/uhilger/um/api/UserMgr.java
index 0edada1..864587f 100644
--- a/src/java/de/uhilger/um/api/UserMgr.java
+++ b/src/java/de/uhilger/um/api/UserMgr.java
@@ -1,6 +1,6 @@
/*
* Nutzerverwaltung - User and role management in your browser
- * Copyright (C) 2011-2016 Ulrich Hilger, http://uhilger.de
+ * Copyright (C) 2011-2017 Ulrich Hilger, http://uhilger.de
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,17 +18,13 @@
package de.uhilger.um.api;
-import de.uhilger.baselink.GenericRecord;
import de.uhilger.baselink.PersistenceManager;
-import de.uhilger.baselink.Record;
-import de.uhilger.transit.web.WebKontext;
import de.uhilger.um.Digester;
import de.uhilger.um.daten.User;
import de.uhilger.um.daten.UserRole;
import java.sql.Connection;
import java.util.List;
-import java.util.Properties;
-import javax.servlet.ServletContext;
+import java.util.logging.Logger;
/**
* <p>Die Methoden der Klasse UserMgr sind
@@ -42,12 +38,10 @@
* Auf diese Weise sind keine statischen Abhängigkeiten in den Code
* gewandert. Die folgenden Elemente werden vom UserMgr im ServletContext
* erwartet:
- *
- * [noch auspraegen]
- *
- * PersistenceManager
- * SQL-Properties
- * Digester
+ * <ul>
+ * <li>PersistenceManager</li>
+ * <li>SQL-Properties</li>
+ * <li>Digester</li>
* </p>
*
* @author Copyright (c) Ulrich Hilger, http://uhilger.de
@@ -57,16 +51,14 @@
*
* @version 2, December 27, 2016
*/
-public class UserMgr implements WebKontext {
+public class UserMgr extends Api /*implements WebKontext, RequestKontext*/ {
- private ServletContext ctx;
-
- private static final Record UserMapper = new GenericRecord(User.class);
- private static final Record UserRoleMapper = new GenericRecord(UserRole.class);
+ private static final Logger logger = Logger.getLogger(UserMgr.class.getName());
/** Name, unter dem das Properties-Objekt mit den SQL-Befehlen im ServletContext hinterlegt ist */
public static final String UM_SQL_PROPERTIES = "umSqlProperties";
+ /** Name, unter dem das Digester-Objekt im ServletContext hinterlegt ist */
public static final String P_DIGESTER = "digester";
/** Name, unter dem das Zugriffsobjekt zur Datenbank im ServletContext hinterlegt ist */
@@ -75,27 +67,40 @@
/** Boolean-Konstante zur Kennzeichnung von Datenbankergebnissen ohne Blobs */
public static final boolean WITHOUT_BLOBS = false;
+ /** Referenz zum SQL-Befehl zur Ermittlung der Benutzer */
public static final String SQL_GET_USER_LIST = "getUserList";
+ /** Referenz zum SQL-Befehl zur Ermittlung der Benutzer-Namen */
public static final String SQL_GET_USER_NAME_LIST = "getUserNameList";
+ /** Referenz zum SQL-Befehl zur Ermittlung der Rollen */
public static final String SQL_GET_ROLE_LIST = "getRoleList";
+ /** Referenz zum SQL-Befehl zur Ermittlung der Rollen eines Benutzers */
public static final String SQL_GET_USER_ROLES = "getUserRoles";
- public static final String SQL_DELETE_USER = "deleteUser";
+ /** Referenz zum SQL-Befehl zum Loeschen aller Rollen eines Nutzers */
public static final String SQL_DELETE_USER_ROLES = "deleteUserRoles";
+ public static final String SQL_GET_USER_DATA = "getUserData";
+
+ public static final String MP_USER = "userMapper";
+ public static final String MP_USER_DATA = "userDataMapper";
+ public static final String MP_USER_ROLE = "userRoleMapper";
/* ----------- Benutzer -------------- */
- public User createUser(User user) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
+ public User createUser(User user) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
String kw = user.getPw();
- String digesterClassName = ctx.getInitParameter(P_DIGESTER);
+ String digesterClassName = getServletContext().getInitParameter(P_DIGESTER);
Digester digester = (Digester) Class.forName(digesterClassName).newInstance();
- String digestedPw = digester.digest(kw, Digester.MD5, null);
- user.setPw(digestedPw);
- getDb().insert(user, UserMapper);
+ String digestedPw = digester.digest(kw, Digester.SHA256, null);
+ user.setPw(digestedPw);
+ getDb().insert(user, getMapper(MP_USER));
return user;
}
public List getUserNameList() {
- return getDb().select(getSql(SQL_GET_USER_NAME_LIST), WITHOUT_BLOBS);
+ return removeHeadline(getDb().select(getSql(SQL_GET_USER_NAME_LIST), WITHOUT_BLOBS));
+ }
+
+ public List getUserList() {
+ return getDb().select(getSql(SQL_GET_USER_LIST), getMapper(MP_USER), WITHOUT_BLOBS);
}
public User deleteUser(User user) {
@@ -103,64 +108,43 @@
Connection c = pm.getConnection();
pm.startTransaction(c);
pm.execute(c, getSql(SQL_DELETE_USER_ROLES), user.getId());
- User deletedUser = (User) pm.delete(c, user, UserMapper);
+ User deletedUser = (User) pm.delete(c, user, getMapper(MP_USER));
pm.commit(c);
return deletedUser;
}
-
- /* ------------ Rollen ------------------ */
-
- public UserRole grantRole(String userId, String roleName) {
- UserRole ur = new UserRole();
- ur.setRole(roleName);
- ur.setUser(userId);
- getDb().insert(ur, UserRoleMapper);
- return ur;
+
+ public String logout() {
+ getRequest().getSession().invalidate();
+ return "logged out";
}
- public UserRole revokeRole(String userId, String roleName) {
- UserRole ur = new UserRole();
- ur.setRole(roleName);
- ur.setUser(userId);
- getDb().delete(ur, UserRoleMapper);
- return ur;
+ /* ------------ Rollen ------------------ */
+
+ public UserRole grantRole(UserRole role) {
+ getDb().insert(role, getMapper(MP_USER_ROLE));
+ return role;
+ }
+
+ public UserRole revokeRole(UserRole role) {
+ getDb().delete(role, getMapper(MP_USER_ROLE));
+ return role;
}
public List getRoleNamesGranted() {
- return getDb().select(getSql(SQL_GET_ROLE_LIST), WITHOUT_BLOBS);
+ return removeHeadline(getDb().select(getSql(SQL_GET_ROLE_LIST), WITHOUT_BLOBS));
}
public List getUserRoleNames(String userId) {
- return getDb().select(getSql(SQL_GET_USER_ROLES), WITHOUT_BLOBS, userId);
+ return removeHeadline(getDb().select(getSql(SQL_GET_USER_ROLES), WITHOUT_BLOBS, userId));
}
/* ----------- Helfer ---- */
- /**
- * Ein benanntes SQL-Kommando ermitteln
- * @param id Name des gewuenschten SQL-Kommandos
- * @return das SQL-Kommando mit der in id angegebenen Bezeichnung
- */
- private String getSql(String id) {
- Properties sql = (Properties) ctx.getAttribute(UserMgr.UM_SQL_PROPERTIES);
- return sql.getProperty(id);
+ private List removeHeadline(List list) {
+ if(list != null && list.size() > 0) {
+ list.remove(0);
+ }
+ return list;
}
- private PersistenceManager getDb() {
- return (PersistenceManager) ctx.getAttribute(UM_DB);
- }
-
- /* ------------- Implementierung WebKontext ------------- */
-
- @Override
- public ServletContext getServletContext() {
- return ctx;
- }
-
- @Override
- public void setServletContext(ServletContext servletContext) {
- this.ctx = servletContext;
- }
-
-
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3