From f561f466a29255fcf45e635846224591e1160946 Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Wed, 29 Mar 2023 09:13:09 +1100
Subject: [PATCH] registering works

---
 controllers/auth.go |  3 +++
 go.mod              |  2 +-
 main.go             |  1 +
 models/setup.go     |  4 ++++
 models/user.go      | 20 +-------------------
 5 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/controllers/auth.go b/controllers/auth.go
index e842119..f551cc6 100644
--- a/controllers/auth.go
+++ b/controllers/auth.go
@@ -1,6 +1,7 @@
 package controllers
 
 import (
+	"fmt"
 	"html"
 	"net/http"
 	"strings"
@@ -34,6 +35,8 @@ func Register(c *gin.Context) {
 	if err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"Error hashing password": err.Error()})
 		return
+	} else {
+		fmt.Printf("Hashed password value is '%s'\n", string(hashedPassword))
 	}
 	u.Password = string(hashedPassword)
 
diff --git a/go.mod b/go.mod
index 671f690..a24d015 100644
--- a/go.mod
+++ b/go.mod
@@ -5,6 +5,7 @@ go 1.19
 require (
 	github.com/gin-gonic/gin v1.9.0
 	github.com/jmoiron/sqlx v1.3.5
+	golang.org/x/crypto v0.7.0
 	modernc.org/sqlite v1.21.0
 )
 
@@ -30,7 +31,6 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/crypto v0.7.0 // indirect
 	golang.org/x/mod v0.8.0 // indirect
 	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/sys v0.6.0 // indirect
diff --git a/main.go b/main.go
index 2ee8220..660b947 100644
--- a/main.go
+++ b/main.go
@@ -19,4 +19,5 @@ func main() {
 
 	r.Run(":8080")
 
+	models.DisconnectDatabase()
 }
diff --git a/models/setup.go b/models/setup.go
index 5b8320a..79f0204 100644
--- a/models/setup.go
+++ b/models/setup.go
@@ -78,6 +78,10 @@ func ConnectDatabase() {
 	//defer db.Close()
 }
 
+func DisconnectDatabase() {
+	defer db.Close()
+}
+
 func CreateTables() {
 	var err error
 	// Create database tables if it doesn't exist
diff --git a/models/user.go b/models/user.go
index 9885231..d953d02 100644
--- a/models/user.go
+++ b/models/user.go
@@ -14,19 +14,6 @@ func (u *User) SaveUser() (*User, error) {
 
 	var err error
 
-	/*
-		sql, err := GenerateInsertMethod(&u)
-		if err != nil {
-			fmt.Printf("SaveUser error generating sql record : '%s'\n", err)
-			return &User{}, err
-		} else {
-			fmt.Println(sql)
-		}
-		result, err := db.Exec(sql)
-	*/
-
-	fmt.Printf("SaveUser received object '%v'\n", u.RoleId)
-
 	result, err := db.NamedExec((`INSERT INTO users (RoleId, UserName, Password, AccessToken) VALUES (:RoleId, :UserName, :Password, :AccessToken)`), u)
 
 	if err != nil {
@@ -37,11 +24,6 @@ func (u *User) SaveUser() (*User, error) {
 		id, _ := result.LastInsertId()
 		fmt.Printf("SaveUser insert returned result id '%d' affecting %d row(s).\n", id, affected)
 	}
-	/*
-		err = CreateUser(&u).Error
-		if err != nil {
-			return &User{}, err
-		}
-	*/
+
 	return u, nil
 }