Override behaviour of handle_authentication_callback in duplicated ca…

…llback

Fix for “You are already logged in.” error message during login

src/Concrete/Authentication/Controller.php

@@ -4,6 +4,7 @@
 
 use Concrete\Core\Authentication\Type\OAuth\OAuth2\GenericOauth2TypeController;
 use Concrete\Core\User\User;
+use Concrete\Core\Routing\RedirectResponse;
 
 class Controller extends GenericOauth2TypeController
 {
@@ -43,6 +44,24 @@ public function saveAuthenticationType($args)
         \Config::save('auth.worldskills.registration.group', intval($args['registration_group'], 10));
     }
 
+    /**
+     * @override
+     */
+    public function handle_authentication_callback()
+    {
+        // parent handle_authentication_callback redirects to an error page if user is already logged in,
+        // override the behavior and simply let the logged in user continue
+        $user = $this->app->make(User::class);
+        if ($user && !$user->isError() && $user->isLoggedIn()) {
+            return new RedirectResponse(
+                $this->app->make('url/manager')->resolve(['/login', 'login_complete'])
+            );
+        }
+
+        // still use parent handle_authentication_callback for all other cases
+        return parent::handle_authentication_callback();
+    }
+
     public function edit()
     {
         $this->set('form', \Loader::helper('form'));