From 50ed237526f1ccb57724c94fd1d1ffa2a23a690b Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Tue, 27 Dec 2016 13:59:04 +0000
Subject: [PATCH] Abbrechen bei new-user-form und kleinere Anpassungen
---
src/java/de/uhilger/um/api/UserMgr.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/src/java/de/uhilger/um/api/UserMgr.java b/src/java/de/uhilger/um/api/UserMgr.java
index 249dfcf..1c14853 100644
--- a/src/java/de/uhilger/um/api/UserMgr.java
+++ b/src/java/de/uhilger/um/api/UserMgr.java
@@ -1,14 +1,18 @@
package de.uhilger.um.api;
import de.uhilger.baselink.GenericRecord;
+import de.uhilger.baselink.PersistenceManager;
import de.uhilger.baselink.Record;
import de.uhilger.um.App;
import de.uhilger.um.daten.User;
+import de.uhilger.um.daten.UserRole;
+import java.sql.Connection;
import java.util.List;
import org.apache.catalina.realm.RealmBase;
/**
- * Klasse zur Verwaltung von Benutzern in einer Datenbank
+ * Klasse zur Verwaltung von Benutzern und Rollen
+ * in einer Datenbank
*
* @author Ulrich Hilger
*/
@@ -17,10 +21,16 @@
private static final String MD5 = "MD5";
private static final Record UserMapper = new GenericRecord(User.class);
+ private static final Record UserRoleMapper = new GenericRecord(UserRole.class);
public static final String SQL_GET_USER_LIST = "getUserList";
public static final String SQL_GET_USER_NAME_LIST = "getUserNameList";
+ public static final String SQL_GET_ROLE_LIST = "getRoleList";
+ public static final String SQL_GET_USER_ROLES = "getUserRoles";
public static final String SQL_DELETE_USER = "deleteUser";
+ public static final String SQL_DELETE_USER_ROLES = "deleteUserRoles";
+
+ /* ----------- Benutzer -------------- */
public User createUser(User user) {
String kw = user.getPw();
@@ -37,7 +47,14 @@
}
public User deleteUser(User user) {
- return (User) App.getDatabase().delete(user, UserMapper);
+ PersistenceManager pm = App.getDatabase();
+ Connection c = pm.getConnection();
+ pm.startTransaction(c);
+ String sql = App.getSqlStatement(SQL_DELETE_USER_ROLES);
+ pm.execute(c, sql, user.getId());
+ User deletedUser = (User) pm.delete(c, user, UserMapper);
+ pm.commit(c);
+ return deletedUser;
}
/*
@@ -48,6 +65,46 @@
}
*/
+ /* ------------ Rollen ------------------ */
+
+ public UserRole grantRole(String userId, String roleName) {
+ UserRole ur = new UserRole();
+ ur.setRole(roleName);
+ ur.setUser(userId);
+ App.getDatabase().insert(ur, UserRoleMapper);
+ return ur;
+ }
+
+ public UserRole revokeRole(String userId, String roleName) {
+ UserRole ur = new UserRole();
+ ur.setRole(roleName);
+ ur.setUser(userId);
+ App.getDatabase().delete(ur, UserRoleMapper);
+ return ur;
+ }
+
+ public List getRoleNamesGranted() {
+ String sql = App.getSqlStatement(SQL_GET_ROLE_LIST);
+ List roleNames = App.getDatabase().select(sql, App.WITHOUT_BLOBS);
+ return roleNames;
+ }
+
+ /**
+ *
+ *
+ * list.get(recordno).get(fieldno)
+ *
+ * @param userId ID des Benutzers
+ * @return List<List<String>> Rollennamen des Benutzers
+ */
+ public List getUserRoleNames(String userId) {
+ String sql = App.getSqlStatement(SQL_GET_USER_ROLES);
+ List roleNames = App.getDatabase().select(sql, App.WITHOUT_BLOBS, userId);
+ return roleNames;
+ }
+
+ /* ------------ sonstige Methoden -------------- */
+
public String hallo() {
return "Hallo Welt";
}
--
Gitblit v1.9.3