add username to secret retrieve audit log

controllers/retrieveSecrets.go

@@ -161,7 +161,7 @@ func retrieveSpecifiedSecret(s *models.Secret, c *gin.Context) {
 			UserId:    UserId,
 			SecretId:  results[i].SecretId,
 			IpAddress: c.ClientIP(),
-			EventText: fmt.Sprintf("Retrieved Secret Id %d", results[i].SecretId),
+			EventText: fmt.Sprintf("User %s retrieved Secret Id %d", results[0].UserName, results[i].SecretId),
 		}
 		a.AuditLogAdd()
 	}

models/user.go

@@ -408,7 +408,7 @@ func UserGetSafesAllowed(userId int) ([]UserSafe, error) {
 
 	// join users, groups and permissions
 	rows, err := db.Queryx(`
-	SELECT users.UserId, users.GroupId,
+	SELECT users.UserId, users.GroupId, users.UserName, 
 	permissions.SafeId, permissions.ReadOnly, safes.SafeName FROM users
 	INNER JOIN groups ON users.GroupId = groups.GroupId
 	INNER JOIN permissions ON groups.GroupId = permissions.GroupId