From 36a1d375326293b176768d11a82937db30e63d92 Mon Sep 17 00:00:00 2001 From: oliverpool Date: Thu, 21 Mar 2024 14:03:15 +0100 Subject: [PATCH] [REFACTOR] webhook wechatwork endpoint --- routers/web/repo/setting/webhook.go | 21 --------------------- routers/web/web.go | 2 -- services/forms/repo_form.go | 12 ------------ services/webhook/wechatwork.go | 16 +++++++++++++++- 4 files changed, 15 insertions(+), 36 deletions(-) diff --git a/routers/web/repo/setting/webhook.go b/routers/web/repo/setting/webhook.go index b44da2510b..a1021c1967 100644 --- a/routers/web/repo/setting/webhook.go +++ b/routers/web/repo/setting/webhook.go @@ -388,27 +388,6 @@ func gogsHookParams(ctx *context.Context) webhookParams { } } -// WechatworkHooksNewPost response for creating Wechatwork webhook -func WechatworkHooksNewPost(ctx *context.Context) { - createWebhook(ctx, wechatworkHookParams(ctx)) -} - -// WechatworkHooksEditPost response for editing Wechatwork webhook -func WechatworkHooksEditPost(ctx *context.Context) { - editWebhook(ctx, wechatworkHookParams(ctx)) -} - -func wechatworkHookParams(ctx *context.Context) webhookParams { - form := web.GetForm(ctx).(*forms.NewWechatWorkHookForm) - - return webhookParams{ - Type: webhook_module.WECHATWORK, - URL: form.PayloadURL, - ContentType: webhook.ContentTypeJSON, - WebhookForm: form.WebhookForm, - } -} - // PackagistHooksNewPost response for creating Packagist webhook func PackagistHooksNewPost(ctx *context.Context) { createWebhook(ctx, packagistHookParams(ctx)) diff --git a/routers/web/web.go b/routers/web/web.go index fb4510af5b..81ff59499d 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -403,14 +403,12 @@ func registerRoutes(m *web.Route) { addWebhookAddRoutes := func() { m.Get("/{type}/new", repo_setting.WebhooksNew) m.Post("/gogs/new", web.Bind(forms.NewGogshookForm{}), repo_setting.GogsHooksNewPost) - m.Post("/wechatwork/new", web.Bind(forms.NewWechatWorkHookForm{}), repo_setting.WechatworkHooksNewPost) m.Post("/packagist/new", web.Bind(forms.NewPackagistHookForm{}), repo_setting.PackagistHooksNewPost) m.Post("/{type}/new", repo_setting.WebhookCreate) } addWebhookEditRoutes := func() { m.Post("/gogs/{id}", web.Bind(forms.NewGogshookForm{}), repo_setting.GogsHooksEditPost) - m.Post("/wechatwork/{id}", web.Bind(forms.NewWechatWorkHookForm{}), repo_setting.WechatworkHooksEditPost) m.Post("/packagist/{id}", web.Bind(forms.NewPackagistHookForm{}), repo_setting.PackagistHooksEditPost) m.Post("/{type}/{id:[0-9]+}", repo_setting.WebhookUpdate) } diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index a5c5bf3d16..e1d29943a0 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -292,18 +292,6 @@ func (f *NewGogshookForm) Validate(req *http.Request, errs binding.Errors) bindi return middleware.Validate(errs, ctx.Data, f, ctx.Locale) } -// NewWechatWorkHookForm form for creating wechatwork hook -type NewWechatWorkHookForm struct { - PayloadURL string `binding:"Required;ValidUrl"` - WebhookForm -} - -// Validate validates the fields -func (f *NewWechatWorkHookForm) Validate(req *http.Request, errs binding.Errors) binding.Errors { - ctx := context.GetValidateContext(req) - return middleware.Validate(errs, ctx.Data, f, ctx.Locale) -} - // NewPackagistHookForm form for creating packagist hook type NewPackagistHookForm struct { Username string `binding:"Required"` diff --git a/services/webhook/wechatwork.go b/services/webhook/wechatwork.go index 6d0b12b84b..2ad2acd018 100644 --- a/services/webhook/wechatwork.go +++ b/services/webhook/wechatwork.go @@ -13,6 +13,7 @@ import ( "code.gitea.io/gitea/modules/git" api "code.gitea.io/gitea/modules/structs" webhook_module "code.gitea.io/gitea/modules/webhook" + "code.gitea.io/gitea/services/forms" ) type wechatworkHandler struct{} @@ -21,7 +22,20 @@ func (wechatworkHandler) Type() webhook_module.HookType { return webhook_m func (wechatworkHandler) Metadata(*webhook_model.Webhook) any { return nil } func (wechatworkHandler) FormFields(bind func(any)) FormFields { - panic("TODO") + var form struct { + forms.WebhookForm + PayloadURL string `binding:"Required;ValidUrl"` + } + bind(&form) + + return FormFields{ + WebhookForm: form.WebhookForm, + URL: form.PayloadURL, + ContentType: webhook_model.ContentTypeJSON, + Secret: "", + HTTPMethod: http.MethodPost, + Metadata: nil, + } } type (