3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-02 16:30:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

directory: remove provider from user id (#2068)

Browse source
This commit is contained in:
Caleb Doxsey 2021-04-07 15:06:08 -06:00 • committed by GitHub
parent a51c7140ea
commit aeb8aaf9cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 71 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/directory/google/google.go
View file

@ -18,7 +18,6 @@ import (
"google.golang.org/api/option"
"github.com/pomerium/pomerium/internal/log"
"github.com/pomerium/pomerium/pkg/grpc/databroker"
"github.com/pomerium/pomerium/pkg/grpc/directory"
)
@ -92,12 +91,11 @@ func (p *Provider) User(ctx context.Context, userID, accessToken string) (*direc
return nil, fmt.Errorf("google: error getting API client: %w", err)
}
_, providerUserID := databroker.FromUserID(userID)
du := &directory.User{
Id: userID,
}
au, err := apiClient.Users.Get(providerUserID).
au, err := apiClient.Users.Get(userID).
Context(ctx).
Do()
if isAccessDenied(err) {
@ -114,7 +112,7 @@ func (p *Provider) User(ctx context.Context, userID, accessToken string) (*direc
err = apiClient.Groups.List().
Context(ctx).
UserKey(providerUserID).
UserKey(userID).
Pages(ctx, func(res *admin.Groups) error {
for _, g := range res.Groups {
du.GroupIds = append(du.GroupIds, g.Id)
@ -204,7 +202,7 @@ func (p *Provider) UserGroups(ctx context.Context) ([]*directory.Group, []*direc
groups := userIDToGroups[u.ID]
sort.Strings(groups)
users = append(users, &directory.User{
Id: databroker.GetUserID(Name, u.ID),
Id: u.ID,
GroupIds: groups,
DisplayName: u.DisplayName,
Email: u.Email,

2
internal/directory/google/google_test.go
View file

@ -200,6 +200,6 @@ func TestProvider_UserGroups(t *testing.T) {
{Id: "group1"},
}, dgs)
assert.Equal(t, []*directory.User{
{Id: "google/user1", Email: "user1@example.com", GroupIds: []string{"group1"}},
{Id: "user1", Email: "user1@example.com", GroupIds: []string{"group1"}},
}, dus)
}