jomu/shared
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 7 Activity

minor improvements

Browse Source
This commit is contained in:
jomu
2015-10-13 11:15:49 +00:00
parent 6ac95e1e9d
commit 268ca04a69
3 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/ServiceLogHandler.java
View File

@ -13,8 +13,6 @@ import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
;
/**
*
* @author joern.muehlencord

16
sharepoint/api/src/main/java/de/muehlencord/shared/sharepoint/api/usergroup/SPUserGroup.java
View File

@ -42,7 +42,7 @@ public class SPUserGroup extends SPObject {
public void addUserToGroup(String userLoginName, String groupName) throws JAXBException, SAXException, ParserConfigurationException,
NoSuchAlgorithmException, IOException, KeyManagementException {
SPUser user = getUser(userLoginName);
SPUser user = getUser("i:0#.w|", userLoginName);
if (user == null) {
throw new SAXException("User not found");
}
@ -52,7 +52,7 @@ public class SPUserGroup extends SPObject {
public void removeUserFromGroup(String userLoginName, String groupName) throws NoSuchAlgorithmException, KeyManagementException, MalformedURLException,
JAXBException, SAXException {
SPUser user = getUser(userLoginName);
SPUser user = getUser("i:0#.w|", userLoginName);
if (user == null) {
throw new SAXException("User not found");
}
@ -116,7 +116,7 @@ public class SPUserGroup extends SPObject {
}
public String getUserId(String userLoginName) throws NoSuchAlgorithmException, KeyManagementException, MalformedURLException, JAXBException, SAXException {
SPUser user = getUser(userLoginName);
SPUser user = getUser("i:0#.w|", userLoginName);
if (user == null) {
return null;
} else {
@ -125,7 +125,7 @@ public class SPUserGroup extends SPObject {
}
public String getUserName(String userLoginName) throws NoSuchAlgorithmException, KeyManagementException, MalformedURLException, JAXBException, SAXException {
SPUser user = getUser(userLoginName);
SPUser user = getUser("i:0#.w|", userLoginName);
if (user == null) {
return null;
} else {
@ -155,8 +155,12 @@ public class SPUserGroup extends SPObject {
return null;
}
private SPUser getUser(String userLoginName) throws NoSuchAlgorithmException, KeyManagementException, MalformedURLException, JAXBException, SAXException {
GetUserInfoResponse.GetUserInfoResult result = getUserGroupPort().getUserInfo("i:0#.w|" + userLoginName);
public SPUser getUserFromId(String userId) throws NoSuchAlgorithmException, KeyManagementException, MalformedURLException, JAXBException, SAXException {
return getUser ("i:0#.w|", userId);
}
private SPUser getUser(Object prefix, String userLoginName) throws NoSuchAlgorithmException, KeyManagementException, MalformedURLException, JAXBException, SAXException {
GetUserInfoResponse.GetUserInfoResult result = getUserGroupPort().getUserInfo(prefix + userLoginName);
// TODO why is i:0#.w| in front?
if (result.getContent() != null) {

47
sharepoint/api/src/main/resources/xsd/usergroup.xsd
View File

@ -1,27 +1,28 @@
<?xml version="1.0"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://schemas.microsoft.com/sharepoint/soap/directory/" xmlns:soap="http://schemas.microsoft.com/sharepoint/soap/directory/">
<xs:element name="Users">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" ref="soap:User"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="User">
<xs:complexType>
<xs:attribute name="Email" use="optional"/>
<xs:attribute name="Flags" use="optional" type="xs:integer"/>
<xs:attribute name="ID" use="optional" type="xs:integer"/>
<xs:attribute name="IsDomainGroup" use="optional" type="xs:NCName"/>
<xs:attribute name="IsSiteAdmin" use="optional" type="xs:NCName"/>
<xs:attribute name="LoginName" use="optional"/>
<xs:attribute name="Name" use="optional"/>
<xs:attribute name="Notes" use="optional"/>
<xs:attribute name="Sid" use="optional"/>
<xs:attribute name="DisplayName" use="optional"/>
<xs:attribute name="Login" use="optional"/>
<xs:attribute name="SiteUser" use="optional"/>
</xs:complexType>
</xs:element>
<xs:element name="Users">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" ref="soap:User"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="User">
<xs:complexType>
<xs:attribute name="Email" use="optional"/>
<xs:attribute name="Flags" use="optional" type="xs:integer"/>
<xs:attribute name="ID" use="optional" type="xs:integer"/>
<xs:attribute name="IsDomainGroup" use="optional" type="xs:NCName"/>
<xs:attribute name="IsSiteAdmin" use="optional" type="xs:NCName"/>
<xs:attribute name="LoginName" use="optional"/>
<xs:attribute name="Name" use="optional"/>
<xs:attribute name="Notes" use="optional"/>
<xs:attribute name="Sid" use="optional"/>
<xs:attribute name="DisplayName" use="optional"/>
<xs:attribute name="Login" use="optional"/>
<xs:attribute name="SiteUser" use="optional"/>
<xs:attribute name="arg1" use="optional"/>
</xs:complexType>
</xs:element>
</xs:schema>