Commit 21a12365 authored by benjamin.ertl's avatar benjamin.ertl
Browse files

fix

parent 658cf05e
...@@ -72,7 +72,7 @@ public class RestServiceController { ...@@ -72,7 +72,7 @@ public class RestServiceController {
// password=https%3A%2F%2F512eebd9%3Fk%3D49806e48a5cd2941604eb9dfe321c3bc // password=https%3A%2F%2F512eebd9%3Fk%3D49806e48a5cd2941604eb9dfe321c3bc
// password=3D49806e48a5cd2941604eb9dfe321c3bc // password=3D49806e48a5cd2941604eb9dfe321c3bc
@RequestMapping(path = "/ecp/{regId}", method = RequestMethod.POST) @RequestMapping(path = "/ecp/regid/{regId}", method = RequestMethod.POST)
public void ecpAuthentication(@PathVariable String regId, @RequestHeader("Authorization") String basicAuthorization, public void ecpAuthentication(@PathVariable String regId, @RequestHeader("Authorization") String basicAuthorization,
@RequestBody String body) { @RequestBody String body) {
String encodedCredentials = basicAuthorization.split(" ")[1]; String encodedCredentials = basicAuthorization.split(" ")[1];
...@@ -163,7 +163,7 @@ public class RestServiceController { ...@@ -163,7 +163,7 @@ public class RestServiceController {
if (group != null) { if (group != null) {
// check/add user // check/add user
if (!group.getMemberUids().contains(userName)) if (group.getMemberUids() != null && !group.getMemberUids().contains(userName))
ldapClient.addGroupMember(cn, userName); ldapClient.addGroupMember(cn, userName);
} else { } else {
// create new group and add user // create new group and add user
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment