#401 webhook 발송시 token 값이 있는 경우에만 Header 에 추가하도록 수정

yona-projects · Aug 3, 2020 · 9fbeeee · 9fbeeee
1 parent 9b8b452
commit 9fbeeee
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/app/models/Webhook.java b/app/models/Webhook.java
@@ -12,6 +12,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import org.eclipse.jgit.revwalk.RevCommit;
+import org.apache.commons.lang3.StringUtils;
 
 import models.enumeration.EventType;
 import models.enumeration.PullRequestReviewAction;
@@ -546,10 +547,12 @@ private void sendRequest(String payload) {
         play.Logger.info(payload);
         try {
             WSRequestHolder requestHolder = WS.url(this.payloadUrl);
+            if (StringUtils.isNotBlank(this.secret)) {
+                requestHolder.setHeader("Authorization", "token " + this.secret);
+            }
             requestHolder
                     .setHeader("Content-Type", "application/json")
                     .setHeader("User-Agent", "Yobi-Hookshot")
-                    .setHeader("Authorization", "token " + this.secret)
                     .post(payload)
                     .map(
                             new Function<WSResponse, Integer>() {
@@ -575,10 +578,12 @@ private void sendRequest(String payload, Long webhookId, Resource resource) {
         play.Logger.info(payload);
         try {
             WSRequestHolder requestHolder = WS.url(this.payloadUrl);
+            if (StringUtils.isNotBlank(this.secret)) {
+                requestHolder.setHeader("Authorization", "token " + this.secret);
+            }
             requestHolder
                     .setHeader("Content-Type", "application/json")
                     .setHeader("User-Agent", "Yobi-Hookshot")
-                    .setHeader("Authorization", "token " + this.secret)
                     .post(payload)
                     .map(
                             new Function<WSResponse, Integer>() {