start work on adding secrets

models/secret.go

@@ -1,8 +1,31 @@
 package models
 
+import "fmt"
+
 type Secret struct {
-	SecretId   int    `db:"SecretId"`
-	RoleId     int    `db:"RoleId"`
-	DeviceName string `db:"DeviceName"`
-	Secret     string `db:"Secret"`
+	SecretId       int    `db:"SecretId"`
+	RoleId         int    `db:"RoleId"`
+	DeviceName     string `db:"DeviceName"`
+	DeviceCategory string `db:"DeviceCategory"`
+	UserName       string `db:"UserName"`
+	Secret         string `db:"Secret"`
+}
+
+func (s *Secret) SaveSecret() (*Secret, error) {
+
+	var err error
+
+	fmt.Printf("SaveSecret storing values '%v'\n", s)
+	result, err := db.NamedExec((`INSERT INTO secrets (RoleId, DeviceName, DeviceCategory, UserName, Secret) VALUES (:RoleId, :DeviceName, :DeviceCategory, :UserName, :Secret)`), s)
+
+	if err != nil {
+		fmt.Printf("StoreSecret error executing sql record : '%s'\n", err)
+		return &Secret{}, err
+	} else {
+		affected, _ := result.RowsAffected()
+		id, _ := result.LastInsertId()
+		fmt.Printf("StoreSecret insert returned result id '%d' affecting %d row(s).\n", id, affected)
+	}
+
+	return s, nil
 }

models/setup.go

@@ -35,7 +35,6 @@ const createUsers string = `
 		RoleId INTEGER,
 		UserName VARCHAR,
 		Password VARCHAR,
-		AccessToken varchar,
 		FOREIGN KEY (RoleId) REFERENCES roles(RoleId)
 	);
 `
@@ -45,6 +44,7 @@ const createSecrets string = `
 		SecretId INTEGER PRIMARY KEY ASC,
 		RoleId INTEGER,
 		DeviceName VARCHAR,
+		DeviceCategory VARCHAR,
 		UserName VARCHAR,
 		Secret VARCHAR,
 		FOREIGN KEY (RoleId) REFERENCES roles(RoleId)
@@ -124,7 +124,7 @@ func CreateTables() {
 	}
 	rowCount, _ = CheckCount("users")
 	if rowCount == 0 {
-		if _, err = db.Exec("INSERT INTO users VALUES(1, 1, 'Administrator', '$2a$10$k1qldm.bWqZsQWrKPdahR.Pfz5LxkMUka2.8INEeSD7euzkiznIR.', 'token');"); err != nil {
+		if _, err = db.Exec("INSERT INTO users VALUES(1, 1, 'Administrator', '$2a$10$k1qldm.bWqZsQWrKPdahR.Pfz5LxkMUka2.8INEeSD7euzkiznIR.');"); err != nil {
 			fmt.Printf("Error adding initial admin role : '%s'", err)
 			os.Exit(1)
 		}

models/user.go

@@ -9,11 +9,10 @@ import (
 )
 
 type User struct {
-	UserId      int    `db:"UserId"`
-	RoleId      int    `db:"RoleId"`
-	UserName    string `db:"UserName"`
-	Password    string `db:"Password"`
-	AccessToken string `db:"AccessToken"`
+	UserId   int    `db:"UserId"`
+	RoleId   int    `db:"RoleId"`
+	UserName string `db:"UserName"`
+	Password string `db:"Password"`
 }
 
 type UserRole struct {
@@ -27,7 +26,7 @@ func (u *User) SaveUser() (*User, error) {
 
 	var err error
 
-	result, err := db.NamedExec((`INSERT INTO users (RoleId, UserName, Password, AccessToken) VALUES (:RoleId, :UserName, :Password, :AccessToken)`), u)
+	result, err := db.NamedExec((`INSERT INTO users (RoleId, UserName, Password) VALUES (:RoleId, :UserName, :Password)`), u)
 
 	if err != nil {
 		fmt.Printf("SaveUser error executing sql record : '%s'\n", err)
@@ -57,8 +56,6 @@ func LoginCheck(username string, password string) (string, error) {
 
 	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
 	}
@@ -109,7 +106,7 @@ func GetUserRoleByID(uid uint) (UserRole, error) {
 
 	// Query database for matching user object
 	fmt.Printf("GetUserRoleByID querying for userid '%d'\n", uid)
-	err := db.QueryRowx("SELECT users.UserId, users.RoleId, users.UserName, users.Password, users.AccessToken, roles.RoleName, roles.ReadOnly, roles.Admin FROM users INNER JOIN roles ON users.RoleId = roles.RoleId WHERE users.UserId=?", uid).StructScan(&ur)
+	err := db.QueryRowx("SELECT users.UserId, users.RoleId, users.UserName, users.Password, roles.RoleName, roles.ReadOnly, roles.Admin FROM users INNER JOIN roles ON users.RoleId = roles.RoleId WHERE users.UserId=?", uid).StructScan(&ur)
 	if err != nil {
 		fmt.Printf("GetUserRoleByID received error when querying database : '%s'\n", err)
 		return ur, errors.New("GetUserRoleByID user not found")