Improve HasPermission call by using org context introspect

philips-software · May 14, 2022 · 68e399c · 68e399c
1 parent 8ea5d9b
commit 68e399c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/iam/client.go b/iam/client.go
@@ -295,7 +295,7 @@ func (c *Client) HasScopes(scopes ...string) bool {
 
 // HasPermissions returns true if all permissions are there for the client
 func (c *Client) HasPermissions(orgID string, permissions ...string) bool {
-	introspect, _, err := c.Introspect()
+	introspect, _, err := c.Introspect(WithOrgContext(orgID))
 	if err != nil {
 		return false
 	}
@@ -315,7 +315,7 @@ func (c *Client) HasPermissions(orgID string, permissions ...string) bool {
 				}
 			}
 			if !found {
-				// Permission is missing to return false
+				// Permission is missing so return false
 				return false
 			}
 		}

diff --git a/iam/introspect_test.go b/iam/introspect_test.go
@@ -167,7 +167,7 @@ func TestIntrospectWithOrgContext(t *testing.T) {
 
 		orgContext := r.URL.Query().Get("org_ctx")
 
-		if orgContext != "" {
+		if orgContext != "" && orgContext != "bogus" {
 			orgID = orgContext
 		}
 
@@ -217,6 +217,6 @@ func TestIntrospectWithOrgContext(t *testing.T) {
 	}
 
 	assert.True(t, client.HasPermissions(orgID, "SERVICE.SCOPE", "ORGANIZATION.MFA"))
-	assert.False(t, client.HasPermissions("bogus", "SERVICE.SCOPE"))
 	assert.Equal(t, 1, len(introspectResponse.Organizations.OrganizationList))
+	assert.False(t, client.HasPermissions("bogus", "SERVICE.SCOPE"))
 }
diff --git a/internal/version.go b/internal/version.go
@@ -1,5 +1,5 @@
 package internal
 
 const (
-	LibraryVersion = "0.63.2"
+	LibraryVersion = "0.63.3"
 )