refactor: misc (#6102)

Signed-off-by: James Elliott <james-d-elliott@users.noreply.github.com>

1 files changed, 9 insertions, 10 deletions

diff --git a/internal/handlers/handler_user_info.go b/internal/handlers/handler_user_info.go
index 54aa056db..69377b041 100644
--- a/internal/handlers/handler_user_info.go
+++ b/internal/handlers/handler_user_info.go
@@ -31,15 +31,15 @@ func UserInfoPOST(ctx *middlewares.AutheliaCtx) {
 	if _, err = ctx.Providers.StorageProvider.LoadPreferred2FAMethod(ctx, userSession.Username); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
 			if err = ctx.Providers.StorageProvider.SavePreferred2FAMethod(ctx, userSession.Username, ""); err != nil {
-				ctx.Error(fmt.Errorf("unable to load user information: %v", err), messageOperationFailed)
+				ctx.Error(fmt.Errorf("unable to load user information: error occurred trying to save the users preferred 2FA method: %w", err), messageOperationFailed)
 			}
 		} else {
-			ctx.Error(fmt.Errorf("unable to load user information: %v", err), messageOperationFailed)
+			ctx.Error(fmt.Errorf("unable to load user information: error occurred trying to lookup the users preferred 2FA method: %w", err), messageOperationFailed)
 		}
 	}
 
 	if userInfo, err = ctx.Providers.StorageProvider.LoadUserInfo(ctx, userSession.Username); err != nil {
-		ctx.Error(fmt.Errorf("unable to load user information: %v", err), messageOperationFailed)
+		ctx.Error(fmt.Errorf("unable to load user information: %w", err), messageOperationFailed)
 		return
 	}
 
@@ -49,7 +49,7 @@ func UserInfoPOST(ctx *middlewares.AutheliaCtx) {
 
 	if changed = userInfo.SetDefaultPreferred2FAMethod(ctx.AvailableSecondFactorMethods(), ctx.Configuration.Default2FAMethod); changed {
 		if err = ctx.Providers.StorageProvider.SavePreferred2FAMethod(ctx, userSession.Username, userInfo.Method); err != nil {
-			ctx.Error(fmt.Errorf("unable to save user two factor method: %v", err), messageOperationFailed)
+			ctx.Error(fmt.Errorf("unable to save user two factor method: %w", err), messageOperationFailed)
 			return
 		}
 	}
@@ -58,7 +58,7 @@ func UserInfoPOST(ctx *middlewares.AutheliaCtx) {
 
 	err = ctx.SetJSONBody(userInfo)
 	if err != nil {
-		ctx.Logger.Errorf("Unable to set user info response in body: %s", err)
+		ctx.Logger.WithError(err).Errorf("Error occurred trying to set user info response in body")
 	}
 }
 
@@ -79,7 +79,7 @@ func UserInfoGET(ctx *middlewares.AutheliaCtx) {
 
 	userInfo, err := ctx.Providers.StorageProvider.LoadUserInfo(ctx, userSession.Username)
 	if err != nil {
-		ctx.Error(fmt.Errorf("unable to load user information: %v", err), messageOperationFailed)
+		ctx.Error(fmt.Errorf("unable to load user information: %w", err), messageOperationFailed)
 		return
 	}
 
@@ -87,7 +87,7 @@ func UserInfoGET(ctx *middlewares.AutheliaCtx) {
 
 	err = ctx.SetJSONBody(userInfo)
 	if err != nil {
-		ctx.Logger.Errorf("Unable to set user info response in body: %s", err)
+		ctx.Logger.Errorf("Unable to set user info response in body: %+v", err)
 	}
 }
 
@@ -119,10 +119,9 @@ func MethodPreferencePOST(ctx *middlewares.AutheliaCtx) {
 	}
 
 	ctx.Logger.Debugf("Save new preferred 2FA method of user %s to %s", userSession.Username, bodyJSON.Method)
-	err = ctx.Providers.StorageProvider.SavePreferred2FAMethod(ctx, userSession.Username, bodyJSON.Method)
 
-	if err != nil {
-		ctx.Error(fmt.Errorf("unable to save new preferred 2FA method: %s", err), messageOperationFailed)
+	if err = ctx.Providers.StorageProvider.SavePreferred2FAMethod(ctx, userSession.Username, bodyJSON.Method); err != nil {
+		ctx.Error(fmt.Errorf("unable to save new preferred 2FA method: %w", err), messageOperationFailed)
 		return
 	}