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

directory.Group entry for groups (#1118)

Browse source 
* store directory groups separate from directory users

* fix group lookup, azure display name

* remove fields restriction

* fix test

* also support email

* use Email as name for google'

* remove changed file

* show groups on dashboard

* fix test

* re-add accidentally removed code
This commit is contained in:
Caleb Doxsey 2020-07-22 11:28:53 -06:00 • committed by GitHub
parent 489cdd8b63
commit 1ad243dfd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 525 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

22
internal/directory/azure/azure_test.go
View file

@ -45,8 +45,8 @@ func newMockAPI(t *testing.T, srv *httptest.Server) http.Handler {
r.Get("/groups", func(w http.ResponseWriter, r *http.Request) {
_ = json.NewEncoder(w).Encode(M{
"value": []M{
{"id": "admin", "name": "Admin Group"},
{"id": "test", "name": "Test Group"},
{"id": "admin", "displayName": "Admin Group"},
{"id": "test", "displayName": "Test Group"},
},
})
})
@ -85,22 +85,26 @@ func Test(t *testing.T) {
DirectoryID: "DIRECTORY_ID",
}),
)
users, err := p.UserGroups(context.Background())
groups, users, err := p.UserGroups(context.Background())
assert.NoError(t, err)
assert.Equal(t, []*directory.User{
{
Id: "azure/user-1",
Groups: []string{"Admin Group", "admin"},
Id: "azure/user-1",
GroupIds: []string{"admin"},
},
{
Id: "azure/user-2",
Groups: []string{"Test Group", "test"},
Id: "azure/user-2",
GroupIds: []string{"test"},
},
{
Id: "azure/user-3",
Groups: []string{"Test Group", "test"},
Id: "azure/user-3",
GroupIds: []string{"test"},
},
}, users)
assert.Equal(t, []*directory.Group{
{Id: "admin", Name: "Admin Group"},
{Id: "test", Name: "Test Group"},
}, groups)
}
func mustParseURL(rawurl string) *url.URL {