mirror of
https://github.com/songquanpeng/message-pusher.git
synced 2026-04-22 23:17:24 +08:00
fix: ignore auth when using webhook
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -258,5 +258,5 @@ func TriggerWebhook(c *gin.Context) {
|
||||
Content: constructRule.Content,
|
||||
URL: constructRule.URL,
|
||||
}
|
||||
processMessage(c, message, user)
|
||||
processMessage(c, message, user, false)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user