Added auto-approve to channel auto-subscribe (for private channels)

Author: ashward

src/main/java/org/buddycloud/channelserver/channel/ChannelManager.java

@@ -2,32 +2,39 @@
 
 import org.buddycloud.channelserver.db.NodeStore;
 import org.buddycloud.channelserver.db.exception.NodeStoreException;
-import org.buddycloud.channelserver.pubsub.model.NodeAffiliation;
+import org.buddycloud.channelserver.pubsub.affiliation.Affiliations;
 import org.xmpp.packet.JID;
-import org.xmpp.resultsetmanagement.ResultSet;
 
 public interface ChannelManager extends NodeStore {
-	
+
 	/**
 	 * Creates a channel.
-	 * @param channelJID the JID of the channel.
-	 * @throws NodeStoreException 
+	 * 
+	 * @param channelJID
+	 *            the JID of the channel.
+	 * @throws NodeStoreException
 	 */
 	void createPersonalChannel(JID ownerJID) throws NodeStoreException;
-	
+
 	/**
 	 * Determines whether the node id given refers to a local node.
-	 * @param nodeId the node id
-	 * @return <code>true</code> if the node appears to be local, <code>false</code> otherwise.
-	 * @throws NodeStoreException 
+	 * 
+	 * @param nodeId
+	 *            the node id
+	 * @return <code>true</code> if the node appears to be local,
+	 *         <code>false</code> otherwise.
+	 * @throws NodeStoreException
 	 */
 	boolean isLocalNode(String nodeId) throws NodeStoreException;
-	
+
 	/**
 	 * Determines whether the jid refers to a local user.
-	 * @param jid the user's jid
-	 * @return <code>true</code> if the jid appears to be local, <code>false</code> otherwise.
-	 * @throws NodeStoreException 
+	 * 
+	 * @param jid
+	 *            the user's jid
+	 * @return <code>true</code> if the jid appears to be local,
+	 *         <code>false</code> otherwise.
+	 * @throws NodeStoreException
 	 */
 	boolean isLocalJID(JID jid) throws NodeStoreException;
 
@@ -37,4 +44,12 @@ public interface ChannelManager extends NodeStore {
 	 * @throws NodeStoreException
 	 */
 	void deleteRemoteData() throws NodeStoreException;
+
+	/**
+	 * Gets the default affiliation for a node
+	 * @return 
+	 * 
+	 * @throws NodeStoreException
+	 */
+	Affiliations getDefaultNodeAffiliation(String nodeId) throws NodeStoreException;
 }

src/main/java/org/buddycloud/channelserver/channel/ChannelManagerImpl.java

@@ -413,4 +413,21 @@ public CloseableIterator<NodeItem> getFirehose(int limit,
 	public int getFirehoseItemCount(boolean isAdmin) throws NodeStoreException {
 		return nodeStore.getFirehoseItemCount(isAdmin);
 	}
+
+	@Override
+	public Affiliations getDefaultNodeAffiliation(String nodeId)
+			throws NodeStoreException {
+		String affiliationString = getNodeConfValue(nodeId, Conf.DEFAULT_AFFILIATION);
+		
+		if(affiliationString != null) {
+			try {
+				return Affiliations.valueOf(affiliationString);
+			}
+			catch(IllegalArgumentException e) {
+				logger.error("Invalid default affiliation stored for node " + nodeId + ": " + affiliationString, e);
+			}
+		}
+		
+		return Affiliations.member;
+	}
 }

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/register/RegisterSet.java

@@ -78,6 +78,7 @@ public void process(IQ reqIQ) throws Exception {
 
 	// TODO: We should really be returning an error as per spec shouldn't we?
 	// It should be up to the client to ignore the error, not the server.
+	@SuppressWarnings("unused")
 	private void userAlreadyRegistered() throws InterruptedException {
 		// User is already registered.
 		IQ reply = IQ.createResultIQ(request);
@@ -158,9 +159,13 @@ private void autosubscribeToChannels(final JID from) {
 								channelManager.getNodeConfValue(channelNodeId,
 										Conf.ACCESS_MODEL))) {
 					channelManager
-							.addUserSubscription(new NodeSubscriptionImpl(Conf
-									.getPostChannelNodename(channel), from,
+							.addUserSubscription(new NodeSubscriptionImpl(
+									channelNodeId, from,
 									Subscriptions.subscribed));
+
+					channelManager.setUserAffiliation(channelNodeId, from,
+							channelManager
+									.getDefaultNodeAffiliation(channelNodeId));
 				}
 			} catch (InterruptedException e) {
 				LOGGER.error("Could not auto-subscribe " + from + " to "

src/test/java/org/buddycloud/channelserver/channel/ChannelManagerImplTest.java

@@ -1,5 +1,6 @@
 package org.buddycloud.channelserver.channel;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.never;
@@ -10,6 +11,7 @@
 
 import org.buddycloud.channelserver.Configuration;
 import org.buddycloud.channelserver.db.NodeStore;
+import org.buddycloud.channelserver.pubsub.affiliation.Affiliations;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -150,4 +152,22 @@ public void testDeleteRemoteDoesNotPurgeLocalNodes() throws Exception {
 		verify(nodeStore).getNodeList();
 		verify(nodeStore, Mockito.times(2)).purgeNodeItems(Mockito.anyString());
 	}
+	
+	@Test
+	public void testGetNodeDefaultAffiliationForNodeWithConf() throws Exception {
+		when(nodeStore.getNodeConfValue(user1, Conf.DEFAULT_AFFILIATION)).thenReturn("moderator");
+		
+		Affiliations affiliation = channelManager.getDefaultNodeAffiliation(user1);
+		
+		assertEquals("Incorrect default affiliation", Affiliations.moderator, affiliation);
+	}
+	
+	
+	@Test
+	public void testGetNodeDefaultAffiliationForNodeWithoutConf() throws Exception {
+		Affiliations affiliation = channelManager.getDefaultNodeAffiliation(user1);
+		
+		// If nothing is specified, the default affiliation is "member"
+		assertEquals("Incorrect default affiliation", Affiliations.member, affiliation);
+	}
 }

src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/register/RegisterSetTest.java

@@ -18,6 +18,7 @@
 import org.buddycloud.channelserver.packetHandler.iq.IQTestHandler;
 import org.buddycloud.channelserver.packetprocessor.iq.namespace.pubsub.JabberPubsub;
 import org.buddycloud.channelserver.pubsub.accessmodel.AccessModels;
+import org.buddycloud.channelserver.pubsub.affiliation.Affiliations;
 import org.buddycloud.channelserver.pubsub.model.impl.NodeSubscriptionImpl;
 import org.buddycloud.channelserver.pubsub.subscription.Subscriptions;
 import org.dom4j.Element;
@@ -171,13 +172,10 @@ public void testRegisterNewUserAutoApprovesOnlyLocalPrivateChannels()
 
 		final JID localPrivateChannel = new JID("channel1@server1");
 		final String localPrivateChannelNode = "/user/channel1@server1/posts";
-
+		
 		final JID localOpenChannel = new JID("channel2@server1");
-		final String localOpenChannelNode = "/user/channel2@server1/posts";
-
 		final JID remoteChannel = new JID("channel1@server2");
-		final String remoteChannelNode = "/user/channel1@server2/posts";
-
+		
 		when(channelManagerMock.nodeExists(anyString())).thenReturn(false);
 
 		when(configuration.getAutosubscribeChannels()).thenReturn(
@@ -201,6 +199,11 @@ public void testRegisterNewUserAutoApprovesOnlyLocalPrivateChannels()
 						Conf.ACCESS_MODEL)).thenReturn(
 				AccessModels.authorize.toString());
 
+		when(
+				channelManagerMock
+						.getDefaultNodeAffiliation(localPrivateChannelNode))
+				.thenReturn(Affiliations.moderator);
+
 		when(channelManagerMock.isLocalJID(localPrivateChannel)).thenReturn(
 				true);
 		when(channelManagerMock.isLocalJID(localOpenChannel)).thenReturn(true);
@@ -213,12 +216,13 @@ public void testRegisterNewUserAutoApprovesOnlyLocalPrivateChannels()
 		verify(channelManagerMock).addUserSubscription(
 				new NodeSubscriptionImpl(localPrivateChannelNode,
 						REGISTER_REQUEST_FROM, Subscriptions.subscribed));
+		verify(channelManagerMock).setUserAffiliation(localPrivateChannelNode,
+				REGISTER_REQUEST_FROM, Affiliations.moderator);
 	}
 
 	@SuppressWarnings("serial")
 	@Test
-	public void testRegisterNewUserDoesntAutoApprove()
-			throws Exception {
+	public void testRegisterNewUserDoesntAutoApprove() throws Exception {
 		IQ request = readStanzaAsIq(REGISTER_REQUEST_STANZA);
 
 		final JID localPrivateChannel = new JID("channel1@server1");
@@ -250,7 +254,8 @@ public void testRegisterNewUserDoesntAutoApprove()
 
 		registerSet.process(request);
 
-		// Check that a subscription has been added, but only for
+		// Check that a subscription and affiliation has been added, but only
+		// for
 		// localPrivateChannel.
 		verify(channelManagerMock, never()).addUserSubscription(
 				new NodeSubscriptionImpl(localPrivateChannelNode,