From ccefc8d334fa37294bbf26eccc5f4ac5703631e3 Mon Sep 17 00:00:00 2001
From: ulrich <ulrich@uhilger.de>
Date: Wed, 28 Dec 2016 15:26:02 +0000
Subject: [PATCH] Grant Role und Revoke Role auf UserRole Objekt umgestellt
---
web/WEB-INF/web.xml | 8 --------
src/java/de/uhilger/um/api/UserMgr.java | 18 ++++++------------
web/ui/ui.js | 14 ++++++++++----
3 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/src/java/de/uhilger/um/api/UserMgr.java b/src/java/de/uhilger/um/api/UserMgr.java
index cf6982a..6626665 100644
--- a/src/java/de/uhilger/um/api/UserMgr.java
+++ b/src/java/de/uhilger/um/api/UserMgr.java
@@ -116,20 +116,14 @@
/* ------------ 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 UserRole grantRole(UserRole role) {
+ getDb().insert(role, UserRoleMapper);
+ return role;
}
- public UserRole revokeRole(String userId, String roleName) {
- UserRole ur = new UserRole();
- ur.setRole(roleName);
- ur.setUser(userId);
- getDb().delete(ur, UserRoleMapper);
- return ur;
+ public UserRole revokeRole(UserRole role) {
+ getDb().delete(role, UserRoleMapper);
+ return role;
}
public List getRoleNamesGranted() {
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 268a82d..475e952 100644
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -28,17 +28,9 @@
<param-value>de.uhilger.um.api</param-value>
</init-param>
</servlet>
- <servlet>
- <servlet-name>TestServlet</servlet-name>
- <jsp-file>/show.jsp</jsp-file>
- </servlet>
<servlet-mapping>
<servlet-name>TransitServlet</servlet-name>
<url-pattern>/api</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>TestServlet</servlet-name>
- <url-pattern>/test/*</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>
diff --git a/web/ui/ui.js b/web/ui/ui.js
index 1de6543..b0ccf4e 100644
--- a/web/ui/ui.js
+++ b/web/ui/ui.js
@@ -272,14 +272,15 @@
});
}
+// http]://example.com/um/api?c=de.uhilger.um.api.UserMgr&m=testmethode
function um_apicall_grant_role(userId, roleName, isNewRole) {
+ var ur = new UserRole(userId, roleName);
var m = 'grantRole';
var u = '../svc/' + m;
$.ajax({
url: u,
data: {
- p1: userId,
- p2: roleName
+ p: self.serialisieren(ur)
},
type: "POST",
dataType : "html",
@@ -299,13 +300,13 @@
}
function um_apicall_revoke_role(userId, roleName) {
+ var ur = new UserRole(userId, roleName);
var m = 'revokeRole';
var u = '../svc/' + m;
$.ajax({
url: u,
data: {
- p1: userId,
- p2: roleName
+ p: self.serialisieren(ur)
},
type: "POST",
dataType : "html",
@@ -373,4 +374,9 @@
this.firstName = fn;
this.lastName = ln;
this.email = em;
+}
+
+function UserRole(u, r) {
+ this.userId = u;
+ this.role = r;
}
\ No newline at end of file
--
Gitblit v1.9.3