Add default customer id

core/model/customer.go

@@ -1,4 +1,4 @@
-package m
+package model
 
 import (
 	"errors"

core/model/customer_attributes.go

@@ -1,4 +1,4 @@
-package m
+package model
 
 import (
 	"errors"

core/model/keypad_dimension.go

@@ -1,4 +1,4 @@
-package m
+package model
 
 import "errors"
 

core/model/nkode_handler.go

@@ -1,4 +1,4 @@
-package m
+package model
 
 import (
 	"encoding/json"
@@ -13,8 +13,8 @@ type NKodeHandler struct {
 
 func (h *NKodeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	switch r.URL.Path {
-	case api.CreateNewCustomer:
-		h.CreateNewCustomerHandler(w, r)
+	//case api.CreateNewCustomer:
+	//	h.CreateNewCustomerHandler(w, r)
 	case api.GenerateSignupInterface:
 		h.GenerateSignupInterfaceHandler(w, r)
 	case api.SetNKode:
@@ -46,7 +46,7 @@ func (h *NKodeHandler) CreateNewCustomerHandler(w http.ResponseWriter, r *http.R
 		log.Fatal(err)
 		return
 	}
-	customerId, err := h.Api.CreateNewCustomer(customerPost.NKodePolicy)
+	customerId, err := h.Api.CreateNewCustomer(customerPost.NKodePolicy, nil)
 	if err != nil {
 		internalServerErrorHandler(w)
 		log.Fatal(err)
@@ -84,7 +84,17 @@ func (h *NKodeHandler) GenerateSignupInterfaceHandler(w http.ResponseWriter, r *
 		log.Fatal(err)
 		return
 	}
-	resp, err := h.Api.GenerateSignupInterface(signupPost.CustomerId, KeypadDefault)
+	kp := KeypadDimension{
+		AttrsPerKey: signupPost.AttrsPerKey,
+		NumbOfKeys:  signupPost.NumbOfKeys,
+	}
+	err = kp.IsValidKeypadDimension()
+	if err != nil {
+		keypadSizeOutOfRange(w)
+		log.Fatal(err)
+		return
+	}
+	resp, err := h.Api.GenerateSignupInterface(signupPost.CustomerId, kp)
 	if err != nil {
 		internalServerErrorHandler(w)
 		log.Fatal(err)
@@ -270,3 +280,8 @@ func methodNotAllowed(w http.ResponseWriter) {
 	w.WriteHeader(http.StatusMethodNotAllowed)
 	w.Write([]byte("405 method not allowed"))
 }
+
+func keypadSizeOutOfRange(w http.ResponseWriter) {
+	w.WriteHeader(http.StatusBadRequest)
+	w.Write([]byte("invalid keypad dimensions"))
+}

core/model/nkode_policy.go

@@ -1,4 +1,4 @@
-package m
+package model
 
 import (
 	"errors"

core/model/test_helper.go

@@ -1,4 +1,4 @@
-package m
+package model
 
 import (
 	"errors"

core/model/type.go

@@ -1,4 +1,4 @@
-package m
+package model
 
 import (
 	"github.com/google/uuid"
@@ -13,7 +13,9 @@ type NewCustomerPost struct {
 }
 
 type GenerateSignupInterfacePost struct {
-	CustomerId CustomerId `json:"customer_id"`
+	CustomerId  CustomerId `json:"customer_id"`
+	AttrsPerKey int        `json:"attrs_per_key"`
+	NumbOfKeys  int        `json:"numb_of_keys"`
 }
 
 type SetNKodePost struct {
@@ -66,7 +68,7 @@ type Username string
 type IdxInterface []int
 
 type NKodeAPIInterface interface {
-	CreateNewCustomer(NKodePolicy) (*CustomerId, error)
+	CreateNewCustomer(NKodePolicy, *CustomerId) (*CustomerId, error)
 	GenerateSignupInterface(CustomerId, KeypadDimension) (*GenerateSignupInterfaceResp, error)
 	SetNKode(Username, CustomerId, SessionId, KeySelection) (IdxInterface, error)
 	ConfirmNKode(CustomerId, SessionId, KeySelection) error

core/model/user.go

@@ -1,4 +1,4 @@
-package m
+package model
 
 import (
 	"go-nkode/util"

core/model/user_cipher_keys.go

@@ -1,4 +1,4 @@
-package m
+package model
 
 import (
 	"crypto/sha256"

core/model/user_interface.go

@@ -1,4 +1,4 @@
-package m
+package model
 
 import (
 	"errors"

core/model/user_test.go

@@ -1,4 +1,4 @@
-package m
+package model
 
 import (
 	"github.com/stretchr/testify/assert"