Make sure the authorization is sent if present

Author: WalshyDev

Server/src/main/java/stream/flarebot/webhook_distributor/server/Delivery.java

@@ -7,11 +7,13 @@ public class Delivery {
 
     private String ip;
     private String userAgent;
+    private String authorization;
     private JsonElement payload;
 
-    Delivery(String ip, String userAgent, JsonElement payload) {
+    Delivery(String ip, String userAgent, String authorization, JsonElement payload) {
         this.ip = ip;
         this.userAgent = userAgent;
+        this.authorization = authorization;
         this.payload = payload;
     }
 
@@ -27,6 +29,10 @@ public JsonElement getPayload() {
         return payload;
     }
 
+    public String getAuthorization() {
+        return authorization;
+    }
+
     public boolean isBatch() {
         return payload instanceof JsonArray && ((JsonArray) payload).size() > 1;
     }

Server/src/main/java/stream/flarebot/webhook_distributor/server/DistributorServer.java

@@ -139,7 +139,7 @@ private void setupRoutes() {
                 return getBadRequest(res, "No body specified!");
 
             JsonElement element = parser.parse(req.body());
-            Delivery delivery = new Delivery(req.ip(), req.userAgent(), element);
+            Delivery delivery = new Delivery(req.ip(), req.userAgent(), req.headers("Authorization"), element);
 
             if (!services.containsKey(serviceName)) {
                 logger.warn("Got webhook event for non-active service. Queued webhook");
@@ -218,11 +218,14 @@ private boolean sendDelivery(String service, Delivery delivery) {
         logger.info("Sending delivery to " + url);
 
         try {
-            com.squareup.okhttp.Response response = client.newCall(new Request.Builder().url(url)
+            Request.Builder builder = new Request.Builder().url(url)
                     .addHeader("User-Agent", delivery.getUserAgent())
                     .addHeader("Sent-By", delivery.getIp())
-                    .post(RequestBody.create(MediaType.parse("application/json"), delivery.getPayload().toString()))
-                    .build()).execute();
+                    .post(RequestBody.create(MediaType.parse("application/json"), delivery.getPayload().toString()));
+
+            if (delivery.getAuthorization() != null && !delivery.getAuthorization().isEmpty())
+                builder.addHeader("Authorization", delivery.getAuthorization());
+            com.squareup.okhttp.Response response = client.newCall(builder.build()).execute();
 
             if (response.code() != 200) {
                 ResponseBody body = response.body();