From 0530f90c0510a2c84055dd1ec5a8ad7b78af47d8 Mon Sep 17 00:00:00 2001
From: "p.hollmann" <31701319+paulhollmann@users.noreply.github.com>
Date: Sat, 26 Aug 2023 10:51:38 +0200
Subject: [PATCH] fix connect controller

---
 app/Access/Controllers/VATSIMConnectController.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/Access/Controllers/VATSIMConnectController.php b/app/Access/Controllers/VATSIMConnectController.php
index b3e4cf29cc7..65166b6ca95 100644
--- a/app/Access/Controllers/VATSIMConnectController.php
+++ b/app/Access/Controllers/VATSIMConnectController.php
@@ -74,9 +74,6 @@ public function login(Request $request)
 
     /**
      * Check that all required data is received from the VATSIM Connect authentication system
-     *
-     * @param Request
-     * @return RedirectResponse|Redirect
      */
     protected function _verifyLogin(Request $request)
     {
@@ -103,11 +100,6 @@ protected function _verifyLogin(Request $request)
         if (!isset($resourceOwner->data) || !isset($resourceOwner->data->cid) || !isset($resourceOwner->data->personal->name_first) || !isset($resourceOwner->data->personal->name_last) || !isset($resourceOwner->data->personal->email) || $resourceOwner->data->oauth->token_valid !== "true") {
             return redirect()->route('vatsim.authentication.connect.failed');
         }
-
-        if (User::query()->where('email', $resourceOwner->data->personal->email)->exists()) {
-            return redirect()->route('vatsim.authentication.connect.failed');
-        }
-
         // All checks completed. Let's finally sign in the user
         $user = $this->_completeLogin($resourceOwner, $accessToken);
 
@@ -180,9 +172,9 @@ protected function _completeLogin($resourceOwner, $accessToken)
      * Display a failed message and then return to the login
      *
      */
-    public function failed(Request $request): RedirectResponse
+    public function failed(): RedirectResponse
     {
-        return redirect('/')->withErrors('Error logging in. Please try again.');
+        return redirect('/')->with('error','Error logging in. Please try again.');
     }
 
     /**