Support for pull requests opened events from forked repositories

server/forge/bitbucketdatacenter/bitbucketdatacenter.go

@@ -477,40 +477,28 @@ func (c *client) Deactivate(ctx context.Context, u *model.User, r *model.Repo, l
 }
 
 func (c *client) Hook(ctx context.Context, r *http.Request) (*model.Repo, *model.Pipeline, error) {
-	ev, payload, err := bb.ParsePayloadWithoutSignature(r)
+	hook, err := parseHook(r, c.url)
 	if err != nil {
-		return nil, nil, fmt.Errorf("unable to parse payload from webhook invocation: %w", err)
+		return nil, nil, fmt.Errorf("unable to parse hook: %w", err)
 	}
 
-	var repo *model.Repo
-	var pipe *model.Pipeline
-
-	switch e := ev.(type) {
-	case *bb.RepositoryPushEvent:
-		repo = convertRepo(&e.Repository, nil, "")
-		pipe = convertRepositoryPushEvent(e, c.url)
-	case *bb.PullRequestEvent:
-		repo = convertRepo(&e.PullRequest.Source.Repository, nil, "")
-		pipe = convertPullRequestEvent(e, c.url)
-	default:
-		return nil, nil, nil
-	}
-
-	user, repo, err := c.getUserAndRepo(ctx, repo)
+	user, repo, err := c.getUserAndRepo(ctx, hook.Repo)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to get user and repo: %w", err)
 	}
 
-	err = bb.ValidateSignature(r, payload, []byte(repo.Hash))
+	err = bb.ValidateSignature(r, hook.Payload, []byte(repo.Hash))
 	if err != nil {
 		return nil, nil, fmt.Errorf("unable to validate signature on incoming webhook payload: %w", err)
 	}
 
-	switch e := ev.(type) {
+	var pipe *model.Pipeline
+
+	switch e := hook.Event.(type) {
 	case *bb.RepositoryPushEvent:
-		pipe, err = c.updatePipelineFromCommit(ctx, user, repo, pipe)
+		pipe, err = c.updatePipelineFromCommit(ctx, user, repo, hook.Pipeline)
 	case *bb.PullRequestEvent:
-		pipe, err = c.updatePipelineFromPullRequest(ctx, user, repo, pipe, e.PullRequest.ID)
+		pipe, err = c.updatePipelineFromPullRequest(ctx, user, repo, hook.Pipeline, e.PullRequest.ID)
 	}
 
 	if err != nil {

server/forge/bitbucketdatacenter/fixtures/HookPullRequestMerged.json

@@ -0,0 +1,181 @@
+{
+  "date": "2025-09-11T14:53:09+0300",
+  "actor": {
+    "emailAddress": "john.doe@example.com",
+    "displayName": "EXT Doe John",
+    "name": "john.doe@example.com",
+    "active": true,
+    "links": { "self": [{ "href": "https://bitbucket.example.com/users/john.doe_example.com" }] },
+    "id": 13581,
+    "type": "NORMAL",
+    "slug": "john.doe_example.com"
+  },
+  "eventKey": "pr:merged",
+  "pullRequest": {
+    "author": {
+      "approved": false,
+      "role": "AUTHOR",
+      "user": {
+        "emailAddress": "john.doe@example.com",
+        "displayName": "EXT Doe John",
+        "name": "john.doe@example.com",
+        "active": true,
+        "links": { "self": [{ "href": "https://bitbucket.example.com/users/john.doe_example.com" }] },
+        "id": 13581,
+        "type": "NORMAL",
+        "slug": "john.doe_example.com"
+      },
+      "status": "UNAPPROVED"
+    },
+    "description": "Updates ArgoCD to version where the CVE is patched.",
+    "updatedDate": 1757591589232,
+    "title": "chore(CVE-2025-55190): bump argocd",
+    "version": 2,
+    "reviewers": [
+      {
+        "approved": false,
+        "role": "REVIEWER",
+        "user": {
+          "emailAddress": "jane.smith@contractor.com",
+          "displayName": "EXT Smith Jane",
+          "name": "jane.smith@contractor.com",
+          "active": true,
+          "links": { "self": [{ "href": "https://bitbucket.example.com/users/jane.smith_contractor.com" }] },
+          "id": 9374,
+          "type": "NORMAL",
+          "slug": "jane.smith_contractor.com"
+        },
+        "status": "UNAPPROVED"
+      },
+      {
+        "approved": false,
+        "role": "REVIEWER",
+        "user": {
+          "emailAddress": "mike.johnson@vendor.com",
+          "displayName": "EXT Johnson Mike",
+          "name": "mike.johnson@vendor.com",
+          "active": true,
+          "links": { "self": [{ "href": "https://bitbucket.example.com/users/mike.johnson_vendor.com" }] },
+          "id": 15107,
+          "type": "NORMAL",
+          "slug": "mike.johnson_vendor.com"
+        },
+        "status": "UNAPPROVED"
+      },
+      {
+        "approved": true,
+        "role": "REVIEWER",
+        "user": {
+          "emailAddress": "alex.brown@freelance.com",
+          "displayName": "EXT Brown Alex",
+          "name": "alex.brown@freelance.com",
+          "active": true,
+          "links": { "self": [{ "href": "https://bitbucket.example.com/users/alex.brown_freelance.com" }] },
+          "id": 13360,
+          "type": "NORMAL",
+          "slug": "alex.brown_freelance.com"
+        },
+        "lastReviewedCommit": "993203acecdb65ffe947424d0917768b0e5c3903",
+        "status": "APPROVED"
+      }
+    ],
+    "toRef": {
+      "latestCommit": "2bbf6d0c36db47566a934ab8f8e391e1ee54d392",
+      "id": "refs/heads/master",
+      "displayId": "master",
+      "type": "BRANCH",
+      "repository": {
+        "archived": false,
+        "public": false,
+        "hierarchyId": "da7793ace13b18fa55a5",
+        "name": "deployment-automation",
+        "forkable": true,
+        "project": {
+          "public": false,
+          "name": "devops-team",
+          "description": "DevOps Team",
+          "links": { "self": [{ "href": "https://bitbucket.example.com/projects/DEV" }] },
+          "id": 565,
+          "type": "NORMAL",
+          "key": "DEV"
+        },
+        "links": {
+          "clone": [
+            {
+              "name": "http",
+              "href": "https://bitbucket.example.com/scm/dev/deployment-automation.git"
+            },
+            {
+              "name": "ssh",
+              "href": "ssh://git@bitbucket.example.com:7999/dev/deployment-automation.git"
+            }
+          ],
+          "self": [{ "href": "https://bitbucket.example.com/projects/DEV/repos/deployment-automation/browse" }]
+        },
+        "id": 1684,
+        "scmId": "git",
+        "state": "AVAILABLE",
+        "slug": "deployment-automation",
+        "statusMessage": "Available"
+      }
+    },
+    "createdDate": 1757571094582,
+    "closedDate": 1757591589232,
+    "draft": false,
+    "closed": true,
+    "fromRef": {
+      "latestCommit": "993203acecdb65ffe947424d0917768b0e5c3903",
+      "id": "refs/heads/PROJ-4584",
+      "displayId": "PROJ-4584",
+      "type": "BRANCH",
+      "repository": {
+        "archived": false,
+        "public": false,
+        "hierarchyId": "da7793ace13b18fa55a5",
+        "name": "deployment-automation",
+        "forkable": true,
+        "project": {
+          "public": false,
+          "name": "devops-team",
+          "description": "DevOps Team",
+          "links": { "self": [{ "href": "https://bitbucket.example.com/projects/DEV" }] },
+          "id": 565,
+          "type": "NORMAL",
+          "key": "DEV"
+        },
+        "links": {
+          "clone": [
+            {
+              "name": "http",
+              "href": "https://bitbucket.example.com/scm/dev/deployment-automation.git"
+            },
+            {
+              "name": "ssh",
+              "href": "ssh://git@bitbucket.example.com:7999/dev/deployment-automation.git"
+            }
+          ],
+          "self": [{ "href": "https://bitbucket.example.com/projects/DEV/repos/deployment-automation/browse" }]
+        },
+        "id": 1684,
+        "scmId": "git",
+        "state": "AVAILABLE",
+        "slug": "deployment-automation",
+        "statusMessage": "Available"
+      }
+    },
+    "links": {
+      "self": [{ "href": "https://bitbucket.example.com/projects/DEV/repos/deployment-automation/pull-requests/111" }]
+    },
+    "id": 111,
+    "state": "MERGED",
+    "locked": false,
+    "open": false,
+    "properties": {
+      "mergeCommit": {
+        "id": "c690da9e7f6a6d90defe03d57b8802df149c4aff",
+        "displayId": "c690da9e7f6"
+      }
+    },
+    "participants": []
+  }
+}