Bugfix in login check

datasetu · Sep 21, 2019 · 30fbbd9 · 30fbbd9
1 parent a9b65e3
commit 30fbbd9
Showing 1 changed file with 32 additions and 14 deletions.
diff --git a/iudx-api-server/src/main/java/iudx/http/HttpServerVerticle.java b/iudx-api-server/src/main/java/iudx/http/HttpServerVerticle.java
@@ -3817,29 +3817,47 @@ public void publish(HttpServerRequest req)
 
 			if(!pool.containsKey(id + ":" + apikey))
 			{
+				logger.debug("Pool does not contain key");
 				checkLogin(id, apikey)
 				.setHandler(login -> {
 
-					if(!login.succeeded())
-					{
-						forbidden(resp);
-						return;
-					}
+				if(!login.succeeded())
+				{
+					forbidden(resp);
+					return;
+				}
+
+				try
+				{
+					getChannel(id, apikey).basicPublish(exchange, topic, null, message.getBytes());
+				}
+				catch(Exception e)
+				{
+					error(resp, "Could not publish to broker");
+					return;
+				}
+
+				accepted(resp);
+				return;
 				});
 			}
-
-			try
-			{
-				getChannel(id, apikey).basicPublish(exchange, topic, null, message.getBytes());
-			}
-			catch(Exception e)
+			else
 			{
-				error(resp, "Could not publish to broker");
+				try
+				{
+					getChannel(id, apikey).basicPublish(exchange, topic, null, message.getBytes());
+				}
+				catch(Exception e)
+				{
+					error(resp, "Could not publish to broker");
+					return;
+				}
+
+				accepted(resp);
 				return;
+
 			}
 
-			accepted(resp);
-			return;
 		});
 	}