From 53ad59c388e2ed25687f1c14587478f4211890bb Mon Sep 17 00:00:00 2001
From: Ilia Donchenko <iliad@me.com>
Date: Thu, 7 Jun 2018 11:27:06 +0300
Subject: [PATCH] Fix salt when changin admin password

---
 pkg/db/postgres/user.go  | 4 ++--
 pkg/server/impl/admin.go | 2 +-
 pkg/server/impl/login.go | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkg/db/postgres/user.go b/pkg/db/postgres/user.go
index 92a90d8e..fc8c7aff 100644
--- a/pkg/db/postgres/user.go
+++ b/pkg/db/postgres/user.go
@@ -44,7 +44,7 @@ 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
 	}
@@ -52,7 +52,7 @@ func (pgdb *pgDB) GetAnyUserByLoginWOContext(login string) (*db.User, error) {
 	if !rows.Next() {
 		return nil, rows.Err()
 	}
-	err = rows.Scan(&user.ID)
+	err = rows.Scan(&user.ID, &user.Salt)
 	return &user, err
 }
 
diff --git a/pkg/server/impl/admin.go b/pkg/server/impl/admin.go
index 61d529b5..da0947c4 100644
--- a/pkg/server/impl/admin.go
+++ b/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("admin@local.containerum.io", password, user.Salt)
 		err = u.svc.DB.UpdateUserWOContext(user)
 		if err != nil {
 			return err
diff --git a/pkg/server/impl/login.go b/pkg/server/impl/login.go
index dc8799b0..d7139d21 100644
--- a/pkg/server/impl/login.go
+++ b/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)