From 4a3683979415a57fcad50d83d28ca85f6272b6fe Mon Sep 17 00:00:00 2001
From: drkthunder02 <mancuso.christopher@gmail.com>
Date: Tue, 10 Mar 2026 22:42:33 -0500
Subject: [PATCH] testing

---
 .../Controllers/Auth/EveLoginController.php   | 87 ++++++++++---------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/app/Http/Controllers/Auth/EveLoginController.php b/app/Http/Controllers/Auth/EveLoginController.php
index bce7738..cf8ff8d 100644
--- a/app/Http/Controllers/Auth/EveLoginController.php
+++ b/app/Http/Controllers/Auth/EveLoginController.php
@@ -74,51 +74,52 @@ class EveLoginController extends Controller
 
     private function CreateOrUpdateUser($ssoUser)
     {
-        
-        //Update user permissions, privileges, and add to database if not available.
-        $user = app(\App\Services\UserPrivilegeService::class)->privilegesChanged($user, function($user) {
-            //Get all the data we need from the ssoUser
-            $characterId = strtr($ssoUser['sub'], ['CHARACTER:EVE:' => '']);
-            $characterName = $ssoUser['name'];
-            $characterOwnerHash = $ssoUser['owner'];
-            $avatar = 'https://image.eveonline.com/Character/' . $characterId . '_128.jpg';
-            $token = $ssoUser->token;
-            $refreshToken = $ssoUser->refreshToken ?? null;
-            $expiresIn = $ssoUser->expiresIn ?? null;
-            $scopes = is_array($ssoUser['scp']) ? $ssoUser['scp'] : [$ssoUser['scp']];
-        
-            $user = User::updateOrCreate(
-                ['character_id' => $characterId],
-                [
-                    'avatar' => $avatar,
-                    'character_name' => $characterName,
-                    'character_owner_hash' => $characterOwnerHash,
-                    'token' => $token,
-                    'refresh_token' => $refreshToken,
-                    'expiresIn' => $expiresIn,
-                ]
-            );
+        $user = new User;
+        $privilege = new UserPrivilegeService;
 
-            //Delete currently saved scopes, then add the scopes used to login with.
-            EsiScope::where(['character_id' => $characterId])->delete();
-            foreach($scopes as $scope) {
-                $data = new EsiScope;
-                $data->character_id = $characterId;
-                $data->scope = $scope;
-                $data->save();
-            }
+        //Get all the data we need from the ssoUser
+        $characterId = strtr($ssoUser['sub'], ['CHARACTER:EVE:' => '']);
+        $characterName = $ssoUser['name'];
+        $characterOwnerHash = $ssoUser['owner'];
+        $avatar = 'https://image.eveonline.com/Character/' . $characterId . '_128.jpg';
+        $token = $ssoUser->token;
+        $refreshToken = $ssoUser->refreshToken ?? null;
+        $expiresIn = $ssoUser->expiresIn ?? null;
+        $scopes = is_array($ssoUser['scp']) ? $ssoUser['scp'] : [$ssoUser['scp']];
+    
+        $user = User::updateOrCreate(
+            ['character_id' => $characterId],
+            [
+                'avatar' => $avatar,
+                'character_name' => $characterName,
+                'character_owner_hash' => $characterOwnerHash,
+                'token' => $token,
+                'refresh_token' => $refreshToken,
+                'expiresIn' => $expiresIn,
+            ]
+        );
 
-            //Add Esi Token to the token database
-            $esiToken = EsiToken::updateOrCreate(
-                ['character_id' => $characterId],
-                [
-                    'access_token' => $token,
-                    'refresh_token' => $refreshToken,
-                    'inserted_at' => time(),
-                    'expires_in' => $expiresIn,
-                ]
-            );
-        });
+        //Delete currently saved scopes, then add the scopes used to login with.
+        EsiScope::where(['character_id' => $characterId])->delete();
+        foreach($scopes as $scope) {
+            $data = new EsiScope;
+            $data->character_id = $characterId;
+            $data->scope = $scope;
+            $data->save();
+        }
+
+        //Add Esi Token to the token database
+        $esiToken = EsiToken::updateOrCreate(
+            ['character_id' => $characterId],
+            [
+                'access_token' => $token,
+                'refresh_token' => $refreshToken,
+                'inserted_at' => time(),
+                'expires_in' => $expiresIn,
+            ]
+        );
+
+        $privilege->privilegesChanged($user);
 
         //Send the object back to the calling function
         return $user;