Skip to content

Commit 7cf3124

Browse files
feat: additional roles to graph org memebrs response, null for onedrive url instead of empty string
Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com>
1 parent be19231 commit 7cf3124

32 files changed

Lines changed: 3525 additions & 3052 deletions

.task/checksum/generate-ent-smart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
72fa30a003302debf7d1483ca0dc91d9
1+
61e2ab6dbc47a1e3535bd5d6128a8b14
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
80b2965e7574965c72276b404af7909
1+
95641fc8f4f1b5a250da43b9dc00b5a5
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a5ea6f046fb222aad2d3c0483d6da270
1+
8b75c92d10e8d8e3150be9eb1d290e

fga/model/helpers.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,28 @@ func OrganizationRoles() ([]modelparse.OrganizationRole, error) {
339339
return roles, nil
340340
}
341341

342+
func FilterOrganizationRoles(roles []modelparse.OrganizationRole, assigned []string) []modelparse.OrganizationRole {
343+
filtered := make([]modelparse.OrganizationRole, 0, len(assigned))
344+
for _, role := range roles {
345+
if slices.Contains(assigned, role.ID) {
346+
filtered = append(filtered, role)
347+
}
348+
}
349+
350+
return filtered
351+
}
352+
353+
func GetOrganizationRoleStrings(roles []modelparse.OrganizationRole, assigned []string) []string {
354+
filtered := make([]string, 0, len(assigned))
355+
for _, role := range roles {
356+
if slices.Contains(assigned, role.ID) {
357+
filtered = append(filtered, role.Name)
358+
}
359+
}
360+
361+
return filtered
362+
}
363+
342364
func getRoleIDs() ([]string, error) {
343365
roles, err := OrganizationRoles()
344366
if err != nil {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ab1a715fb86d24166a914417c34ed7ea5fa6e5e84c908dab42037e35f712e64c
1+
92e46495f777060cab71bb459512b23cf85e73d2c70c3ea33b4407928758e396
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
77569e5f492746f4a0dbb2afecb5c1a9e7566307cbfa805a10a197ca180faace
1+
0a451c79267f3f3eae7b639646c5bb218c63d7a4271c535cc922c17ff82946e1

0 commit comments

Comments
 (0)