remodel the auth process using sendLoginReponse() like on VMT Dashb…

…oard

app/Domains/SelfReflection/Http/LoginController.php

@@ -45,22 +45,22 @@ public function callbackSuccess(Request $request): RedirectResponse
 
         $secret = $request->get('ffauth_secret');
 
-        $this->getUserData($secret);
+        return $this->getUserData($secret);
 
         return redirect()->route('selfreflection.home');
     }
 
     /**
      * @throws RequestException
      */
-    public function getUserData(string $secret): Authenticatable
+    public function getUserData(string $secret): RedirectResponse
     {
         $response = Http::get($this->url.'/login/api/sso', [
             'ffauth_secret' => $secret,
             'ffauth_device_id' => config('services.firefly.selfreflections.app'),
         ]);
 
-        $this->findOrCreateUserAndLogin($response->throw()->body());
+        return $this->findOrCreateUserAndLogin($response->throw()->body(), request());
 
         return auth()->user();
     }

app/Http/Controllers/Auth/FireflyAuth.php

@@ -47,7 +47,7 @@ private function convertXmlToObject(string $xmlString): object
         return json_decode($json);
     }
 
-    private function findOrCreateUserAndLogin(string $xmlString): void
+    private function findOrCreateUserAndLogin(string $xmlString, Request $request): RedirectResponse
     {
         $obj = $this->convertXmlToObject($xmlString);
 
@@ -61,10 +61,10 @@ private function findOrCreateUserAndLogin(string $xmlString): void
         }
 
         // log them in
-        session()->flush();
-        Auth::login($existingUser, true);
+        $this->guard()->login($existingUser);
         // Update db with login time
         auth()->user()->update(['updated_at' => now()]);
+        return $this->sendLoginResponse($request);
 
         // Let them know they've logged in
         session()->flash('alert-success', 'You have logged in as: '.auth()->user()->name);

app/Http/Controllers/Auth/LoginController.php

@@ -61,8 +61,9 @@ public function callbackSuccess(Request $request, string $school): RedirectRespo
                 'ffauth_secret' => $request->get('ffauth_secret'),
             ])->throw()->body();
 
-            $this->findOrCreateUserAndLogin($output);
+            return $this->findOrCreateUserAndLogin($output, $request);
 
+            return $this->sendLoginResponse($request);
             return redirect('/submit');
         }