arnaucube/gogame
1
0
Fork 0
mirror of https://github.com/arnaucube/gogame.git synced 2026-02-07 03:26:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

add some User functions, move api tests from js to python

Browse Source
This commit is contained in:
arnaucube
2019-06-14 20:00:11 +02:00
parent 8f0d0fd5e0
commit be27edda88
13 changed files with 290 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
services/usersrv/usersrv.go
View File

@@ -31,8 +31,8 @@ func checkPasswordHash(password, hash string) bool {
}
func (srv Service) Register(name, password, email string) (*models.User, error) {
var user models.User
err := srv.db.Users.Find(bson.M{"email": email}).One(&user)
var userDb models.User
err := srv.db.Users.Find(bson.M{"email": email}).One(&userDb)
if err == nil {
return nil, errors.New("user already exist")
}
@@ -41,32 +41,22 @@ func (srv Service) Register(name, password, email string) (*models.User, error)
if err != nil {
return nil, err
}
newUser := models.User{
Name: name,
Password: hashedPassword,
Email: email,
}
err = srv.db.Users.Insert(newUser)
if err != nil {
return nil, err
}
err = srv.db.Users.Find(bson.M{"email": email}).One(&user)
user.Password = ""
return &user, err
user, err := models.NewUser(srv.db, name, hashedPassword, email)
return user, err
}
var signingKey = []byte("TODO") // TODO
func (srv Service) Login(email, password string) (*string, *models.User, error) {
var user models.User
err := srv.db.Users.Find(bson.M{"email": email}).One(&user)
var userDb models.UserDb
err := srv.db.Users.Find(bson.M{"email": email}).One(&userDb)
if err != nil {
return nil, nil, errors.New("user not exist")
}
if !checkPasswordHash(password, user.Password) {
if !checkPasswordHash(password, userDb.Password) {
return nil, nil, errors.New("error with password")
}
user.Password = ""
user := models.UserDbToUser(srv.db, userDb)
// create jwt
token := jwt.New(jwt.SigningMethodHS256)
@@ -80,5 +70,17 @@ func (srv Service) Login(email, password string) (*string, *models.User, error)
return nil, nil, errors.New("error creating token")
}
return &tokenString, &user, err
return &tokenString, user, err
}
// func (srv Service) GetUser(id bson.ObjectId) (*models.User, error) {
// // update user stats
// user := getUserFromDB
// user.GetStats()
//
// }
//
// func (srv Service) GetUser(id bson.ObjectId) (*models.User, error) {
// // update user stats
//
// }