From 6289faf1ba7ce0f7dcdc42aa1b45d6898d26d82b Mon Sep 17 00:00:00 2001 From: Donovan Date: Sat, 1 Feb 2025 06:33:43 -0600 Subject: [PATCH] remove new customer endpoint --- handler/handler.go | 2 +- handler/handler_test.go | 75 +++++++++++++++++------------------------ 2 files changed, 32 insertions(+), 45 deletions(-) diff --git a/handler/handler.go b/handler/handler.go index 7c191ed..9164ef1 100644 --- a/handler/handler.go +++ b/handler/handler.go @@ -28,7 +28,7 @@ const ( func (h *NkodeHandler) RegisterRoutes(r *gin.Engine) { r.Group("/v1/nkode") { - r.POST("/create-new-customer", h.CreateNewCustomerHandler) + // r.POST("/create-new-customer", h.CreateNewCustomerHandler) r.POST("/signup", h.SignupHandler) r.POST("/set-nkode", h.SetNKodeHandler) r.POST("/confirm-nkode", h.ConfirmNKodeHandler) diff --git a/handler/handler_test.go b/handler/handler_test.go index 9a7a25c..1637f22 100644 --- a/handler/handler_test.go +++ b/handler/handler_test.go @@ -27,10 +27,9 @@ func TestNKodeAPI(t *testing.T) { err := tr.Stop() assert.NoError(t, err) }(tr) - // *** Create New Customer *** - customerID, status, err := tr.CreateNewCustomerDefaultPolicy() + // *** Create New Customer with invalid access token *** + customerID, err := tr.CreateNewCustomerDefaultPolicy() assert.NoError(t, err) - assert.Equal(t, 200, status) attrPerKey := 9 numKeys := 6 userEmail := "test_username" + security.GenerateRandomString(12) + "@example.com" @@ -132,10 +131,10 @@ func TestNKodeAPI(t *testing.T) { } type TestRouter struct { - Router *gin.Engine - EmailQueue *email.Queue - Repo *repository.SqliteRepository - Handler *NkodeHandler + router *gin.Engine + emailQueue *email.Queue + repo *repository.SqliteRepository + handler *NkodeHandler } func NewTestRouter() *TestRouter { @@ -157,45 +156,33 @@ func NewTestRouter() *TestRouter { } h.RegisterRoutes(router) return &TestRouter{ - Handler: &h, - Router: router, - EmailQueue: emailQueue, - Repo: repo, + handler: &h, + router: router, + emailQueue: emailQueue, + repo: repo, } } func (r *TestRouter) Start() { - r.Repo.Start() - r.EmailQueue.Start() + r.repo.Start() + r.emailQueue.Start() } func (r *TestRouter) Stop() error { - r.EmailQueue.Stop() - return r.Repo.Stop() + r.emailQueue.Stop() + return r.repo.Stop() } -func (r *TestRouter) CreateNewCustomerDefaultPolicy() (string, int, error) { - p := entities.NewDefaultNKodePolicy() - body := bytes.NewBufferString(fmt.Sprintf( - "max_nkode_len=%d&min_nkode_len=%d&distinct_sets=%d&distinct_attributes=%d&lock_out=%d&expiration=%d", - p.MaxNkodeLen, - p.MinNkodeLen, - p.DistinctSets, - p.DistinctAttributes, - p.LockOut, - p.Expiration, - )) - req := httptest.NewRequest(http.MethodPost, "/create-new-customer", body) - req.Header.Set("Content-Type", "application/x-www-form-urlencoded") - rec := httptest.NewRecorder() - r.Router.ServeHTTP(rec, req) - var resp struct { - CustomerID string `json:"customer_id"` +func (r *TestRouter) AddUserPermission(userEmail entities.UserEmail, customerId entities.CustomerId, permission entities.UserPermission) error { + return r.repo.AddUserPermission(userEmail, customerId, permission) +} + +func (r *TestRouter) CreateNewCustomerDefaultPolicy() (string, error) { + customerId, err := r.handler.API.CreateNewCustomer(entities.NewDefaultNKodePolicy()) + if err != nil { + return "", err } - if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil { - return "", rec.Code, err - } - return resp.CustomerID, rec.Code, nil + return customerId.String(), nil } func (r *TestRouter) Signup( @@ -214,7 +201,7 @@ func (r *TestRouter) Signup( req := httptest.NewRequest(http.MethodPost, "/signup", body) req.Header.Set("Content-Type", "application/x-www-form-urlencoded") rec := httptest.NewRecorder() - r.Router.ServeHTTP(rec, req) + r.router.ServeHTTP(rec, req) var resp entities.SignupResetInterface if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil { return nil, rec.Code, err @@ -241,7 +228,7 @@ func (r *TestRouter) SetNKode( req.Header.Set("Content-Type", "application/json") rec := httptest.NewRecorder() - r.Router.ServeHTTP(rec, req) + r.router.ServeHTTP(rec, req) var resp struct { UserInterface []int `json:"user_interface"` } @@ -268,7 +255,7 @@ func (r *TestRouter) ConfirmNKode( req := httptest.NewRequest(http.MethodPost, "/confirm-nkode", bytes.NewBuffer(body)) req.Header.Set("Content-Type", "application/json") rec := httptest.NewRecorder() - r.Router.ServeHTTP(rec, req) + r.router.ServeHTTP(rec, req) return rec.Code, nil } @@ -285,7 +272,7 @@ func (r *TestRouter) GetLoginInterface( req := httptest.NewRequest(http.MethodPost, "/get-login-interface", body) req.Header.Set("Content-Type", "application/x-www-form-urlencoded") rec := httptest.NewRecorder() - r.Router.ServeHTTP(rec, req) + r.router.ServeHTTP(rec, req) var resp entities.LoginInterface if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil { return entities.LoginInterface{}, rec.Code, err @@ -310,7 +297,7 @@ func (r *TestRouter) Login( req := httptest.NewRequest(http.MethodPost, "/login", bytes.NewBuffer(body)) req.Header.Set("Content-Type", "application/x-www-form-urlencoded") rec := httptest.NewRecorder() - r.Router.ServeHTTP(rec, req) + r.router.ServeHTTP(rec, req) var resp security.AuthenticationTokens if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil { return security.AuthenticationTokens{}, rec.Code, err @@ -331,7 +318,7 @@ func (r *TestRouter) RenewAttributes( req := httptest.NewRequest(http.MethodPost, "/renew-attributes", bytes.NewBuffer(body)) req.Header.Set("Content-Type", "application/json") rec := httptest.NewRecorder() - r.Router.ServeHTTP(rec, req) + r.router.ServeHTTP(rec, req) return rec.Code, nil } @@ -350,7 +337,7 @@ func (r *TestRouter) ForgotNKode( req := httptest.NewRequest(http.MethodPost, "/forgot-nkode", bytes.NewBuffer(body)) req.Header.Set("Content-Type", "application/json") rec := httptest.NewRecorder() - r.Router.ServeHTTP(rec, req) + r.router.ServeHTTP(rec, req) return rec.Code, nil } @@ -372,7 +359,7 @@ func (r *TestRouter) Reset( req.Header.Set("Content-Type", "application/x-www-form-urlencoded") req.Header.Set("Authorization", "Bearer "+resetAuthToken) rec := httptest.NewRecorder() - r.Router.ServeHTTP(rec, req) + r.router.ServeHTTP(rec, req) var resp entities.SignupResetInterface if err := json.Unmarshal(rec.Body.Bytes(), &resp); err != nil { return nil, rec.Code, err