From e286356cd7d9e4a7ff929e4fc75ec47122e16ac0 Mon Sep 17 00:00:00 2001
From: Evan Goode <mail@evangoo.de>
Date: Sat, 30 Nov 2024 13:34:38 -0500
Subject: [PATCH] Lint

---
 auth_test.go | 17 ++++++++---------
 front.go     |  2 +-
 user.go      |  5 ++++-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/auth_test.go b/auth_test.go
index c32dc38..ec646a0 100644
--- a/auth_test.go
+++ b/auth_test.go
@@ -223,11 +223,11 @@ func (ts *TestSuite) testAuthenticate(t *testing.T) {
 }
 
 func (ts *TestSuite) testInvalidate(t *testing.T) {
-	// First, authenticate to get a token pair
-	authenticateRes := ts.authenticate(t, TEST_PLAYER_NAME, TEST_PASSWORD)
-	clientToken := authenticateRes.ClientToken
-	accessToken := authenticateRes.AccessToken
 	{
+		authenticateRes := ts.authenticate(t, TEST_PLAYER_NAME, TEST_PASSWORD)
+		clientToken := authenticateRes.ClientToken
+		accessToken := authenticateRes.AccessToken
+
 		// Successful invalidate
 		// We should start with valid clients in the database
 		client := ts.App.GetClient(accessToken, StalePolicyDeny)
@@ -259,12 +259,11 @@ func (ts *TestSuite) testInvalidate(t *testing.T) {
 			assert.Equal(t, oldVersions[client.ClientToken]+1, client.Version)
 		}
 	}
-
-	// Re-authenticate
-	authenticateRes = ts.authenticate(t, TEST_PLAYER_NAME, TEST_PASSWORD)
-	clientToken = authenticateRes.ClientToken
-	accessToken = authenticateRes.AccessToken
 	{
+		// Re-authenticate
+		authenticateRes := ts.authenticate(t, TEST_PLAYER_NAME, TEST_PASSWORD)
+		clientToken := authenticateRes.ClientToken
+
 		// Invalidate should fail if we send an invalid access token
 		payload := refreshRequest{
 			ClientToken: clientToken,
diff --git a/front.go b/front.go
index 905482e..4ca3007 100644
--- a/front.go
+++ b/front.go
@@ -833,7 +833,7 @@ func frontChallenge(app *App, action string) func(c echo.Context) error {
 		if err != nil {
 			var userError *UserError
 			if errors.As(err, &userError) {
-				return NewWebError(returnURL, userError.Err.Error())
+				return NewWebError(returnURL, "Error: %s", userError.Err.Error())
 			}
 			return err
 		}
diff --git a/user.go b/user.go
index d3a6eb2..f887e02 100644
--- a/user.go
+++ b/user.go
@@ -362,7 +362,10 @@ func (app *App) UpdateUser(
 			if !callerIsAdmin {
 				return NewBadRequestUserError("Cannot change locked status of user without having admin privileges yourself.")
 			}
-			app.SetIsLocked(tx, &user, *isLocked)
+			err := app.SetIsLocked(tx, &user, *isLocked)
+			if err != nil {
+				return err
+			}
 		}
 
 		if err := tx.Save(&user).Error; err != nil {