Skip to content

Commit 5bf7143

Browse files
toddy15toddy15
committed
Add packagist webhook
1 parent 54e9ee3 commit 5bf7143

File tree

20 files changed

+416
-3
lines changed

20 files changed

+416
-3
lines changed

‎docs/content/doc/features/webhooks.en-us.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ All event pushes are POST requests. The methods currently supported are:
2828
- Microsoft Teams
2929
- Feishu
3030
- Wechatwork
31+
- Packagist
3132

3233
### Event information
3334

‎docs/content/doc/features/webhooks.zh-cn.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@ Gitea 的存储 webhook。这可以有存储库管路设定页 `/:username/:repo
2727
- Microsoft Teams
2828
- Feishu
2929
- Wechatwork
30+
- Packagist
3031

3132
## TBD

‎docs/content/doc/features/webhooks.zh-tw.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Gitea 的儲存庫事件支援 web hook。這可以有儲存庫管理員在設
2727
- Microsoft Teams
2828
- Feishu
2929
- Wechatwork
30+
- Packagist
3031

3132
### 事件資訊
3233

‎models/webhook/webhook.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ const (
161161
FEISHU HookType = "feishu"
162162
MATRIX HookType = "matrix"
163163
WECHATWORK HookType = "wechatwork"
164+
PACKAGIST HookType = "packagist"
164165
)
165166

166167
// HookStatus is the status of a web hook

‎modules/setting/webhook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func newWebhookService() {
3636
Webhook.DeliverTimeout = sec.Key("DELIVER_TIMEOUT").MustInt(5)
3737
Webhook.SkipTLSVerify = sec.Key("SKIP_TLS_VERIFY").MustBool()
3838
Webhook.AllowedHostList = sec.Key("ALLOWED_HOST_LIST").MustString("")
39-
Webhook.Types = []string{"gitea", "gogs", "slack", "discord", "dingtalk", "telegram", "msteams", "feishu", "matrix", "wechatwork"}
39+
Webhook.Types = []string{"gitea", "gogs", "slack", "discord", "dingtalk", "telegram", "msteams", "feishu", "matrix", "wechatwork", "packagist"}
4040
Webhook.PagingNum = sec.Key("PAGING_NUM").MustInt(10)
4141
Webhook.ProxyURL = sec.Key("PROXY_URL").MustString("")
4242
if Webhook.ProxyURL != "" {

‎modules/structs/hook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type CreateHookOptionConfig map[string]string
4040
// CreateHookOption options when create a hook
4141
type CreateHookOption struct {
4242
// required: true
43-
// enum: dingtalk,discord,gitea,gogs,msteams,slack,telegram,feishu,wechatwork
43+
// enum: dingtalk,discord,gitea,gogs,msteams,slack,telegram,feishu,wechatwork,packagist
4444
Type string `json:"type" binding:"Required"`
4545
// required: true
4646
Config CreateHookOptionConfig `json:"config" binding:"Required"`

‎options/locale/locale_en-US.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1931,6 +1931,10 @@ settings.add_matrix_hook_desc = Integrate <a href="%s">Matrix</a> into your repo
19311931
settings.add_msteams_hook_desc = Integrate <a href="%s">Microsoft Teams</a> into your repository.
19321932
settings.add_feishu_hook_desc = Integrate <a href="%s">Feishu</a> into your repository.
19331933
settings.add_Wechat_hook_desc = Integrate <a href="%s">Wechatwork</a> into your repository.
1934+
settings.add_packagist_hook_desc = Integrate <a href="%s">Packagist</a> into your repository.
1935+
settings.packagist_username = Packagist username
1936+
settings.packagist_api_token = API token
1937+
settings.packagist_package_url = Packagist package URL
19341938
settings.deploy_keys = Deploy Keys
19351939
settings.add_deploy_key = Add Deploy Key
19361940
settings.deploy_key_desc = Deploy keys have read-only pull access to the repository.

‎public/img/packagist.png

4.47 KB
Loading

‎routers/web/repo/webhook.go

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,59 @@ func WechatworkHooksNewPost(ctx *context.Context) {
682682
ctx.Redirect(orCtx.Link)
683683
}
684684

685+
// PackagistHooksNewPost response for creating packagist hook
686+
func PackagistHooksNewPost(ctx *context.Context) {
687+
form := web.GetForm(ctx).(*forms.NewPackagistHookForm)
688+
ctx.Data["Title"] = ctx.Tr("repo.settings")
689+
ctx.Data["PageIsSettingsHooks"] = true
690+
ctx.Data["PageIsSettingsHooksNew"] = true
691+
ctx.Data["Webhook"] = webhook.Webhook{HookEvent: &webhook.HookEvent{}}
692+
ctx.Data["HookType"] = webhook.PACKAGIST
693+
694+
orCtx, err := getOrgRepoCtx(ctx)
695+
if err != nil {
696+
ctx.ServerError("getOrgRepoCtx", err)
697+
return
698+
}
699+
700+
if ctx.HasError() {
701+
ctx.HTML(http.StatusOK, orCtx.NewTemplate)
702+
return
703+
}
704+
705+
meta, err := json.Marshal(&webhook_service.PackagistMeta{
706+
Username: form.Username,
707+
APIToken: form.APIToken,
708+
PackageURL: form.PackageURL,
709+
})
710+
if err != nil {
711+
ctx.ServerError("Marshal", err)
712+
return
713+
}
714+
715+
w := &webhook.Webhook{
716+
RepoID: orCtx.RepoID,
717+
URL: fmt.Sprintf("https://packagist.org/api/update-package?username=%s&apiToken=%s", url.QueryEscape(form.Username), url.QueryEscape(form.APIToken)),
718+
ContentType: webhook.ContentTypeJSON,
719+
HookEvent: ParseHookEvent(form.WebhookForm),
720+
IsActive: form.Active,
721+
Type: webhook.PACKAGIST,
722+
Meta: string(meta),
723+
OrgID: orCtx.OrgID,
724+
IsSystemWebhook: orCtx.IsSystemWebhook,
725+
}
726+
if err := w.UpdateEvent(); err != nil {
727+
ctx.ServerError("UpdateEvent", err)
728+
return
729+
} else if err := webhook.CreateWebhook(db.DefaultContext, w); err != nil {
730+
ctx.ServerError("CreateWebhook", err)
731+
return
732+
}
733+
734+
ctx.Flash.Success(ctx.Tr("repo.settings.add_hook_success"))
735+
ctx.Redirect(orCtx.Link)
736+
}
737+
685738
func checkWebhook(ctx *context.Context) (*orgRepoCtx, *webhook.Webhook) {
686739
ctx.Data["RequireHighlightJS"] = true
687740

@@ -719,6 +772,8 @@ func checkWebhook(ctx *context.Context) (*orgRepoCtx, *webhook.Webhook) {
719772
ctx.Data["TelegramHook"] = webhook_service.GetTelegramHook(w)
720773
case webhook.MATRIX:
721774
ctx.Data["MatrixHook"] = webhook_service.GetMatrixHook(w)
775+
case webhook.PACKAGIST:
776+
ctx.Data["PackagistHook"] = webhook_service.GetPackagistHook(w)
722777
}
723778

724779
ctx.Data["History"], err = w.History(1)
@@ -1137,6 +1192,50 @@ func WechatworkHooksEditPost(ctx *context.Context) {
11371192
ctx.Redirect(fmt.Sprintf("%s/%d", orCtx.Link, w.ID))
11381193
}
11391194

1195+
// PackagistHooksEditPost response for editing packagist hook
1196+
func PackagistHooksEditPost(ctx *context.Context) {
1197+
form := web.GetForm(ctx).(*forms.NewPackagistHookForm)
1198+
ctx.Data["Title"] = ctx.Tr("repo.settings")
1199+
ctx.Data["PageIsSettingsHooks"] = true
1200+
ctx.Data["PageIsSettingsHooksEdit"] = true
1201+
1202+
orCtx, w := checkWebhook(ctx)
1203+
if ctx.Written() {
1204+
return
1205+
}
1206+
ctx.Data["Webhook"] = w
1207+
1208+
if ctx.HasError() {
1209+
ctx.HTML(http.StatusOK, orCtx.NewTemplate)
1210+
return
1211+
}
1212+
1213+
meta, err := json.Marshal(&webhook_service.PackagistMeta{
1214+
Username: form.Username,
1215+
APIToken: form.APIToken,
1216+
PackageURL: form.PackageURL,
1217+
})
1218+
if err != nil {
1219+
ctx.ServerError("Marshal", err)
1220+
return
1221+
}
1222+
1223+
w.Meta = string(meta)
1224+
w.URL = fmt.Sprintf("https://packagist.org/api/update-package?username=%s&apiToken=%s", url.QueryEscape(form.Username), url.QueryEscape(form.APIToken))
1225+
w.HookEvent = ParseHookEvent(form.WebhookForm)
1226+
w.IsActive = form.Active
1227+
if err := w.UpdateEvent(); err != nil {
1228+
ctx.ServerError("UpdateEvent", err)
1229+
return
1230+
} else if err := webhook.UpdateWebhook(w); err != nil {
1231+
ctx.ServerError("UpdateWebhook", err)
1232+
return
1233+
}
1234+
1235+
ctx.Flash.Success(ctx.Tr("repo.settings.update_hook_success"))
1236+
ctx.Redirect(fmt.Sprintf("%s/%d", orCtx.Link, w.ID))
1237+
}
1238+
11401239
// TestWebhook test if web hook is work fine
11411240
func TestWebhook(ctx *context.Context) {
11421241
hookID := ctx.ParamsInt64(":id")

‎routers/web/web.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,7 @@ func RegisterRoutes(m *web.Route) {
445445
m.Post("/msteams/{id}", bindIgnErr(forms.NewMSTeamsHookForm{}), repo.MSTeamsHooksEditPost)
446446
m.Post("/feishu/{id}", bindIgnErr(forms.NewFeishuHookForm{}), repo.FeishuHooksEditPost)
447447
m.Post("/wechatwork/{id}", bindIgnErr(forms.NewWechatWorkHookForm{}), repo.WechatworkHooksEditPost)
448+
m.Post("/packagist/{id}", bindIgnErr(forms.NewPackagistHookForm{}), repo.PackagistHooksEditPost)
448449
}, webhooksEnabled)
449450

450451
m.Group("/{configType:default-hooks|system-hooks}", func() {
@@ -459,6 +460,7 @@ func RegisterRoutes(m *web.Route) {
459460
m.Post("/msteams/new", bindIgnErr(forms.NewMSTeamsHookForm{}), repo.MSTeamsHooksNewPost)
460461
m.Post("/feishu/new", bindIgnErr(forms.NewFeishuHookForm{}), repo.FeishuHooksNewPost)
461462
m.Post("/wechatwork/new", bindIgnErr(forms.NewWechatWorkHookForm{}), repo.WechatworkHooksNewPost)
463+
m.Post("/packagist/new", bindIgnErr(forms.NewPackagistHookForm{}), repo.PackagistHooksNewPost)
462464
})
463465

464466
m.Group("/auths", func() {
@@ -654,6 +656,7 @@ func RegisterRoutes(m *web.Route) {
654656
m.Post("/msteams/new", bindIgnErr(forms.NewMSTeamsHookForm{}), repo.MSTeamsHooksNewPost)
655657
m.Post("/feishu/new", bindIgnErr(forms.NewFeishuHookForm{}), repo.FeishuHooksNewPost)
656658
m.Post("/wechatwork/new", bindIgnErr(forms.NewWechatWorkHookForm{}), repo.WechatworkHooksNewPost)
659+
m.Post("/packagist/new", bindIgnErr(forms.NewPackagistHookForm{}), repo.PackagistHooksNewPost)
657660
m.Group("/{id}", func() {
658661
m.Get("", repo.WebHooksEdit)
659662
m.Post("/test", repo.TestWebhook)
@@ -669,6 +672,7 @@ func RegisterRoutes(m *web.Route) {
669672
m.Post("/msteams/{id}", bindIgnErr(forms.NewMSTeamsHookForm{}), repo.MSTeamsHooksEditPost)
670673
m.Post("/feishu/{id}", bindIgnErr(forms.NewFeishuHookForm{}), repo.FeishuHooksEditPost)
671674
m.Post("/wechatwork/{id}", bindIgnErr(forms.NewWechatWorkHookForm{}), repo.WechatworkHooksEditPost)
675+
m.Post("/packagist/{id}", bindIgnErr(forms.NewPackagistHookForm{}), repo.PackagistHooksEditPost)
672676
}, webhooksEnabled)
673677

674678
m.Group("/keys", func() {

0 commit comments

Comments
 (0)