fix: address review comments

ory · Mar 23, 2023 · fb5bd4b · fb5bd4b
1 parent 4d5fb14
commit fb5bd4b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 29 deletions.
diff --git a/driver/config/provider.go b/driver/config/provider.go
@@ -424,34 +424,18 @@ func (p *DefaultProvider) AccessTokenStrategy(ctx context.Context, additionalSou
 }
 
 func (p *DefaultProvider) AuthorizationCodeHookURL(ctx context.Context) *url.URL {
- if len(p.getProvider(ctx).String(KeyAuthorizationCodeHookURL)) == 0 {
- return nil
- }
-
  return p.getProvider(ctx).RequestURIF(KeyAuthorizationCodeHookURL, nil)
 }
 
 func (p *DefaultProvider) ClientCredentialsHookURL(ctx context.Context) *url.URL {
- if len(p.getProvider(ctx).String(KeyClientCredentialsHookURL)) == 0 {
- return nil
- }
-
  return p.getProvider(ctx).RequestURIF(KeyClientCredentialsHookURL, nil)
 }
 
 func (p *DefaultProvider) TokenRefreshHookURL(ctx context.Context) *url.URL {
- if len(p.getProvider(ctx).String(KeyRefreshTokenHookURL)) == 0 {
- return nil
- }
-
  return p.getProvider(ctx).RequestURIF(KeyRefreshTokenHookURL, nil)
 }
 
 func (p *DefaultProvider) JWTBearerRefreshHookURL(ctx context.Context) *url.URL {
- if len(p.getProvider(ctx).String(KeyJWTBearerHookURL)) == 0 {
- return nil
- }
-
  return p.getProvider(ctx).RequestURIF(KeyJWTBearerHookURL, nil)
 }
 

diff --git a/oauth2/hook.go b/oauth2/hook.go
@@ -126,8 +126,8 @@ func JWTBearerHook(reg interface {
  }
 }
 
-func callHook(ctx context.Context, reg x.HTTPClientProvider, requester fosite.AccessRequester, hookType string, hookURL *url.URL) error {
- if !requester.GetGrantTypes().ExactOne(hookType) {
+func callHook(ctx context.Context, reg x.HTTPClientProvider, requester fosite.AccessRequester, grantType string, hookURL *url.URL) error {
+ if !requester.GetGrantTypes().ExactOne(grantType) {
  return nil
  }
 
@@ -138,7 +138,7 @@ func callHook(ctx context.Context, reg x.HTTPClientProvider, requester fosite.Ac
 
  payload := map[string][]string{}
 
- if requester.GetGrantTypes().ExactOne("urn:ietf:params:oauth:grant-type:jwt-bearer") || requester.GetGrantTypes().ExactOne("client_credentials") {
+ if grantType == "urn:ietf:params:oauth:grant-type:jwt-bearer" || grantType == "client_credentials" {
  payload = requester.GetRequestForm()
  }
 
@@ -163,8 +163,8 @@ func callHook(ctx context.Context, reg x.HTTPClientProvider, requester fosite.Ac
  return errorsx.WithStack(
  fosite.ErrServerError.
  WithWrap(err).
- WithDescription(fmt.Sprintf("An error occurred while encoding the %s hook.", hookType)).
- WithDebugf("Unable to encode the %v hook body: %s", hookType, err),
+ WithDescription(fmt.Sprintf("An error occurred while encoding the %s hook.", grantType)).
+ WithDebugf("Unable to encode the %v hook body: %s", grantType, err),
  )
  }
 
@@ -173,7 +173,7 @@ func callHook(ctx context.Context, reg x.HTTPClientProvider, requester fosite.Ac
  return errorsx.WithStack(
  fosite.ErrServerError.
  WithWrap(err).
- WithDescription(fmt.Sprintf("An error occurred while preparing the %s hook.", hookType)).
+ WithDescription(fmt.Sprintf("An error occurred while preparing the %s hook.", grantType)).
  WithDebugf("Unable to prepare the HTTP Request: %s", err),
  )
  }
@@ -184,7 +184,7 @@ func callHook(ctx context.Context, reg x.HTTPClientProvider, requester fosite.Ac
  return errorsx.WithStack(
  fosite.ErrServerError.
  WithWrap(err).
- WithDescription(fmt.Sprintf("An error occurred while executing the %s hook.", hookType)).
+ WithDescription(fmt.Sprintf("An error occurred while executing the %s hook.", grantType)).
  WithDebugf("Unable to execute HTTP Request: %s", err),
  )
  }
@@ -199,14 +199,14 @@ func callHook(ctx context.Context, reg x.HTTPClientProvider, requester fosite.Ac
  case http.StatusForbidden:
  return errorsx.WithStack(
  fosite.ErrAccessDenied.
- WithDescription(fmt.Sprintf("The %s hook target responded with an error.", hookType)).
- WithDebugf(fmt.Sprintf("%s hook responded with HTTP status code: %s", hookType, resp.Status)),
+ WithDescription(fmt.Sprintf("The %s hook target responded with an error.", grantType)).
+ WithDebugf(fmt.Sprintf("%s hook responded with HTTP status code: %s", grantType, resp.Status)),
  )
  default:
  return errorsx.WithStack(
  fosite.ErrServerError.
- WithDescription(fmt.Sprintf("The %s hook target responded with an error.", hookType)).
- WithDebugf(fmt.Sprintf("%s hook responded with HTTP status code: %s", hookType, resp.Status)),
+ WithDescription(fmt.Sprintf("The %s hook target responded with an error.", grantType)).
+ WithDebugf(fmt.Sprintf("%s hook responded with HTTP status code: %s", grantType, resp.Status)),
  )
  }
 
@@ -215,8 +215,8 @@ func callHook(ctx context.Context, reg x.HTTPClientProvider, requester fosite.Ac
  return errorsx.WithStack(
  fosite.ErrServerError.
  WithWrap(err).
- WithDescription(fmt.Sprintf("The %s hook target responded with an error.", hookType)).
- WithDebugf(fmt.Sprintf("Response from %s hook could not be decoded: %s", hookType, err)),
+ WithDescription(fmt.Sprintf("The %s hook target responded with an error.", grantType)).
+ WithDebugf(fmt.Sprintf("Response from %s hook could not be decoded: %s", grantType, err)),
  )
  }