From 3578d505763445483b7d99e0cab4b7fd03a9c1d4 Mon Sep 17 00:00:00 2001 From: Weston Haught Date: Mon, 7 Dec 2020 13:45:04 -0800 Subject: [PATCH] Install batch-issue in adminAPI and integration --- cmd/adminapi/main.go | 1 + internal/routes/server.go | 2 +- .../{issueapi/show_bulk_issue.go => codes/bulk_issue.go} | 2 +- pkg/controller/issueapi/{handle_issue.go => issue.go} | 0 .../issueapi/{handle_issue_batch.go => issue_batch.go} | 0 pkg/testsuite/integration.go | 1 + 6 files changed, 4 insertions(+), 2 deletions(-) rename pkg/controller/{issueapi/show_bulk_issue.go => codes/bulk_issue.go} (98%) rename pkg/controller/issueapi/{handle_issue.go => issue.go} (100%) rename pkg/controller/issueapi/{handle_issue_batch.go => issue_batch.go} (100%) diff --git a/cmd/adminapi/main.go b/cmd/adminapi/main.go index ddb4284b3..ad9bee360 100644 --- a/cmd/adminapi/main.go +++ b/cmd/adminapi/main.go @@ -162,6 +162,7 @@ func realMain(ctx context.Context) error { issueapiController := issueapi.New(ctx, cfg, db, limiterStore, h) sub.Handle("/issue", issueapiController.HandleIssue()).Methods("POST") + sub.Handle("/batch-issue", issueapiController.HandleBatchIssue()).Methods("POST") codesController := codes.NewAPI(ctx, cfg, db, h) sub.Handle("/checkcodestatus", codesController.HandleCheckCodeStatus()).Methods("POST") diff --git a/internal/routes/server.go b/internal/routes/server.go index 5e3582039..7d7aafa80 100644 --- a/internal/routes/server.go +++ b/internal/routes/server.go @@ -224,7 +224,6 @@ func Server( // API for creating new verification codes. Called via AJAX. issueapiController := issueapi.New(ctx, cfg, db, limiterStore, h) sub.Handle("/issue", issueapiController.HandleIssue()).Methods("POST") - sub.Handle("/bulk-issue", issueapiController.HandleBulkIssue()).Methods("GET") sub.Handle("/batch-issue", issueapiController.HandleBatchIssue()).Methods("POST") codesController := codes.NewServer(ctx, cfg, db, h) @@ -336,6 +335,7 @@ func Server( // codesRoutes are the routes for checking codes. func codesRoutes(r *mux.Router, c *codes.Controller) { r.Handle("/issue", c.HandleIssue()).Methods("GET") + r.Handle("/bulk-issue", c.HandleBulkIssue()).Methods("GET") r.Handle("/status", c.HandleIndex()).Methods("GET") r.Handle("/{uuid}", c.HandleShow()).Methods("GET") r.Handle("/{uuid}/expire", c.HandleExpirePage()).Methods("PATCH") diff --git a/pkg/controller/issueapi/show_bulk_issue.go b/pkg/controller/codes/bulk_issue.go similarity index 98% rename from pkg/controller/issueapi/show_bulk_issue.go rename to pkg/controller/codes/bulk_issue.go index a9e48219c..7c360a09a 100644 --- a/pkg/controller/issueapi/show_bulk_issue.go +++ b/pkg/controller/codes/bulk_issue.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package issueapi +package codes import ( "net/http" diff --git a/pkg/controller/issueapi/handle_issue.go b/pkg/controller/issueapi/issue.go similarity index 100% rename from pkg/controller/issueapi/handle_issue.go rename to pkg/controller/issueapi/issue.go diff --git a/pkg/controller/issueapi/handle_issue_batch.go b/pkg/controller/issueapi/issue_batch.go similarity index 100% rename from pkg/controller/issueapi/handle_issue_batch.go rename to pkg/controller/issueapi/issue_batch.go diff --git a/pkg/testsuite/integration.go b/pkg/testsuite/integration.go index 8274d49a4..c0066a2e7 100644 --- a/pkg/testsuite/integration.go +++ b/pkg/testsuite/integration.go @@ -290,6 +290,7 @@ func (s *IntegrationSuite) newAdminAPIServer(ctx context.Context, tb testing.TB) issueapiController := issueapi.New(ctx, &s.cfg.AdminAPISrvConfig, s.db, limiterStore, h) sub.Handle("/issue", issueapiController.HandleIssue()).Methods("POST") + sub.Handle("/batch-issue", issueapiController.HandleBatchIssue()).Methods("POST") codesController := codes.NewAPI(ctx, &s.cfg.AdminAPISrvConfig, s.db, h) sub.Handle("/checkcodestatus", codesController.HandleCheckCodeStatus()).Methods("POST")