fix: incorporate PR feedback to only use InvokeHook

Author: Chris Stockton

internal/hooks/v0hooks/manager.go

@@ -67,24 +67,6 @@ func configByName(
 	}
 }
 
-func (o *Manager) BeforeUserCreated(
-	ctx context.Context,
-	tx *storage.Connection,
-	req *BeforeUserCreatedInput,
-	res *BeforeUserCreatedOutput,
-) error {
-	return o.dispatch(ctx, &o.config.Hook.BeforeUserCreated, tx, req, res)
-}
-
-func (o *Manager) AfterUserCreated(
-	ctx context.Context,
-	tx *storage.Connection,
-	req *AfterUserCreatedInput,
-	res *AfterUserCreatedOutput,
-) error {
-	return o.dispatch(ctx, &o.config.Hook.AfterUserCreated, tx, req, res)
-}
-
 func (o *Manager) InvokeHook(
 	conn *storage.Connection,
 	r *http.Request,
@@ -147,6 +129,23 @@ func (o *Manager) invokeHook(
 		}
 		return o.dispatch(
 			r.Context(), &o.config.Hook.CustomAccessToken, conn, input, output)
+
+	case *BeforeUserCreatedInput:
+		if _, ok := output.(*BeforeUserCreatedOutput); !ok {
+			return apierrors.NewInternalServerError(
+				"output should be *hooks.BeforeUserCreatedOutput")
+		}
+		return o.dispatch(
+			r.Context(), &o.config.Hook.BeforeUserCreated, conn, input, output)
+
+	case *AfterUserCreatedInput:
+		_, ok := output.(*AfterUserCreatedOutput)
+		if !ok {
+			return apierrors.NewInternalServerError(
+				"output should be *hooks.AfterUserCreatedOutput")
+		}
+		return o.dispatch(
+			r.Context(), &o.config.Hook.AfterUserCreated, conn, input, output)
 	}
 }
 

internal/hooks/v0hooks/manager_test.go

@@ -38,7 +38,6 @@ func TestHooks(t *testing.T) {
 	type testCase struct {
 		desc   string
 		setup  func()
-		run    func(*testCase, *Manager) error
 		sql    string
 		req    any
 		res    any
@@ -233,13 +232,6 @@ func TestHooks(t *testing.T) {
 						HookName: `"auth"."v0hooks_test_before_user_created"`,
 					}
 			},
-			run: func(tc *testCase, mr *Manager) error {
-				return mr.BeforeUserCreated(
-					ctx, db,
-					tc.req.(*BeforeUserCreatedInput),
-					tc.res.(*BeforeUserCreatedOutput),
-				)
-			},
 			req: NewBeforeUserCreatedInput(httpReq, &models.User{}),
 			res: &BeforeUserCreatedOutput{},
 			exp: &BeforeUserCreatedOutput{},
@@ -262,13 +254,6 @@ func TestHooks(t *testing.T) {
 						HookName: `"auth"."v0hooks_test_before_user_created_reject"`,
 					}
 			},
-			run: func(tc *testCase, mr *Manager) error {
-				return mr.BeforeUserCreated(
-					ctx, db,
-					tc.req.(*BeforeUserCreatedInput),
-					tc.res.(*BeforeUserCreatedOutput),
-				)
-			},
 			req: NewBeforeUserCreatedInput(httpReq, &models.User{}),
 			res: &BeforeUserCreatedOutput{},
 			exp: &BeforeUserCreatedOutput{Decision: "reject"},
@@ -291,13 +276,6 @@ func TestHooks(t *testing.T) {
 						HookName: `"auth"."v0hooks_test_before_user_created_reject_msg"`,
 					}
 			},
-			run: func(tc *testCase, mr *Manager) error {
-				return mr.BeforeUserCreated(
-					ctx, db,
-					tc.req.(*BeforeUserCreatedInput),
-					tc.res.(*BeforeUserCreatedOutput),
-				)
-			},
 			req: NewBeforeUserCreatedInput(httpReq, &models.User{}),
 			res: &BeforeUserCreatedOutput{},
 			exp: &BeforeUserCreatedOutput{Decision: "reject", Message: "test case"},
@@ -320,13 +298,6 @@ func TestHooks(t *testing.T) {
 						HookName: `"auth"."v0hooks_test_after_user_created"`,
 					}
 			},
-			run: func(tc *testCase, mr *Manager) error {
-				return mr.AfterUserCreated(
-					ctx, db,
-					tc.req.(*AfterUserCreatedInput),
-					tc.res.(*AfterUserCreatedOutput),
-				)
-			},
 			req: NewAfterUserCreatedInput(httpReq, &models.User{}),
 			res: &AfterUserCreatedOutput{},
 			exp: &AfterUserCreatedOutput{},
@@ -437,6 +408,18 @@ func TestHooks(t *testing.T) {
 			res:    M{},
 			errStr: "500: output should be *hooks.PasswordVerificationAttemptOutput",
 		},
+		{
+			desc:   "fail - before_user_created - invalid output type",
+			req:    &BeforeUserCreatedInput{},
+			res:    M{},
+			errStr: "500: output should be *hooks.BeforeUserCreatedOutput",
+		},
+		{
+			desc:   "fail - after_user_created - invalid output type",
+			req:    &AfterUserCreatedInput{},
+			res:    M{},
+			errStr: "500: output should be *hooks.AfterUserCreatedOutput",
+		},
 
 		// fail - invalid query
 		{
@@ -525,12 +508,7 @@ func TestHooks(t *testing.T) {
 		}
 
 		htr := httptest.NewRequestWithContext(ctx, "POST", "/api", nil)
-		var err error
-		if tc.run == nil {
-			err = mr.InvokeHook(db, htr, tc.req, tc.res)
-		} else {
-			err = tc.run(&tc, mr)
-		}
+		err := mr.InvokeHook(db, htr, tc.req, tc.res)
 		if tc.errStr != "" {
 			require.Error(t, err)
 			require.Contains(t, err.Error(), tc.errStr)