implemented login logic

database.go

@@ -21,7 +21,7 @@ func InitDatabase(ctx context.Context) {
 		CREATE TABLE IF NOT EXISTS users (
 		    Id SERIAL PRIMARY KEY,
 		    Name VARCHAR(20) UNIQUE NOT NULL,
-		    pass_hash VARCHAR(60) NOT NULL,
+		    PassHash VARCHAR(60) NOT NULL,
 		    Color VARCHAR(3) NOT NULL
 		)
 	`)
@@ -31,8 +31,8 @@ func InitDatabase(ctx context.Context) {
 	dbConnection = conn
 }
 
-func AddNewUser(ctx context.Context, user User) (uint, error) {
-	var id uint
+func AddNewUser(ctx context.Context, user User) (uint32, error) {
+	var id uint32
 	var err error
 
 	if len(user.Name) == 0 || len(user.Name) > 20 {
@@ -54,16 +54,16 @@ func AddNewUser(ctx context.Context, user User) (uint, error) {
 		return 0, errors.New("color invalid")
 	}
 	err = dbConnection.QueryRow(ctx, `
-        INSERT INTO users (Name, pass_hash, Color)
+        INSERT INTO users (Name, PassHash, Color)
         VALUES ($1, $2, $3)
         RETURNING Id
     `, user.Name, user.IsPasswordHashed, user.Color).Scan(&id)
 	return id, err
 }
 
-func CheckPassword(ctx context.Context, id string, plainPassword string) bool {
+func isPassValid(ctx context.Context, id uint32, plainPassword string) bool {
 	var controlHash string
-	err := dbConnection.QueryRow(ctx, "SELECT pass_hash FROM users WHERE Id = $1", id).Scan(&controlHash)
+	err := dbConnection.QueryRow(ctx, "SELECT PassHash FROM users WHERE Id = $1", id).Scan(&controlHash)
 	if err != nil {
 		return false
 	}
@@ -71,13 +71,23 @@ func CheckPassword(ctx context.Context, id string, plainPassword string) bool {
 	return bcrypt.CompareHashAndPassword([]byte(controlHash), []byte(plainPassword)) == nil
 }
 
-func GetUserData(ctx context.Context, id string) (User, error) {
+func GetUserDataById(ctx context.Context, id uint32) (*User, error) {
 	var user User
-	err := dbConnection.QueryRow(ctx, "SELECT Id, Name, pass_hash, Color FROM users WHERE Id = $1", id).
+	err := dbConnection.QueryRow(ctx, "SELECT Id, Name, PassHash, Color FROM users WHERE Id = $1", id).
 		Scan(&user.Id, &user.Name, &user.Password, &user.Color)
 	if err != nil {
-		return User{}, err
+		return &User{}, err
 	}
 	user.IsPasswordHashed = true
-	return user, nil
+	return &user, nil
+}
+func GetUserDataByName(ctx context.Context, name string) (*User, error) {
+	var user User
+	err := dbConnection.QueryRow(ctx, "SELECT Id, Name, PassHash, Color FROM users WHERE Name = $1", name).
+		Scan(&user.Id, &user.Name, &user.Password, &user.Color)
+	if err != nil {
+		return &User{}, err
+	}
+	user.IsPasswordHashed = true
+	return &user, nil
 }