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

simplify func

Browse source
This commit is contained in:
Livio Amstutz 2019-12-16 14:14:51 +01:00
parent a21f6745f7
commit 3782e49234
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pkg/op/tokenrequest.go
View file

@ -102,17 +102,17 @@ func AuthorizeClient(tokenReq *oidc.AccessTokenRequest, exchanger Exchanger) (Au
} }
switch client.GetAuthMethod() { switch client.GetAuthMethod() {
case AuthMethodNone: case AuthMethodNone:
authReq, err := AuthorizeCodeChallenge(tokenReq, exchanger) authReq, err := AuthorizeCodeChallenge(tokenReq, exchanger.Storage())
return authReq, client, err return authReq, client, err
case AuthMethodPost: case AuthMethodPost:
if !exchanger.AuthMethodPostSupported() { if !exchanger.AuthMethodPostSupported() {
return nil, nil, errors.New("basic not supported") return nil, nil, errors.New("basic not supported")
} }
err = AuthorizeClientIDSecret(tokenReq.ClientID, tokenReq.ClientSecret, exchanger) err = AuthorizeClientIDSecret(tokenReq.ClientID, tokenReq.ClientSecret, exchanger.Storage())
case AuthMethodBasic: case AuthMethodBasic:
err = AuthorizeClientIDSecret(tokenReq.ClientID, tokenReq.ClientSecret, exchanger) err = AuthorizeClientIDSecret(tokenReq.ClientID, tokenReq.ClientSecret, exchanger.Storage())
default: default:
err = AuthorizeClientIDSecret(tokenReq.ClientID, tokenReq.ClientSecret, exchanger) err = AuthorizeClientIDSecret(tokenReq.ClientID, tokenReq.ClientSecret, exchanger.Storage())
} }
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
@ -124,15 +124,15 @@ func AuthorizeClient(tokenReq *oidc.AccessTokenRequest, exchanger Exchanger) (Au
return authReq, client, nil return authReq, client, nil
} }
func AuthorizeClientIDSecret(clientID, clientSecret string, exchanger Exchanger) error { func AuthorizeClientIDSecret(clientID, clientSecret string, storage OPStorage) error {
return exchanger.Storage().AuthorizeClientIDSecret(clientID, clientSecret) return storage.AuthorizeClientIDSecret(clientID, clientSecret)
} }
func AuthorizeCodeChallenge(tokenReq *oidc.AccessTokenRequest, exchanger Exchanger) (AuthRequest, error) { func AuthorizeCodeChallenge(tokenReq *oidc.AccessTokenRequest, storage AuthStorage) (AuthRequest, error) {
if tokenReq.CodeVerifier == "" { if tokenReq.CodeVerifier == "" {
return nil, ErrInvalidRequest("code_challenge required") return nil, ErrInvalidRequest("code_challenge required")
} }
authReq, err := exchanger.Storage().AuthRequestByCode(tokenReq.Code) authReq, err := storage.AuthRequestByCode(tokenReq.Code)
if err != nil { if err != nil {
return nil, ErrInvalidRequest("invalid code") return nil, ErrInvalidRequest("invalid code")
} }