Fixed whitelisting of users and channels

Author: gustavkarlsson

src/main/java/se/gustavkarlsson/rocketchat/jira_trigger/routes/DetectIssueRoute.java

@@ -22,7 +22,6 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static java.util.Arrays.stream;
 import static org.apache.commons.lang3.Validate.notNull;
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -44,10 +43,6 @@ public DetectIssueRoute(RocketChatConfiguration config, IssueRestClient issueCli
 		this.jiraKeyParser = notNull(jiraKeyParser);
 	}
 
-	private static boolean isAllowed(Collection<String> blacklist, Collection<String> whitelist, String... values) {
-		return stream(values).allMatch((value) -> isAllowed(blacklist, whitelist, value));
-	}
-
 	private static boolean isAllowed(Collection<String> blacklist, Collection<String> whitelist, String value) {
 		return !blacklist.contains(value) && (whitelist.isEmpty() || whitelist.contains(value));
 	}
@@ -56,23 +51,33 @@ private static boolean isNotFound(com.google.common.base.Optional<Integer> statu
 		return statusCode.isPresent() && statusCode.get() == HttpStatus.NOT_FOUND_404;
 	}
 
+	private Issue getJiraIssue(String jiraKey) {
+		Promise<Issue> issuePromise = issueClient.getIssue(jiraKey);
+		try {
+			return issuePromise.claim();
+		} catch (RestClientException e) {
+			if (isNotFound(e.getStatusCode())) {
+				return null;
+			}
+			throw e;
+		}
+	}
+
 	@Override
 	protected ToRocketChatMessage handle(Request request, Response response, FromRocketChatMessage fromRocketChatMessage) throws Exception {
 		String token = fromRocketChatMessage.getToken();
 		if (!config.getTokens().isEmpty() && !config.getTokens().contains(token)) {
 			log.info("Forbidden token encountered: {}. Ignoring", token);
 			return null;
 		}
-		String userId = fromRocketChatMessage.getUserId();
 		String userName = fromRocketChatMessage.getUserName();
-		if (!isAllowed(config.getBlacklistedUsers(), config.getWhitelistedUsers(), userId, userName)) {
-			log.info("Forbidden user encountered. ID: {}, Name: {}. Ignoring", userId, userName);
+		if (!isAllowed(config.getBlacklistedUsers(), config.getWhitelistedUsers(), userName)) {
+			log.info("Forbidden user encountered: {}. Ignoring", userName);
 			return null;
 		}
-		String channelId = fromRocketChatMessage.getChannelId();
 		String channelName = fromRocketChatMessage.getChannelName();
-		if (!isAllowed(config.getBlacklistedChannels(), config.getWhitelistedChannels(), channelId, channelName)) {
-			log.info("Forbidden channel encountered. ID: {}, Name: {}. Ignoring", channelId, channelName);
+		if (!isAllowed(config.getBlacklistedChannels(), config.getWhitelistedChannels(), channelName)) {
+			log.info("Forbidden channel encountered: {}. Ignoring", channelName);
 			return null;
 		}
 		log.info("Message is being processed...");
@@ -103,17 +108,4 @@ protected ToRocketChatMessage handle(Request request, Response response, FromRoc
 		message.setAttachments(attachments);
 		return message;
 	}
-
-	private Issue getJiraIssue(String jiraKey) {
-		Promise<Issue> issuePromise = issueClient.getIssue(jiraKey);
-		try {
-			return issuePromise.claim();
-		} catch (RestClientException e) {
-			if (isNotFound(e.getStatusCode())) {
-				return null;
-			}
-			throw e;
-		}
-	}
-
 }