refactor: use functional options pattern to reduce passing nil

ory · Aug 30, 2024 · 20db06f · 20db06f
1 parent 0a815d7
commit 20db06f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/selfservice/flow/login/handler.go b/selfservice/flow/login/handler.go
@@ -882,7 +882,7 @@ continueLogin:
  return
  }
 
- if err := h.d.LoginHookExecutor().PostLoginHook(w, r, group, f, i, sess, nil, ""); err != nil {
+ if err := h.d.LoginHookExecutor().PostLoginHook(w, r, group, f, i, sess, ""); err != nil {
  if errors.Is(err, ErrAddressNotVerified) {
  h.d.LoginFlowErrorHandler().WriteFlowError(w, r, f, node.DefaultGroup, errors.WithStack(schema.NewAddressNotVerifiedError()))
  return

diff --git a/selfservice/flow/login/hook.go b/selfservice/flow/login/hook.go
@@ -64,6 +64,7 @@ type (
  }
  HookExecutor struct {
  d executorDependencies
+ c *claims.Claims
  }
  HookExecutorProvider interface {
  LoginHookExecutor() *HookExecutor
@@ -120,15 +121,23 @@ func (e *HookExecutor) handleLoginError(_ http.ResponseWriter, r *http.Request,
  return flowError
 }
 
+type PostLoginHookOpt func(*HookExecutor)
+
+func WithClaims(c *claims.Claims) PostLoginHookOpt {
+ return func(h *HookExecutor) {
+ h.c = c
+ }
+}
+
 func (e *HookExecutor) PostLoginHook(
  w http.ResponseWriter,
  r *http.Request,
  g node.UiNodeGroup,
  f *Flow,
  i *identity.Identity,
  s *session.Session,
- c *claims.Claims,
  provider string,
+ opts ...PostLoginHookOpt,
 ) (err error) {
  ctx := r.Context()
  ctx, span := e.d.Tracer(ctx).Tracer().Start(ctx, "HookExecutor.PostLoginHook")
@@ -169,13 +178,17 @@ func (e *HookExecutor) PostLoginHook(
  classified := s
  s = s.Declassified()
 
+ for _, o := range opts {
+ o(e)
+ }
+
  e.d.Logger().
  WithRequest(r).
  WithField("identity_id", i.ID).
  WithField("flow_method", f.Active).
  Debug("Running ExecuteLoginPostHook.")
  for k, executor := range e.d.PostLoginHooks(r.Context(), f.Active) {
- if err := executor.ExecuteLoginPostHook(w, r, g, f, s, c); err != nil {
+ if err := executor.ExecuteLoginPostHook(w, r, g, f, s, e.c); err != nil {
  if errors.Is(err, ErrHookAbortFlow) {
  e.d.Logger().
  WithRequest(r).

diff --git a/selfservice/flow/login/hook_test.go b/selfservice/flow/login/hook_test.go
@@ -72,7 +72,7 @@ func TestLoginExecutor(t *testing.T) {
  }
 
  testhelpers.SelfServiceHookLoginErrorHandler(t, w, r,
- reg.LoginHookExecutor().PostLoginHook(w, r, strategy.ToUiNodeGroup(), loginFlow, useIdentity, sess, nil, ""))
+ reg.LoginHookExecutor().PostLoginHook(w, r, strategy.ToUiNodeGroup(), loginFlow, useIdentity, sess, ""))
  })
 
  ts := httptest.NewServer(router)

diff --git a/selfservice/strategy/oidc/strategy_login.go b/selfservice/strategy/oidc/strategy_login.go
@@ -182,7 +182,7 @@ func (s *Strategy) processLogin(ctx context.Context, w http.ResponseWriter, r *h
  httprouter.ParamsFromContext(ctx).ByName("organization"))
  for _, c := range oidcCredentials.Providers {
  if c.Subject == claims.Subject && c.Provider == provider.Config().ID {
- if err = s.d.LoginHookExecutor().PostLoginHook(w, r, node.OpenIDConnectGroup, loginFlow, i, sess, claims, provider.Config().ID); err != nil {
+ if err = s.d.LoginHookExecutor().PostLoginHook(w, r, node.OpenIDConnectGroup, loginFlow, i, sess, provider.Config().ID, login.WithClaims(claims)); err != nil {
  return nil, s.handleError(ctx, w, r, loginFlow, provider.Config().ID, nil, err)
  }
  return nil, nil