Skip to content

Commit 981539b

Browse files
committedNov 10, 2024·
fix: ignore auth when using webhook
1 parent 431c0d6 commit 981539b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed
 

‎controller/message.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func pushMessageHelper(c *gin.Context, message *model.Message) {
116116
if message.Token == "" {
117117
message.Token = strings.TrimPrefix(c.Request.Header.Get("Authorization"), "Bearer ")
118118
}
119-
processMessage(c, message, &user)
119+
processMessage(c, message, &user, true)
120120
}
121121

122122
func authMessage(messageToken string, userToken string, channelToken *string) bool {
@@ -133,7 +133,7 @@ func authMessage(messageToken string, userToken string, channelToken *string) bo
133133
return true
134134
}
135135

136-
func processMessage(c *gin.Context, message *model.Message, user *model.User) {
136+
func processMessage(c *gin.Context, message *model.Message, user *model.User, needAuth bool) {
137137
if message.Title == "" {
138138
message.Title = common.SystemName
139139
}
@@ -151,7 +151,7 @@ func processMessage(c *gin.Context, message *model.Message, user *model.User) {
151151
})
152152
return
153153
}
154-
if !authMessage(message.Token, user.Token, channel_.Token) {
154+
if needAuth && !authMessage(message.Token, user.Token, channel_.Token) {
155155
if message.Token == "" {
156156
c.JSON(http.StatusUnauthorized, gin.H{
157157
"success": false,

‎controller/webhook.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,5 +258,5 @@ func TriggerWebhook(c *gin.Context) {
258258
Content: constructRule.Content,
259259
URL: constructRule.URL,
260260
}
261-
processMessage(c, message, user)
261+
processMessage(c, message, user, false)
262262
}

0 commit comments

Comments
 (0)
Please sign in to comment.