From adb98241c714f0c7aa9c6776dceb74c5957d364b Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik.hautakoski@gmail.com>
Date: Sun, 10 Jun 2018 20:54:02 +0200
Subject: [PATCH] app/controllers/AuthController.php: in oauthAction() if we
 have an authed user then we should connect accounts.

---
 app/controllers/AuthController.php | 40 ++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/controllers/AuthController.php b/app/controllers/AuthController.php
index 08331e7..fb16ab2 100644
--- a/app/controllers/AuthController.php
+++ b/app/controllers/AuthController.php
@@ -54,22 +54,40 @@ class AuthController extends ControllerBase
                 // NOTE: Should pass $state here also.
                 $data = $client->authenticate($code);
 
-                $result = $this->auth->loginOauth($data);
+                // If user is authed already, we connect.
+                $user = $this->auth->getUser();
+                if ($user) {
 
-                // There was an error when creating the account
-                if (is_array($result)) {
-                    $msg = '';
-                    foreach($result as $message) {
-                        $msg .= '<li>' . $message->getMessage() . '</li>';
+                    $name = ucfirst($provider_name);
+                    $user->{'set' . $name . 'Id'}($data->getId());
+                    $user->save();
+
+                    $this->flash->message('success', "<strong>{$name}</strong> was connected!");
+                    $this->response->redirect('/settings');
+                }
+                // Perform Auth.
+                else {
+                    $result = $this->auth->loginOauth($data);
+
+                    // There was an error when creating the account
+                    if (is_array($result)) {
+                        $msg = '';
+                        foreach ($result as $message) {
+                            $msg .= '<li>' . $message->getMessage() . '</li>';
+                        }
+                        $this->flash->message('error', "Failed to create account: <ul>{$msg}</ul>");
+                        $this->response->redirect('/login');
+                    } else {
+                        $this->response->redirect('/');
                     }
-                    $this->flash->message('error', "Failed to create account: <ul>{$msg}</ul>");
-                    $this->response->redirect('/login');
-                } else {
-                    $this->response->redirect('/');
                 }
             } catch(\Exception $e) {
                 $this->flash->message('error', 'Failed to authenticate.');
-                $this->response->redirect('/login');
+                if ($this->auth->getUser()) {
+                    $this->response->redirect('/settings');
+                } else {
+                    $this->response->redirect('/login');
+                }
             }
         }
         // No code