Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dex
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hdacloud
dex
Commits
d5f2651d
Unverified
Commit
d5f2651d
authored
3 years ago
by
Maksim Nabokikh
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #2397 from dexidp/backport-2390
Backport #2390: Replace /teams API w/ /workspaces endpoints
parents
6e30b362
244be095
Branches
v2.30.x
Tags
v2.30.3
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
connector/bitbucketcloud/bitbucketcloud.go
+12
-12
12 additions, 12 deletions
connector/bitbucketcloud/bitbucketcloud.go
connector/bitbucketcloud/bitbucketcloud_test.go
+13
-13
13 additions, 13 deletions
connector/bitbucketcloud/bitbucketcloud_test.go
with
25 additions
and
25 deletions
connector/bitbucketcloud/bitbucketcloud.go
+
12
−
12
View file @
d5f2651d
...
...
@@ -351,7 +351,7 @@ func (b *bitbucketConnector) userEmail(ctx context.Context, client *http.Client)
// getGroups retrieves Bitbucket teams a user is in, if any.
func
(
b
*
bitbucketConnector
)
getGroups
(
ctx
context
.
Context
,
client
*
http
.
Client
,
groupScope
bool
,
userLogin
string
)
([]
string
,
error
)
{
bitbucketTeams
,
err
:=
b
.
user
Team
s
(
ctx
,
client
)
bitbucketTeams
,
err
:=
b
.
user
Workspace
s
(
ctx
,
client
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
@@ -369,33 +369,33 @@ func (b *bitbucketConnector) getGroups(ctx context.Context, client *http.Client,
return
nil
,
nil
}
type
teamName
struct
{
Name
string
`json:"
username"`
// The "username" from Bitbucket Cloud is actually the team name here
type
workspaceSlug
struct
{
Slug
string
`json:"
slug"`
}
type
team
struct
{
Team
teamName
`json:"team
"`
type
workspace
struct
{
Workspace
workspaceSlug
`json:"workspace
"`
}
type
user
Team
sResponse
struct
{
type
user
Workspace
sResponse
struct
{
pagedResponse
Values
[]
team
Values
[]
workspace
`json:"values"`
}
func
(
b
*
bitbucketConnector
)
user
Team
s
(
ctx
context
.
Context
,
client
*
http
.
Client
)
([]
string
,
error
)
{
func
(
b
*
bitbucketConnector
)
user
Workspace
s
(
ctx
context
.
Context
,
client
*
http
.
Client
)
([]
string
,
error
)
{
var
teams
[]
string
apiURL
:=
b
.
apiURL
+
"/user/permissions/
team
s"
apiURL
:=
b
.
apiURL
+
"/user/permissions/
workspace
s"
for
{
// https://developer.atlassian.com/bitbucket/
api/2/reference/resource/user/permissions/teams
var
response
user
Team
sResponse
// https://developer.atlassian.com/
cloud/
bitbucket/
rest/api-group-workspaces/#api-workspaces-get
var
response
user
Workspace
sResponse
if
err
:=
get
(
ctx
,
client
,
apiURL
,
&
response
);
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"bitbucket: get user teams: %v"
,
err
)
}
for
_
,
value
:=
range
response
.
Values
{
teams
=
append
(
teams
,
value
.
Team
.
Name
)
teams
=
append
(
teams
,
value
.
Workspace
.
Slug
)
}
if
response
.
Next
==
nil
{
...
...
This diff is collapsed.
Click to expand it.
connector/bitbucketcloud/bitbucketcloud_test.go
+
13
−
13
View file @
d5f2651d
...
...
@@ -14,28 +14,28 @@ import (
)
func
TestUserGroups
(
t
*
testing
.
T
)
{
teamsResponse
:=
user
Team
sResponse
{
teamsResponse
:=
user
Workspace
sResponse
{
pagedResponse
:
pagedResponse
{
Size
:
3
,
Page
:
1
,
PageLen
:
10
,
},
Values
:
[]
team
{
{
Team
:
teamName
{
Name
:
"team-1"
}},
{
Team
:
teamName
{
Name
:
"team-2"
}},
{
Team
:
teamName
{
Name
:
"team-3"
}},
Values
:
[]
workspace
{
{
Workspace
:
workspaceSlug
{
Slug
:
"team-1"
}},
{
Workspace
:
workspaceSlug
{
Slug
:
"team-2"
}},
{
Workspace
:
workspaceSlug
{
Slug
:
"team-3"
}},
},
}
s
:=
newTestServer
(
map
[
string
]
interface
{}{
"/user/permissions/
team
s"
:
teamsResponse
,
"/groups/team-1"
:
[]
group
{{
Slug
:
"administrators"
},
{
Slug
:
"members"
}},
"/groups/team-2"
:
[]
group
{{
Slug
:
"everyone"
}},
"/groups/team-3"
:
[]
group
{},
"/user/permissions/
workspace
s"
:
teamsResponse
,
"/groups/team-1"
:
[]
group
{{
Slug
:
"administrators"
},
{
Slug
:
"members"
}},
"/groups/team-2"
:
[]
group
{{
Slug
:
"everyone"
}},
"/groups/team-3"
:
[]
group
{},
})
connector
:=
bitbucketConnector
{
apiURL
:
s
.
URL
,
legacyAPIURL
:
s
.
URL
}
groups
,
err
:=
connector
.
user
Team
s
(
context
.
Background
(),
newClient
())
groups
,
err
:=
connector
.
user
Workspace
s
(
context
.
Background
(),
newClient
())
expectNil
(
t
,
err
)
expectEquals
(
t
,
groups
,
[]
string
{
...
...
@@ -45,7 +45,7 @@ func TestUserGroups(t *testing.T) {
})
connector
.
includeTeamGroups
=
true
groups
,
err
=
connector
.
user
Team
s
(
context
.
Background
(),
newClient
())
groups
,
err
=
connector
.
user
Workspace
s
(
context
.
Background
(),
newClient
())
expectNil
(
t
,
err
)
expectEquals
(
t
,
groups
,
[]
string
{
...
...
@@ -62,11 +62,11 @@ func TestUserGroups(t *testing.T) {
func
TestUserWithoutTeams
(
t
*
testing
.
T
)
{
s
:=
newTestServer
(
map
[
string
]
interface
{}{
"/user/permissions/
teams"
:
userTeam
sResponse
{},
"/user/permissions/
workspaces"
:
userWorkspace
sResponse
{},
})
connector
:=
bitbucketConnector
{
apiURL
:
s
.
URL
}
groups
,
err
:=
connector
.
user
Team
s
(
context
.
Background
(),
newClient
())
groups
,
err
:=
connector
.
user
Workspace
s
(
context
.
Background
(),
newClient
())
expectNil
(
t
,
err
)
expectEquals
(
t
,
len
(
groups
),
0
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment