Author: schuch
Date: Sun Dec 12 08:43:38 2021
New Revision: 1895833
URL: http://svn.apache.org/viewvc?rev=1895833&view=rev
Log:
CONNECTORS-1626
Modified:
manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/csws/CswsAuthority.java
manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
Modified:
manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/csws/CswsAuthority.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/csws/CswsAuthority.java?rev=1895833&r1=1895832&r2=1895833&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/csws/CswsAuthority.java
(original)
+++
manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/csws/CswsAuthority.java
Sun Dec 12 08:43:38 2021
@@ -18,25 +18,21 @@
*/
package org.apache.manifoldcf.authorities.authorities.csws;
+import com.opentext.livelink.service.memberservice.MemberRight;
import org.apache.manifoldcf.core.interfaces.*;
import org.apache.manifoldcf.agents.interfaces.*;
import org.apache.manifoldcf.authorities.interfaces.*;
import org.apache.manifoldcf.authorities.system.Logging;
-import org.apache.manifoldcf.authorities.system.ManifoldCF;
import org.apache.manifoldcf.connectorcommon.interfaces.*;
-import org.apache.manifoldcf.connectorcommon.common.InterruptibleSocketFactory;
import com.opentext.livelink.service.memberservice.User;
import com.opentext.livelink.service.memberservice.Member;
-import com.opentext.livelink.service.memberservice.Group;
import com.opentext.livelink.service.memberservice.MemberPrivileges;
import org.apache.manifoldcf.csws.*;
import java.io.*;
import java.util.*;
-import java.net.*;
-import java.util.regex.*;
/** This is the Csws implementation of the IAuthorityConnector interface.
*
@@ -433,8 +429,8 @@ public class CswsAuthority extends org.a
return RESPONSE_USERNOTFOUND;
}
- final List<? extends Group> groups =
cswsSession.listUserMemberOf(member.getID());
- if (groups == null)
+ final List<? extends MemberRight> memberRights =
cswsSession.listRightsByMemberId(member.getID());
+ if (memberRights == null)
{
if (Logging.authorityConnectors.isDebugEnabled())
Logging.authorityConnectors.debug("Csws: Csws error looking up user
rights for '"+domainAndUser+"' - user does not exist");
@@ -466,10 +462,10 @@ public class CswsAuthority extends org.a
// code, so it *may* be reasonable to filter them from here. It's not a
real problem because
// it's effectively just a duplicate of what we are doing.
- final String[] rval = new String[groups.size()];
+ final String[] rval = new String[memberRights.size()];
int j = 0;
- for (final Group g : groups) {
- rval[j++] = new Long(g.getID()).toString();
+ for (final MemberRight memberRight : memberRights) {
+ rval[j++] = Long.toString(memberRight.getID());
}
return new AuthorizationResponse(rval,AuthorizationResponse.RESPONSE_OK);
Modified:
manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java?rev=1895833&r1=1895832&r2=1895833&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
(original)
+++
manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/csws/CswsSession.java
Sun Dec 12 08:43:38 2021
@@ -28,6 +28,7 @@ import java.net.MalformedURLException;
import java.io.OutputStream;
import java.io.IOException;
+import com.opentext.livelink.service.memberservice.MemberRight;
import org.apache.cxf.transport.http.HttpConduitFeature;
import org.apache.cxf.transport.http.HttpConduitConfig;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
@@ -62,7 +63,6 @@ import com.opentext.livelink.service.doc
import com.opentext.livelink.service.docman.AttributeGroupDefinition;
import com.opentext.livelink.service.memberservice.User;
import com.opentext.livelink.service.memberservice.Member;
-import com.opentext.livelink.service.memberservice.Group;
import com.opentext.livelink.service.searchservices.SResultPage;
import com.opentext.livelink.service.searchservices.SGraph;
import com.opentext.livelink.service.searchservices.SingleSearchRequest;
@@ -373,7 +373,7 @@ public class CswsSession
return getDocumentManagementHandle().getVersion(nodeId, version,
getOTAuthentication());
} catch (SOAPFaultException e) {
if
(e.getFault().getFaultCode().equals("ns0:DocMan.VersionRetrievalError")) {
- return null;
+ return null;
}
processSOAPFault(e);
return null;
@@ -422,10 +422,10 @@ public class CswsSession
}
}
- public List<? extends Group> listUserMemberOf(final long memberId)
+ public List<? extends MemberRight> listRightsByMemberId(final long memberId)
throws ManifoldCFException, ServiceInterruption {
try {
- return getMemberServiceHandle().listMemberOf(memberId,
getOTAuthentication());
+ return getMemberServiceHandle().listRightsByID(memberId,
getOTAuthentication());
} catch (SOAPFaultException e) {
processSOAPFault(e);
return null;
