From adee9bcb658df557861cd47f7d0eb6750b8b2888 Mon Sep 17 00:00:00 2001 From: heimoshuiyu Date: Mon, 13 Dec 2021 13:47:02 +0800 Subject: [PATCH] Simplify: register not return user object --- pkg/api/handle_user.go | 14 +++----------- pkg/database/method_user.go | 8 ++++---- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/pkg/api/handle_user.go b/pkg/api/handle_user.go index 0fd8751..7868e20 100644 --- a/pkg/api/handle_user.go +++ b/pkg/api/handle_user.go @@ -128,21 +128,13 @@ func (api *API) HandleRegister(w http.ResponseWriter, r *http.Request) { log.Println("Register user", request.Username) - user, err := api.Db.Register(request.Username, request.Password, request.Role) - if err != nil { - api.HandleError(w, r, err) - return - } - - resp := &LoginResponse{ - User: user, - } - - err = json.NewEncoder(w).Encode(resp) + err = api.Db.Register(request.Username, request.Password, request.Role) if err != nil { api.HandleError(w, r, err) return } + + api.HandleOK(w, r) } func (api *API) CheckAdmin(w http.ResponseWriter, r *http.Request) error { diff --git a/pkg/database/method_user.go b/pkg/database/method_user.go index 50762fd..826da88 100644 --- a/pkg/database/method_user.go +++ b/pkg/database/method_user.go @@ -22,10 +22,10 @@ func (database *Database) LoginAsAnonymous() (*User, error) { 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() if err != nil { - return nil, err + return err } 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) if err != nil { - return nil, err + return err } - return database.Login(username, password) + return nil } func (database *Database) GetUserById(id int64) (*User, error) {