Simplify: register not return user object
This commit is contained in:
@@ -128,21 +128,13 @@ func (api *API) HandleRegister(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
log.Println("Register user", request.Username)
|
log.Println("Register user", request.Username)
|
||||||
|
|
||||||
user, err := api.Db.Register(request.Username, request.Password, request.Role)
|
err = api.Db.Register(request.Username, request.Password, request.Role)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
api.HandleError(w, r, err)
|
api.HandleError(w, r, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
resp := &LoginResponse{
|
api.HandleOK(w, r)
|
||||||
User: user,
|
|
||||||
}
|
|
||||||
|
|
||||||
err = json.NewEncoder(w).Encode(resp)
|
|
||||||
if err != nil {
|
|
||||||
api.HandleError(w, r, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (api *API) CheckAdmin(w http.ResponseWriter, r *http.Request) error {
|
func (api *API) CheckAdmin(w http.ResponseWriter, r *http.Request) error {
|
||||||
|
|||||||
@@ -22,10 +22,10 @@ func (database *Database) LoginAsAnonymous() (*User, error) {
|
|||||||
return user, nil
|
return user, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (database *Database) Register(username string, password string, usertype int64) (*User, error) {
|
func (database *Database) Register(username string, password string, usertype int64) (error) {
|
||||||
countAdmin, err := database.CountAdmin()
|
countAdmin, err := database.CountAdmin()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
active := false
|
active := false
|
||||||
@@ -40,9 +40,9 @@ func (database *Database) Register(username string, password string, usertype in
|
|||||||
|
|
||||||
_, err = database.stmt.insertUser.Exec(username, password, usertype, active, 0)
|
_, err = database.stmt.insertUser.Exec(username, password, usertype, active, 0)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return err
|
||||||
}
|
}
|
||||||
return database.Login(username, password)
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (database *Database) GetUserById(id int64) (*User, error) {
|
func (database *Database) GetUserById(id int64) (*User, error) {
|
||||||
|
|||||||
Reference in New Issue
Block a user