From 1fb5dc914b6ea239b50537762b686b0590c40f61 Mon Sep 17 00:00:00 2001 From: Scott Leggett Date: Tue, 7 May 2024 11:42:32 +0800 Subject: [PATCH] chore: dump groups claims for debugging --- go.mod | 2 +- internal/keycloak/jwt.go | 1 + internal/keycloak/userrolesandgroups.go | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 7a83aac1..af4693d2 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( github.com/MicahParks/keyfunc/v2 v2.1.0 github.com/alecthomas/assert/v2 v2.9.0 github.com/alecthomas/kong v0.9.0 + github.com/davecgh/go-spew v1.1.1 github.com/gliderlabs/ssh v0.3.7 github.com/go-sql-driver/mysql v1.8.1 github.com/golang-jwt/jwt/v5 v5.2.1 @@ -34,7 +35,6 @@ require ( github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/go-jose/go-jose/v4 v4.0.1 // indirect github.com/go-logr/logr v1.4.1 // indirect diff --git a/internal/keycloak/jwt.go b/internal/keycloak/jwt.go index 340f0d62..8632f60d 100644 --- a/internal/keycloak/jwt.go +++ b/internal/keycloak/jwt.go @@ -40,6 +40,7 @@ func (gpids *groupProjectIDs) UnmarshalJSON(data []byte) error { type LagoonClaims struct { RealmRoles []string `json:"realm_roles"` UserGroups []string `json:"group_membership"` + Groups []string `json:"groups"` GroupProjectIDs groupProjectIDs `json:"group_lagoon_project_ids"` AuthorizedParty string `json:"azp"` jwt.RegisteredClaims diff --git a/internal/keycloak/userrolesandgroups.go b/internal/keycloak/userrolesandgroups.go index 68bc7f6d..31309a30 100644 --- a/internal/keycloak/userrolesandgroups.go +++ b/internal/keycloak/userrolesandgroups.go @@ -6,6 +6,7 @@ import ( "net/http" "time" + "github.com/davecgh/go-spew/spew" "github.com/google/uuid" "go.opentelemetry.io/otel" "golang.org/x/oauth2" @@ -48,5 +49,6 @@ func (c *Client) UserRolesAndGroups(ctx context.Context, if err != nil { return nil, nil, nil, fmt.Errorf("couldn't parse user access token: %v", err) } + spew.Dump(claims) return claims.RealmRoles, claims.UserGroups, claims.GroupProjectIDs, nil }