Don't set the authorization headers on webhook/interactions related routes

germanoeich/nirn-proxy#23

Author: MrPowerGamerBR

src/main/java/net/dv8tion/jda/api/requests/Route.java

@@ -356,6 +356,27 @@ public static class Templates {
         public static final Route GET_GUILD_TEMPLATES = new Route(GET, "guilds/{guild_id}/templates");
     }
 
+    // Looks very nasty because JDA still requires Java 8 support
+    private static final Set<Route> ROUTES_WITHOUT_TOKEN = new HashSet<>(
+            Arrays.asList(
+                    Webhooks.GET_TOKEN_WEBHOOK,
+                    Webhooks.DELETE_TOKEN_WEBHOOK,
+                    Webhooks.MODIFY_TOKEN_WEBHOOK,
+                    Webhooks.EXECUTE_WEBHOOK,
+                    Webhooks.EXECUTE_WEBHOOK_FETCH,
+                    Webhooks.EXECUTE_WEBHOOK_EDIT,
+                    Webhooks.EXECUTE_WEBHOOK_DELETE,
+                    Webhooks.EXECUTE_WEBHOOK_SLACK,
+                    Webhooks.EXECUTE_WEBHOOK_GITHUB,
+
+                    Interactions.CALLBACK,
+                    Interactions.CREATE_FOLLOWUP,
+                    Interactions.EDIT_FOLLOWUP,
+                    Interactions.DELETE_FOLLOWUP,
+                    Interactions.GET_MESSAGE
+            )
+    );
+    
     /**
      * Create a route template for the given HTTP method.
      *
@@ -626,6 +647,15 @@ public boolean isInteractionBucket() {
         return isInteraction;
     }
 
+    /**
+     * Whether this route should include the bot token in the authorization header.
+     *
+     * @return True, if this route should include the bot token in the header
+     */
+    public boolean includeTokenInHeader() {
+        return !ROUTES_WITHOUT_TOKEN.contains(this);
+    }
+
     /**
      * The {@link Method} of this route template.
      * <br>Multiple routes with different HTTP methods can share a rate-limit.

src/main/java/net/dv8tion/jda/internal/requests/Requester.java

@@ -295,9 +295,13 @@ private void applyBody(Request<?> apiRequest, okhttp3.Request.Builder builder) {
     private void applyHeaders(Request<?> apiRequest, okhttp3.Request.Builder builder) {
         builder.header("user-agent", userAgent)
                 .header("accept-encoding", "gzip")
-                .header("authorization", authConfig.getToken())
                 .header("x-ratelimit-precision", "millisecond"); // still sending this in case of regressions
 
+        // Only add bot token for routes that do use token-based authentication
+        if (apiRequest.getRoute().getBaseRoute().includeTokenInHeader()) {
+            builder.header("authorization", authConfig.getToken());
+        }
+
         // Apply custom headers like X-Audit-Log-Reason
         // If customHeaders is null this does nothing
         if (apiRequest.getHeaders() != null) {