Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ func NewServer(store db.Store) *Server {
v.RegisterValidation("currency", validCurrency)
}

router.POST("/users", server.createUser)
router.POST("/accounts", server.createAccount)
router.GET("/accounts/:id", server.getAccount)
router.GET("/accounts", server.listAccount)
Expand Down
71 changes: 71 additions & 0 deletions api/user.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
package api

import (
"net/http"
"time"

"github.com/gin-gonic/gin"
"github.com/lib/pq"
db "github.com/sinachaichi/gault/db/sqlc"
"github.com/sinachaichi/gault/util"
)

type createUserRequest struct {
Username string `json:"username" binding:"required,alphanum"`
Password string `json:"password" binding:"required,min=6"`
FullName string `json:"full_name" binding:"required"`
Email string `json:"email" binding:"required,email"`
}

type createUserResponse struct {
Username string `json:"username"`
FullName string `json:"full_name"`
Email string `json:"email"`
PasswordChangedAt time.Time `json:"password_changed_at"`
CreatedAt time.Time `json:"created_at"`
}


func (server *Server) createUser(ctx *gin.Context) {
var req createUserRequest
if err := ctx.ShouldBindJSON(&req); err != nil {
ctx.JSON(http.StatusBadRequest, errorResponse(err))
return
}

hashedPassword, err := util.HashPassword(req.Password)
if err != nil {
ctx.JSON(http.StatusInternalServerError, errorResponse(err))
return
}

arg := db.CreateUserParams{
Username: req.Username,
HashedPassword: hashedPassword,
FullName: req.FullName,
Email: req.Email,
}


user, err := server.store.CreateUser(ctx, arg)
if err != nil {
if pqErr, ok := err.(*pq.Error); ok {
switch pqErr.Code.Name() {
case "unique_violation":
ctx.JSON(http.StatusForbidden, errorResponse(err))
return
}
}
ctx.JSON(http.StatusInternalServerError, errorResponse(err))
return
}

rsp := createUserResponse{
Username: user.Username,
FullName: user.FullName,
Email: user.Email,
PasswordChangedAt: user.PasswordChangedAt,
CreatedAt: user.CreatedAt,
}
ctx.JSON(http.StatusOK, rsp)
}
5 changes: 4 additions & 1 deletion db/sqlc/user_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,12 @@ import (
)

func createRandomUser(t *testing.T) User {
hashedPassword, err := util.HashPassword(util.RandomString(6))
require.NoError(t, err)

arg := CreateUserParams{
Username: util.RandomOwner(),
HashedPassword: "secret",
HashedPassword: hashedPassword,
FullName: util.RandomOwner(),
Email: util.RandomEmail(),
}
Expand Down
34 changes: 34 additions & 0 deletions util/passowrd_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package util

import (
"testing"

"github.com/stretchr/testify/require"
"golang.org/x/crypto/bcrypt"
)


func TestPassword(t *testing.T) {
password := RandomString(6)

hashedPassword1, err := HashPassword(password)
require.NoError(t, err)
require.NotEmpty(t, hashedPassword1)

err = CheckPassword(password, hashedPassword1)
require.NoError(t, err)

wrongPassword := RandomString(6)
err = CheckPassword(wrongPassword, hashedPassword1)
require.EqualError(t, err, bcrypt.ErrMismatchedHashAndPassword.Error())

hashedPassword2, err := HashPassword(password)
require.NoError(t, err)
require.NotEmpty(t, hashedPassword2)
require.NotEqual(t, hashedPassword1, hashedPassword2)

longPassword := RandomString(73)
hashedLongPassword, err := HashPassword(longPassword)
require.Error(t, err)
require.Empty(t, hashedLongPassword)
}
21 changes: 21 additions & 0 deletions util/password.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package util

import (
"fmt"

"golang.org/x/crypto/bcrypt"
)


func HashPassword(password string) (string, error) {
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
if err != nil {
return "", fmt.Errorf("failed to hash password: %w", err)
}
return string(hashedPassword), nil
}

func CheckPassword(password string, hashedPassword string) error {
return bcrypt.CompareHashAndPassword([]byte(hashedPassword), []byte(password))
}

Loading