From d1857f2db15739c28338d8a35dc11d3fc4edb5b6 Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Mon, 8 Jan 2024 15:16:41 +1100
Subject: [PATCH] fix typo

---
 models/user.go       | 9 ++++++++-
 utils/token/token.go | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/models/user.go b/models/user.go
index 2fb4c2a..465b611 100644
--- a/models/user.go
+++ b/models/user.go
@@ -358,7 +358,14 @@ func UserGetSafesAllowed(userId int) ([]UserSafe, error) {
 	var results []UserSafe
 
 	// join users, groups and permissions
-	rows, err := db.Queryx("SELECT users.UserId, users.GroupId, users.Admin as AdminUser, groups.Admin as AdminGroup, permissions.SafeId, safe.SafeName FROM users INNER JOIN groups ON users.GroupId = groups.GroupId INNER JOIN permissions ON groups.GroupId = permissions.GroupId INNER JOIN safes on permissions.SafeId = safes.SafeId WHERE users.UserId=?", userId)
+	rows, err := db.Queryx(`
+	SELECT users.UserId, users.GroupId, users.Admin as AdminUser, groups.Admin as AdminGroup,
+	permissions.SafeId, safes.SafeName FROM users
+	INNER JOIN groups ON users.GroupId = groups.GroupId
+	INNER JOIN permissions ON groups.GroupId = permissions.GroupId
+	INNER JOIN safes on permissions.SafeId = safes.SafeId
+	WHERE users.UserId=?"
+	`, userId)
 	if err != nil {
 		log.Printf("UserGetSafesAllowed error executing sql record : '%s'\n", err)
 		return results, err
diff --git a/utils/token/token.go b/utils/token/token.go
index a267180..b743595 100644
--- a/utils/token/token.go
+++ b/utils/token/token.go
@@ -52,7 +52,7 @@ func ExtractToken(c *gin.Context) string {
 		return token
 	}
 	bearerToken := c.Request.Header.Get("Authorization")
-	log.Printf("ExtractToken extracted token '%v'\n", bearerToken)
+	//log.Printf("ExtractToken extracted token '%v'\n", bearerToken)
 
 	if len(strings.Split(bearerToken, " ")) == 2 {
 		return strings.Split(bearerToken, " ")[1]