fix: ignore auth when using webhook

songquanpeng · Nov 10, 2024 · 981539b · 981539b
1 parent 431c0d6
commit 981539b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/controller/message.go b/controller/message.go
@@ -116,7 +116,7 @@ func pushMessageHelper(c *gin.Context, message *model.Message) {
 	if message.Token == "" {
 		message.Token = strings.TrimPrefix(c.Request.Header.Get("Authorization"), "Bearer ")
 	}
-	processMessage(c, message, &user)
+	processMessage(c, message, &user, true)
 }
 
 func authMessage(messageToken string, userToken string, channelToken *string) bool {
@@ -133,7 +133,7 @@ func authMessage(messageToken string, userToken string, channelToken *string) bo
 	return true
 }
 
-func processMessage(c *gin.Context, message *model.Message, user *model.User) {
+func processMessage(c *gin.Context, message *model.Message, user *model.User, needAuth bool) {
 	if message.Title == "" {
 		message.Title = common.SystemName
 	}
@@ -151,7 +151,7 @@ func processMessage(c *gin.Context, message *model.Message, user *model.User) {
 		})
 		return
 	}
-	if !authMessage(message.Token, user.Token, channel_.Token) {
+	if needAuth && !authMessage(message.Token, user.Token, channel_.Token) {
 		if message.Token == "" {
 			c.JSON(http.StatusUnauthorized, gin.H{
 				"success": false,

diff --git a/controller/webhook.go b/controller/webhook.go
@@ -258,5 +258,5 @@ func TriggerWebhook(c *gin.Context) {
 		Content:     constructRule.Content,
 		URL:         constructRule.URL,
 	}
-	processMessage(c, message, user)
+	processMessage(c, message, user, false)
 }