refactor create endpoint

This commit is contained in:
kiwiidb
2022-01-19 15:40:41 +01:00
parent 18f65e4546
commit cbf3cecb32
2 changed files with 47 additions and 46 deletions

View File

@@ -1,21 +1,12 @@
package controllers
import (
"context"
"database/sql"
"math/rand"
"net/http"
"github.com/getAlby/lndhub.go/db/models"
"github.com/getAlby/lndhub.go/lib"
"github.com/getAlby/lndhub.go/lib/security"
"github.com/labstack/echo/v4"
"github.com/labstack/gommon/random"
"github.com/uptrace/bun"
)
const alphaNumBytes = random.Alphanumeric
// CreateUserController : Create user controller struct
type CreateUserController struct {
svc *lib.LndhubService
@@ -37,34 +28,8 @@ func (controller *CreateUserController) CreateUser(c echo.Context) error {
if err := c.Bind(&body); err != nil {
return err
}
user := models.User{}
// generate user login/password (TODO: allow the user to choose a login/password?)
user.Login = randStringBytes(8)
password := randStringBytes(15)
// we only store the hashed password but return the initial plain text password in the HTTP response
hashedPassword := security.HashPassword(password)
user.Password = hashedPassword
// Create user and the user's accounts
// We use double-entry bookkeeping so we use 4 accounts: incoming, current, outgoing and fees
// Wrapping this in a transaction in case something fails
err := controller.svc.DB.RunInTx(context.TODO(), &sql.TxOptions{}, func(ctx context.Context, tx bun.Tx) error {
if _, err := tx.NewInsert().Model(&user).Exec(ctx); err != nil {
return err
}
accountTypes := []string{"incoming", "current", "outgoing", "fees"}
for _, accountType := range accountTypes {
account := models.Account{UserID: user.ID, Type: accountType}
if _, err := controller.svc.DB.NewInsert().Model(&account).Exec(ctx); err != nil {
return err
}
}
return nil
})
// Was the DB transaction successful?
user, err := controller.svc.Create()
//todo json response
if err != nil {
return err
}
@@ -74,15 +39,7 @@ func (controller *CreateUserController) CreateUser(c echo.Context) error {
Password string `json:"password"`
}
ResponseBody.Login = user.Login
ResponseBody.Password = password
ResponseBody.Password = user.Password
return c.JSON(http.StatusOK, &ResponseBody)
}
func randStringBytes(n int) string {
b := make([]byte, n)
for i := range b {
b[i] = alphaNumBytes[rand.Intn(len(alphaNumBytes))]
}
return string(b)
}