Merge branch '135-admin-user-invalid-login' into 'develop'

Resolve "Admin user Invalid Login"

Closes #135

See merge request ch/user-manager!163

pkg/db/postgres/user.go

@@ -44,15 +44,15 @@ func (pgdb *pgDB) GetAnyUserByLoginWOContext(login string) (*db.User, error) {
 	pgdb.log.Infoln("Get user by login", login)
 	var user db.User
 
-	rows, err := pgdb.conn.DB.Query("SELECT id FROM users WHERE login = $1", login)
+	rows, err := pgdb.conn.DB.Query("SELECT id, salt FROM users WHERE login = $1", login)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
 	if !rows.Next() {
 		return nil, rows.Err()
 	}
-	err = rows.Scan(&user.ID)
+	err = rows.Scan(&user.ID, &user.Salt)
 	return &user, err
 }
 

pkg/server/impl/admin.go

@@ -236,7 +236,7 @@ func (u *serverImpl) CreateFirstAdmin(password string) error {
 
 	if user != nil {
 		u.log.Info("updating admin password")
-		user.PasswordHash = utils.GetKey(user.Login, password, user.Salt)
+		user.PasswordHash = utils.GetKey("[email protected]", password, user.Salt)
 		err = u.svc.DB.UpdateUserWOContext(user)
 		if err != nil {
 			return err

pkg/server/impl/login.go

@@ -21,7 +21,6 @@ func (u *serverImpl) BasicLogin(ctx context.Context, request models.LoginRequest
 	u.log.Infoln("Basic login")
 	u.log.WithFields(logrus.Fields{
 		"username": request.Login,
-		"password": request.Password,
 	}).Debugln("Basic login details")
 
 	user, err := u.svc.DB.GetUserByLogin(ctx, request.Login)