fix bitbucket SSO using UUID from bitbucket api response as ForgeRemo…

…teID (woodpecker-ci#3265)
quintoandar · Feb 1, 2024 · 76fba35 · 76fba35
1 parent d38e0cb
commit 76fba35
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/server/forge/bitbucket/convert.go b/server/forge/bitbucket/convert.go
@@ -137,7 +137,7 @@ func convertUser(from *internal.Account, token *oauth2.Token) *model.User {
 		Secret:        token.RefreshToken,
 		Expiry:        token.Expiry.UTC().Unix(),
 		Avatar:        from.Links.Avatar.Href,
-		ForgeRemoteID: model.ForgeRemoteID(fmt.Sprint(from.ID)),
+		ForgeRemoteID: model.ForgeRemoteID(fmt.Sprint(from.UUID)),
 	}
 }
 

diff --git a/server/forge/bitbucket/fixtures/handler.go b/server/forge/bitbucket/fixtures/handler.go
@@ -300,6 +300,7 @@ const pullRequestsPayload = `
 
 const userPayload = `
 {
+	"uuid": "{4d8c0f46-cd62-4b77-b0cf-faa3e4d932c6}",
   "username": "superman",
   "links": {
     "avatar": {

diff --git a/server/forge/bitbucket/internal/types.go b/server/forge/bitbucket/internal/types.go
@@ -21,7 +21,7 @@ import (
 )
 
 type Account struct {
-	ID    int64  `json:"id"`
+	UUID  string `json:"uuid"`
 	Login string `json:"username"`
 	Name  string `json:"display_name"`
 	Type  string `json:"type"`