diff options
| -rw-r--r-- | pkg/oidc/id_token.go | 48 | ||||
| -rw-r--r-- | pkg/oidc/oidc.go | 10 |
2 files changed, 3 insertions, 55 deletions
diff --git a/pkg/oidc/id_token.go b/pkg/oidc/id_token.go index ce3fb23..b7f21ce 100644 --- a/pkg/oidc/id_token.go +++ b/pkg/oidc/id_token.go @@ -2,52 +2,4 @@ package oidc import "github.com/coreos/go-oidc/v3/oidc" -/* -Example ID Token from GitLab OIDC Provider: - -```json - - { - "iss": "http://gdk.test:3000", - "sub": "1", - "aud": "e31e1da0b8f6b6e35ca70c790b13c0406e44aca6b2bf67f55de7355a979a224f", - "exp": 1745427493, - "iat": 1745427373, - "auth_time": 1745418001, - "sub_legacy": "2474cf0b2211688a57297ace0e260a15944754d16b1bd42c9d6779c900367807", - "name": "Administrator", - "nickname": "root", - "preferred_username": "root", - "email": "admin@example.com", - "email_verified": true, - "profile": "http://gdk.test:3000/root", - "picture": "https://www.gravatar.com/avatar/258d8dc916db8cea2cafb6c3cd0cb0246efe061421dbd83ec3a350428cabda4f?s=80&d=identicon", - "groups_direct": [ - "gitlab-org", - "toolbox", - "mass_insert_group__0_100", - "custom-roles-root-group/aa", - "custom-roles-root-group/aa/aaa", - "gnuwget", - "Commit451", - "jashkenas", - "flightjs", - "twitter", - "gitlab-examples", - "gitlab-examples/security", - "412708", - "gitlab-examples/demo-group", - "custom-roles-root-group", - "434044-group-1", - "434044-group-2", - "gitlab-org1", - "gitlab-org/secure", - "gitlab-org/secure/managers", - "gitlab-org/security-products", - "gitlab-org/security-products/analyzers" - ] - } - -``` -*/ type IDToken = oidc.IDToken diff --git a/pkg/oidc/oidc.go b/pkg/oidc/oidc.go index 4704f63..6a67d19 100644 --- a/pkg/oidc/oidc.go +++ b/pkg/oidc/oidc.go @@ -8,9 +8,8 @@ import ( ) type OpenID struct { - Provider *oidc.Provider - Config *oauth2.Config - OIDCConfig *oidc.Config + Provider *oidc.Provider + Config *oauth2.Config } func New(provider *oidc.Provider, clientID, clientSecret, callbackURL string) *OpenID { @@ -23,14 +22,11 @@ func New(provider *oidc.Provider, clientID, clientSecret, callbackURL string) *O Endpoint: provider.Endpoint(), Scopes: []string{oidc.ScopeOpenID, "profile", "email"}, }, - OIDCConfig: &oidc.Config{ - ClientID: clientID, - }, } } func (o *OpenID) ValidateIDToken(ctx context.Context, rawIDToken RawToken) (*IDToken, error) { - verifier := o.Provider.VerifierContext(ctx, o.OIDCConfig) + verifier := o.Provider.VerifierContext(ctx, &oidc.Config{ClientID: o.Config.ClientID}) idToken, err := verifier.Verify(ctx, rawIDToken.String()) return idToken, err } |