still trying login issues

cranleighschool · Apr 11, 2024 · 6d61c2f · 6d61c2f
1 parent 4b13647
commit 6d61c2f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/app/Http/Controllers/Auth/FireflyAuth.php b/app/Http/Controllers/Auth/FireflyAuth.php
@@ -4,7 +4,9 @@
 
 use App\Models\User;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 trait FireflyAuth
 {
@@ -22,7 +24,7 @@ private function getIdentifierItems(string $identifier): array
         ];
     }
 
-    public function logout(Request $request)
+    public function logout(Request $request): RedirectResponse
     {
         auth()->logout();
 
@@ -41,9 +43,8 @@ private function convertXmlToObject(string $xmlString): object
          */
         $xml = simplexml_load_string($xmlString);
         $json = json_encode($xml);
-        $obj = json_decode($json);
 
-        return $obj;
+        return json_decode($json);
     }
 
     private function findOrCreateUserAndLogin(string $xmlString): void
@@ -60,7 +61,8 @@ private function findOrCreateUserAndLogin(string $xmlString): void
         }
 
         // log them in
-        auth()->login($existingUser, true);
+        session()->flush();
+        Auth::login($existingUser, true);
         // Update db with login time
         auth()->user()->update(['updated_at' => now()]);
 

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -63,7 +63,7 @@ public function callbackSuccess(Request $request, string $school): RedirectRespo
 
             $this->findOrCreateUserAndLogin($output);
 
-            return redirect()->to(route('raiseaconcern.submit'));
+            return redirect('/submit');
         }
 
         $debugarray = [