From 841da60740fac024feebf669c4186618108ebd95 Mon Sep 17 00:00:00 2001
From: Jason <jasonrichardsmith@gmail.com>
Date: Tue, 30 Aug 2016 13:38:00 +0200
Subject: [PATCH] added names to register

---
 api/endpoints.go   | 10 ++++++----
 api/middlewares.go |  4 ++--
 api/service.go     |  6 ++++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/api/endpoints.go b/api/endpoints.go
index 259c1ca4..50545f77 100644
--- a/api/endpoints.go
+++ b/api/endpoints.go
@@ -57,7 +57,7 @@ func MakeLoginEndpoint(s Service) endpoint.Endpoint {
 func MakeRegisterEndpoint(s Service) endpoint.Endpoint {
 	return func(ctx context.Context, request interface{}) (response interface{}, err error) {
 		req := request.(registerRequest)
-		id, err := s.Register(req.Username, req.Password, req.Email)
+		id, err := s.Register(req.Username, req.Password, req.Email, req.FirstName, req.LastName)
 		return postResponse{ID: id}, err
 	}
 }
@@ -204,9 +204,11 @@ type cardsResponse struct {
 }
 
 type registerRequest struct {
-	Username string `json:"username"`
-	Password string `json:"password"`
-	Email    string `json:"email"`
+	Username  string `json:"username"`
+	Password  string `json:"password"`
+	Email     string `json:"email"`
+	FirstName string `json:"firstName"`
+	LastName  string `json:"lastName"`
 }
 
 type statusResponse struct {
diff --git a/api/middlewares.go b/api/middlewares.go
index 3abbec16..aedc27f3 100644
--- a/api/middlewares.go
+++ b/api/middlewares.go
@@ -35,7 +35,7 @@ func (mw loggingMiddleware) Login(username, password string) (user users.User, e
 	return mw.next.Login(username, password)
 }
 
-func (mw loggingMiddleware) Register(username, password, email string) (string, error) {
+func (mw loggingMiddleware) Register(username, password, email, first, last string) (string, error) {
 	defer func(begin time.Time) {
 		mw.logger.Log(
 			"method", "Register",
@@ -44,7 +44,7 @@ func (mw loggingMiddleware) Register(username, password, email string) (string,
 			"took", time.Since(begin),
 		)
 	}(time.Now())
-	return mw.next.Register(username, password, email)
+	return mw.next.Register(username, password, email, first, last)
 }
 
 func (mw loggingMiddleware) PostUser(user users.User) (id string, err error) {
diff --git a/api/service.go b/api/service.go
index 0a08de86..cb0f8305 100644
--- a/api/service.go
+++ b/api/service.go
@@ -20,7 +20,7 @@ var (
 // Service is the user service, providing operations for users to login, register, and retrieve customer information.
 type Service interface {
 	Login(username, password string) (users.User, error) // GET /login
-	Register(username, password, email string) (string, error)
+	Register(username, password, email, first, last string) (string, error)
 	GetUsers(id string) ([]users.User, error)
 	PostUser(u users.User) (string, error)
 	GetAddresses(id string) ([]users.Address, error)
@@ -51,11 +51,13 @@ func (s *fixedService) Login(username, password string) (users.User, error) {
 
 }
 
-func (s *fixedService) Register(username, password, email string) (string, error) {
+func (s *fixedService) Register(username, password, email, first, last string) (string, error) {
 	u := users.New()
 	u.Username = username
 	u.Password = calculatePassHash(password, u.Salt)
 	u.Email = email
+	u.FirstName = first
+	u.LastName = last
 	err := db.CreateUser(&u)
 	return u.UserID, err
 }