3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-06-05 20:32:57 +02:00
Code Issues Projects Releases Packages Wiki Activity

directory: generate user/directory.User ID in a consistent way (#944)

Browse source
This commit is contained in:
Caleb Doxsey 2020-06-22 07:42:57 -06:00 • committed by GitHub
parent 84dde097c7
commit f7760c413e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 59 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,10 +14,14 @@ import (
admin "google.golang.org/api/admin/directory/v1"
"google.golang.org/api/option"
"github.com/pomerium/pomerium/internal/grpc/databroker"
"github.com/pomerium/pomerium/internal/grpc/directory"
"github.com/pomerium/pomerium/internal/log"
)
// Name is the provider name.
const Name = "google"
const (
defaultProviderURL = "https://accounts.google.com"
)
@ -118,7 +122,7 @@ func (p *Provider) UserGroups(ctx context.Context) ([]*directory.User, error) {
for userEmail, groups := range userEmailToGroups {
sort.Strings(groups)
users = append(users, &directory.User{
Id: userEmail,
Id: databroker.GetUserID(Name, userEmail),
Groups: groups,
})
}