From b5acf6afdfc409b213558c78353bb1ed9274e856 Mon Sep 17 00:00:00 2001
From: Todd Knight <T.Alan.Knight@gmail.com>
Date: Thu, 6 Aug 2020 13:26:55 -0700
Subject: [PATCH] Connecting the auth method service to the api handler. (#241)

---
 internal/servers/controller/handler.go      | 8 ++++++++
 internal/servers/controller/handler_test.go | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/internal/servers/controller/handler.go b/internal/servers/controller/handler.go
index c5f27a587c..e2d7a1529c 100644
--- a/internal/servers/controller/handler.go
+++ b/internal/servers/controller/handler.go
@@ -17,6 +17,7 @@ import (
 	"github.com/hashicorp/watchtower/internal/auth"
 	"github.com/hashicorp/watchtower/internal/gen/controller/api/services"
 	"github.com/hashicorp/watchtower/internal/servers/controller/handlers/accounts"
+	"github.com/hashicorp/watchtower/internal/servers/controller/handlers/authmethods"
 
 	"github.com/hashicorp/watchtower/internal/servers/controller/handlers"
 	"github.com/hashicorp/watchtower/internal/servers/controller/handlers/authenticate"
@@ -95,6 +96,13 @@ func handleGrpcGateway(c *Controller) (http.Handler, error) {
 	if err := services.RegisterAuthenticationServiceHandlerServer(ctx, mux, auths); err != nil {
 		return nil, fmt.Errorf("failed to register authenticate service handler: %w", err)
 	}
+	authMethods, err := authmethods.NewService(c.PasswordAuthRepoFn)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create auth method handler service: %w", err)
+	}
+	if err := services.RegisterAuthMethodServiceHandlerServer(ctx, mux, authMethods); err != nil {
+		return nil, fmt.Errorf("failed to register auth method service handler: %w", err)
+	}
 	authtoks, err := authtokens.NewService(c.AuthTokenRepoFn)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create auth token handler service: %w", err)
diff --git a/internal/servers/controller/handler_test.go b/internal/servers/controller/handler_test.go
index 8203744b0f..01b7524c47 100644
--- a/internal/servers/controller/handler_test.go
+++ b/internal/servers/controller/handler_test.go
@@ -46,6 +46,8 @@ func TestHandleImplementedPaths(t *testing.T) {
 			"v1/scopes/someid",
 			"v1/scopes/someid/auth-tokens",
 			"v1/scopes/someid/auth-tokens/someid",
+			"v1/scopes/someid/auth-methods",
+			"v1/scopes/someid/auth-methods/someid",
 			"v1/scopes/someid/auth-methods/someid/accounts",
 			"v1/scopes/someid/auth-methods/someid/accounts/someid",
 			"v1/scopes/someid/groups",
@@ -63,6 +65,7 @@ func TestHandleImplementedPaths(t *testing.T) {
 			"v1/scopes/someid/groups",
 			"v1/scopes/someid/roles",
 			"v1/scopes/someid/users",
+			"v1/scopes/someid/auth-methods",
 			"v1/scopes/someid/auth-methods/someid/accounts",
 
 			// custom methods
@@ -83,6 +86,7 @@ func TestHandleImplementedPaths(t *testing.T) {
 			"v1/scopes/someid/roles/someid",
 			"v1/scopes/someid/groups/someid",
 			"v1/scopes/someid/auth-tokens/someid",
+			"v1/scopes/someid/auth-methods/someid",
 			"v1/scopes/someid/auth-methods/someid/accounts/someid",
 		},
 		"PATCH": {
@@ -90,6 +94,7 @@ func TestHandleImplementedPaths(t *testing.T) {
 			"v1/scopes/someid/users/someid",
 			"v1/scopes/someid/roles/someid",
 			"v1/scopes/someid/groups/someid",
+			"v1/scopes/someid/auth-methods/someid",
 		},
 	} {
 		for _, p := range paths {