added login and test admin page

models/setup.go

@@ -3,12 +3,14 @@ package models
 import (
 	"errors"
 	"fmt"
+	"log"
 	"os"
 	"reflect"
 
 	"ccsecrets/utils"
 
 	"github.com/jmoiron/sqlx"
+	"github.com/joho/godotenv"
 	_ "modernc.org/sqlite"
 )
 
@@ -59,6 +61,13 @@ const createSchema string = `
 func ConnectDatabase() {
 	var err error
 
+	// Load data from environment file
+	err = godotenv.Load(".env")
+
+	if err != nil {
+		log.Fatalf("Error loading .env file")
+	}
+
 	// Try using sqlite as our database
 	sqlPath := utils.GetFilePath(sqlFile)
 	db, err = sqlx.Open("sqlite", sqlPath)
@@ -84,15 +93,19 @@ func DisconnectDatabase() {
 
 func CreateTables() {
 	var err error
+	var rowCount int
 	// Create database tables if it doesn't exist
 	// Roles table should go first since other tables refer to it
 	if _, err = db.Exec(createRoles); err != nil {
 		fmt.Printf("Error checking roles table : '%s'", err)
 		os.Exit(1)
 	}
-	if _, err = db.Exec("INSERT INTO roles VALUES(1, 'Admin', false, true);"); err != nil {
-		fmt.Printf("Error adding initial admin role : '%s'", err)
-		os.Exit(1)
+	rowCount, _ = CheckCount("roles")
+	if rowCount == 0 {
+		if _, err = db.Exec("INSERT INTO roles VALUES(1, 'Admin', false, true);"); err != nil {
+			fmt.Printf("Error adding initial admin role : '%s'", err)
+			os.Exit(1)
+		}
 	}
 
 	// Users table
@@ -100,9 +113,12 @@ func CreateTables() {
 		fmt.Printf("Error checking users table : '%s'", err)
 		os.Exit(1)
 	}
-	if _, err = db.Exec("INSERT INTO users VALUES(1, 1, 'Administrator', 'password', 'token');"); err != nil {
-		fmt.Printf("Error adding initial admin role : '%s'", err)
-		os.Exit(1)
+	rowCount, _ = CheckCount("users")
+	if rowCount == 0 {
+		if _, err = db.Exec("INSERT INTO users VALUES(1, 1, 'Administrator', 'password', 'token');"); err != nil {
+			fmt.Printf("Error adding initial admin role : '%s'", err)
+			os.Exit(1)
+		}
 	}
 	// Secrets table
 	if _, err = db.Exec(createSecrets); err != nil {
@@ -123,6 +139,24 @@ func CreateTables() {
 	}
 }
 
+// Count the number of records in the sqlite database
+// Borrowed from https://gist.github.com/trkrameshkumar/f4f1c00ef5d578561c96?permalink_comment_id=2687592#gistcomment-2687592
+func CheckCount(tablename string) (int, error) {
+	var count int
+	stmt, err := db.Prepare("SELECT COUNT(*) as count FROM " + tablename)
+	if err != nil {
+		fmt.Printf("CheckCount error preparing sqlite statement : '%s'\n", err)
+		return 0, err
+	}
+	err = stmt.QueryRow().Scan(&count)
+	if err != nil {
+		fmt.Printf("CheckCount error querying database record count : '%s'\n", err)
+		return 0, err
+	}
+	stmt.Close() // or use defer rows.Close(), idc
+	return count, nil
+}
+
 // From https://stackoverflow.com/a/60100045
 func GenerateInsertMethod(q interface{}) (string, error) {
 	if reflect.ValueOf(q).Kind() == reflect.Struct {

models/user.go

@@ -1,6 +1,12 @@
 package models
 
-import "fmt"
+import (
+	"ccsecrets/utils/token"
+	"errors"
+	"fmt"
+
+	"golang.org/x/crypto/bcrypt"
+)
 
 type User struct {
 	UserId      int    `db:"UserId"`
@@ -27,3 +33,69 @@ func (u *User) SaveUser() (*User, error) {
 
 	return u, nil
 }
+
+func VerifyPassword(password, hashedPassword string) error {
+	fmt.Printf("VerifyPassword comparing password vs hashed:\n'%s'\n'%s'\n", password, hashedPassword)
+	return bcrypt.CompareHashAndPassword([]byte(hashedPassword), []byte(password))
+}
+
+func LoginCheck(username string, password string) (string, error) {
+
+	var err error
+
+	u := User{}
+
+	// Query database for matching user object
+	err = db.QueryRowx("SELECT * FROM Users WHERE Username=?", username).StructScan(&u)
+
+	fmt.Printf("LoginCheck retrieved user '%v' from database\n", u)
+
+	//err = DB.Model(User{}).Where("username = ?", username).Take(&u).Error
+
+	if err != nil {
+		return "", err
+	}
+
+	err = VerifyPassword(password, u.Password)
+
+	if err != nil && err == bcrypt.ErrMismatchedHashAndPassword {
+		fmt.Printf("LoginCheck says password doesn't match stored hash.\n")
+		return "", err
+	} else {
+		fmt.Printf("LoginCheck verified password against stored hash.\n")
+	}
+
+	token, err := token.GenerateToken(uint(u.UserId))
+
+	if err != nil {
+		fmt.Printf("LoginCheck error generating token : '%s'\n", err)
+		return "", err
+	}
+
+	return token, nil
+
+}
+
+func GetUserByID(uid uint) (User, error) {
+
+	var u User
+
+	// Query database for matching user object
+	err := db.QueryRowx("SELECT * FROM Users WHERE UserId=?", uid).StructScan(&u)
+	if err != nil {
+		return u, errors.New("user not found")
+	}
+	/*
+		if err := DB.First(&u, uid).Error; err != nil {
+			return u, errors.New("User not found!")
+		}
+	*/
+	u.PrepareGive()
+
+	return u, nil
+
+}
+
+func (u *User) PrepareGive() {
+	u.Password = ""
+}