add update endpoint

models/secret.go

@@ -34,7 +34,7 @@ func (s *Secret) SaveSecret() (*Secret, error) {
 
 	if err != nil {
 		fmt.Printf("StoreSecret error executing sql record : '%s'\n", err)
-		return &Secret{}, err
+		return s, err
 	} else {
 		affected, _ := result.RowsAffected()
 		id, _ := result.LastInsertId()
@@ -54,7 +54,9 @@ func GetSecrets(s *Secret) ([]Secret, error) {
 
 	// Determine whether to query for a specific device or a category of devices
 	// Prefer querying device name than category
-	if s.DeviceName != "" {
+	if s.DeviceName != "" && s.DeviceCategory != "" {
+		rows, err = db.Queryx("SELECT * FROM secrets WHERE DeviceName LIKE ? AND DeviceCategory LIKE ? AND RoleId = ?", s.DeviceName, s.DeviceCategory, s.RoleId)
+	} else if s.DeviceName != "" {
 		rows, err = db.Queryx("SELECT * FROM secrets WHERE DeviceName LIKE ? AND RoleId = ?", s.DeviceName, s.RoleId)
 	} else if s.DeviceCategory != "" {
 		rows, err = db.Queryx("SELECT * FROM secrets WHERE DeviceCategory LIKE ? AND RoleId = ?", s.DeviceCategory, s.RoleId)
@@ -92,6 +94,31 @@ func GetSecrets(s *Secret) ([]Secret, error) {
 	return secretResults, nil
 }
 
+func (s *Secret) UpdateSecret() (*Secret, error) {
+
+	var err error
+
+	fmt.Printf("UpdateSecret storing values '%v'\n", s)
+
+	if s.SecretId == 0 {
+		err = errors.New("UpdateSecret unable to locate secret with empty secretId field")
+		fmt.Printf("UpdateSecret error in pre-check : '%s'\n", err)
+		return s, err
+	}
+
+	result, err := db.NamedExec((`UPDATE secrets SET DeviceName = :DeviceName, DeviceCategory = :DeviceCategory, UserName = :UserName, Secret = :Secret WHERE SecretId = :SecretId`), s)
+	if err != nil {
+		fmt.Printf("UpdateSecret error executing sql record : '%s'\n", err)
+		return &Secret{}, err
+	} else {
+		affected, _ := result.RowsAffected()
+		id, _ := result.LastInsertId()
+		fmt.Printf("UpdateSecret insert returned result id '%d' affecting %d row(s).\n", id, affected)
+	}
+
+	return s, nil
+}
+
 func (s *Secret) EncryptSecret() (*Secret, error) {
 
 	keyString := os.Getenv("SECRETS_KEY")

models/setup.go

@@ -150,7 +150,7 @@ func CreateTables() {
 		fmt.Printf("Error checking schema table : '%s'", err)
 		os.Exit(1)
 	}
-	schemaCheck, _ := CheckColumnExists("schema", "version")
+	schemaCheck, _ := CheckColumnExists("schema", "Version")
 	if !schemaCheck {
 		if _, err = db.Exec("INSERT INTO schema VALUES(1);"); err != nil {
 			fmt.Printf("Error adding initial scehama version : '%s'", err)