mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 19:38:23 +00:00 
			
		
		
		
	Refactor webhook and fix feishu/lark secret (#34961)
This commit is contained in:
		| @@ -198,7 +198,6 @@ type webhookParams struct { | ||||
|  | ||||
| 	URL         string | ||||
| 	ContentType webhook.HookContentType | ||||
| 	Secret      string | ||||
| 	HTTPMethod  string | ||||
| 	WebhookForm forms.WebhookForm | ||||
| 	Meta        any | ||||
| @@ -237,7 +236,7 @@ func createWebhook(ctx *context.Context, params webhookParams) { | ||||
| 		URL:             params.URL, | ||||
| 		HTTPMethod:      params.HTTPMethod, | ||||
| 		ContentType:     params.ContentType, | ||||
| 		Secret:          params.Secret, | ||||
| 		Secret:          params.WebhookForm.Secret, | ||||
| 		HookEvent:       ParseHookEvent(params.WebhookForm), | ||||
| 		IsActive:        params.WebhookForm.Active, | ||||
| 		Type:            params.Type, | ||||
| @@ -290,7 +289,7 @@ func editWebhook(ctx *context.Context, params webhookParams) { | ||||
|  | ||||
| 	w.URL = params.URL | ||||
| 	w.ContentType = params.ContentType | ||||
| 	w.Secret = params.Secret | ||||
| 	w.Secret = params.WebhookForm.Secret | ||||
| 	w.HookEvent = ParseHookEvent(params.WebhookForm) | ||||
| 	w.IsActive = params.WebhookForm.Active | ||||
| 	w.HTTPMethod = params.HTTPMethod | ||||
| @@ -336,7 +335,6 @@ func giteaHookParams(ctx *context.Context) webhookParams { | ||||
| 		Type:        webhook_module.GITEA, | ||||
| 		URL:         form.PayloadURL, | ||||
| 		ContentType: contentType, | ||||
| 		Secret:      form.Secret, | ||||
| 		HTTPMethod:  form.HTTPMethod, | ||||
| 		WebhookForm: form.WebhookForm, | ||||
| 	} | ||||
| @@ -364,7 +362,6 @@ func gogsHookParams(ctx *context.Context) webhookParams { | ||||
| 		Type:        webhook_module.GOGS, | ||||
| 		URL:         form.PayloadURL, | ||||
| 		ContentType: contentType, | ||||
| 		Secret:      form.Secret, | ||||
| 		WebhookForm: form.WebhookForm, | ||||
| 	} | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user