fix(webhook): Fix parsing hooks from several providers

bleenco · Apr 14, 2022 · 6f4b65a · 6f4b65a
1 parent 43bcc4f
commit 6f4b65a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/server/service/githook/parser.go b/server/service/githook/parser.go
@@ -36,9 +36,6 @@ func (p *parser) Parse(req *http.Request, secretFunc func(string) *core.Reposito
 	}
 
 	payload, err := p.client.Webhooks.Parse(req, fn)
-	if err == scm.ErrUnknownEvent {
-		return nil, nil, nil
-	}
 	if err != nil {
 		return nil, nil, err
 	}

diff --git a/server/store/repo/repo.go b/server/store/repo/repo.go
@@ -252,6 +252,21 @@ func filterHooks(hooks []*scm.Hook, provider core.Provider) []*scm.Hook {
 	for _, hook := range hooks {
 		url, _ := url.Parse(hook.Target)
 		if strings.HasPrefix(hook.Target, provider.Host) && strings.HasSuffix(url.Path, "/webhooks") {
+			if provider.Name == "stash" {
+				stashMap := map[string]string{
+					"pr:merged":         "pull_request",
+					"pr:modified":       "pull_request",
+					"pr:opened":         "pull_request",
+					"repo:refs_changed": "push",
+				}
+				mappedEvents := make([]string, 0)
+				for _, event := range hook.Events {
+					if stashMap[event] != "" {
+						mappedEvents = append(mappedEvents, stashMap[event])
+					}
+				}
+				hook.Events = mappedEvents
+			}
 			webhooks = append(webhooks, hook)
 		}
 	}

diff --git a/web/abstruse/src/app/providers/providers-modal/providers-modal.component.ts b/web/abstruse/src/app/providers/providers-modal/providers-modal.component.ts
@@ -46,8 +46,6 @@ export class ProvidersModalComponent implements OnInit {
 
     this.error = null;
     this.saving = true;
-    console.log('im here');
-    console.log(this.form.controls);
     let data: any = {
       name: this.form.controls.name.value,
       url: this.form.controls.url.value,