cim/zitadel-oidc
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

undo more gofumpt changes

Browse source
This commit is contained in:
David Sharnoff 2022-07-20 18:11:03 -07:00
parent 0367c79a03
commit fdeb4e318c
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
pkg/client/client.go
View file

@ -15,17 +15,20 @@ import (
"github.com/zitadel/oidc/pkg/oidc" "github.com/zitadel/oidc/pkg/oidc"
) )
var Encoder = func() httphelper.Encoder { var (
e := schema.NewEncoder() Encoder = func() httphelper.Encoder {
e.RegisterEncoder(oidc.SpaceDelimitedArray{}, func(value reflect.Value) string { e := schema.NewEncoder()
return value.Interface().(oidc.SpaceDelimitedArray).Encode() e.RegisterEncoder(oidc.SpaceDelimitedArray{}, func(value reflect.Value) string {
}) return value.Interface().(oidc.SpaceDelimitedArray).Encode()
return e })
}() return e
}()
)
// Discover calls the discovery endpoint of the provided issuer and returns its configuration //Discover calls the discovery endpoint of the provided issuer and returns its configuration
// It accepts an optional argument "wellknownUrl" which can be used to overide the dicovery endpoint url //It accepts an optional argument "wellknownUrl" which can be used to overide the dicovery endpoint url
func Discover(issuer string, httpClient *http.Client, wellKnownUrl ...string) (*oidc.DiscoveryConfiguration, error) { func Discover(issuer string, httpClient *http.Client, wellKnownUrl ...string) (*oidc.DiscoveryConfiguration, error) {
wellKnown := strings.TrimSuffix(issuer, "/") + oidc.DiscoveryEndpoint wellKnown := strings.TrimSuffix(issuer, "/") + oidc.DiscoveryEndpoint
if len(wellKnownUrl) == 1 && wellKnownUrl[0] != "" { if len(wellKnownUrl) == 1 && wellKnownUrl[0] != "" {
wellKnown = wellKnownUrl[0] wellKnown = wellKnownUrl[0]

4
pkg/client/rp/relying_party.go
View file

@ -236,14 +236,14 @@ func WithVerifierOpts(opts ...VerifierOption) Option {
} }
} }
//WithClientKey specifies the path to the key.json to be used for the JWT Profile Client Authentication on the token endpoint // WithClientKey specifies the path to the key.json to be used for the JWT Profile Client Authentication on the token endpoint
// //
//deprecated: use WithJWTProfile(SignerFromKeyPath(path)) instead //deprecated: use WithJWTProfile(SignerFromKeyPath(path)) instead
func WithClientKey(path string) Option { func WithClientKey(path string) Option {
return WithJWTProfile(SignerFromKeyPath(path)) return WithJWTProfile(SignerFromKeyPath(path))
} }
//WithJWTProfile creates a signer used for the JWT Profile Client Authentication on the token endpoint // WithJWTProfile creates a signer used for the JWT Profile Client Authentication on the token endpoint
func WithJWTProfile(signerFromKey SignerFromKey) Option { func WithJWTProfile(signerFromKey SignerFromKey) Option {
return func(rp *relyingParty) error { return func(rp *relyingParty) error {
signer, err := signerFromKey() signer, err := signerFromKey()