Merge pull request #122 from surevine/issue-121

Fix setting of default affiliation (or falling back on 'member') on node...

Author: martin-hewitt

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/SubscribeSet.java

@@ -126,8 +126,8 @@ public void process(Element elm, JID actorJID, IQ reqIQ, Element rsm)
 				return;
 			}
 
-			Affiliations defaultAffiliation = null;
-			Subscriptions defaultSubscription = null;
+			Affiliations defaultAffiliation = Affiliations.member;
+			Subscriptions defaultSubscription = Subscriptions.none;
 
 			if (!possibleExistingSubscription.in(Subscriptions.none) && 
 					!possibleExistingAffiliation.in(Affiliations.none)) {
@@ -138,16 +138,17 @@ public void process(Element elm, JID actorJID, IQ reqIQ, Element rsm)
 				defaultSubscription = possibleExistingSubscription;
 			} else {
 				try {
-					String nodeDefAffiliation = nodeConf.get(Conf.DEFAULT_AFFILIATION);
-					LOGGER.debug("Node default affiliation: '" + nodeDefAffiliation + "'");
-					defaultAffiliation = Affiliations.createFromString(nodeDefAffiliation);
+					String nodeDefaultAffiliation = nodeConf.get(Conf.DEFAULT_AFFILIATION);
+					LOGGER.debug("Node default affiliation: '" + nodeDefaultAffiliation + "'");
+					if (!Affiliations.none.equals(Affiliations.createFromString(nodeDefaultAffiliation))) {
+						defaultAffiliation = Affiliations.createFromString(nodeDefaultAffiliation);
+					}
 				} catch (NullPointerException e) {
 					LOGGER.error("Could not create affiliation.", e);
 					defaultAffiliation = Affiliations.member;
 				}
 				defaultSubscription = Subscriptions.subscribed;
 				String accessModel = nodeConf.get(Conf.ACCESS_MODEL);
-
 				if ((null == accessModel)
 						|| (true == accessModel.equals(AccessModels.authorize
 								.toString()))

src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/SubscribeSetTest.java

@@ -86,7 +86,8 @@ public void setUp() throws Exception {
 				Affiliations.member, new Date()));
 
 		Mockito.doReturn(new ResultSetImpl<NodeAffiliation>(affiliations))
-				.when(channelManager).getNodeAffiliations(Mockito.anyString(), Mockito.anyBoolean());
+				.when(channelManager)
+				.getNodeAffiliations(Mockito.anyString(), Mockito.anyBoolean());
 
 		ArrayList<NodeSubscription> subscribers = new ArrayList<NodeSubscription>();
 		subscribers.add(new NodeSubscriptionImpl(node, jid,
@@ -229,4 +230,44 @@ public void testRemoteUserGetsPendingSubscriptionToLocalAccessModelNode()
 
 	}
 
+	@Test
+	public void testNoDefaultAffiliationConfigurationResultsInMemberAffiliation()
+			throws Exception {
+
+		Mockito.when(channelManager.getNodeConf(Mockito.anyString()))
+				.thenReturn(new HashMap<String, String>());
+
+		subscribe.process(element, new JID("[email protected]"), request,
+				null);
+
+		Mockito.verify(channelManager).setUserAffiliation(Mockito.anyString(),
+				Mockito.any(JID.class), Mockito.eq(Affiliations.member));
+
+		IQ response = (IQ) queue.poll();
+		Assert.assertEquals(IQ.Type.result, response.getType());
+
+	}
+
+	@Test
+	public void testDefaultAffiliationConfigurationResultsInCorrectAffiliation()
+			throws Exception {
+
+		Map<String, String> configuration = new HashMap<String, String>();
+		configuration.put(Conf.ACCESS_MODEL, AccessModel.open.toString());
+		configuration.put(Conf.DEFAULT_AFFILIATION,
+				Affiliations.publisher.toString());
+		Mockito.when(channelManager.getNodeConf(Mockito.anyString()))
+				.thenReturn(configuration);
+
+		subscribe.process(element, new JID("[email protected]"), request,
+				null);
+
+		Mockito.verify(channelManager).setUserAffiliation(Mockito.anyString(),
+				Mockito.any(JID.class), Mockito.eq(Affiliations.publisher));
+
+		IQ response = (IQ) queue.poll();
+		Assert.assertEquals(IQ.Type.result, response.getType());
+
+	}
+
 }