Refactoring of Google Authentication (new callback url)

2 files changed, 114 insertions, 63 deletions

diff --git a/app/Controller/Oauth.php b/app/Controller/Oauth.php
new file mode 100644
index 00000000..32947d1a
--- /dev/null
+++ b/app/Controller/Oauth.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace Controller;
+
+/**
+ * OAuth controller
+ *
+ * @package  controller
+ * @author   Frederic Guillot
+ */
+class Oauth extends Base
+{
+    /**
+     * Link or authenticate a Google account
+     *
+     * @access public
+     */
+    public function google()
+    {
+        $this->step1('google');
+    }
+
+    /**
+     * Unlink external account
+     *
+     * @access public
+     */
+    public function unlink($backend = '')
+    {
+        $backend = $this->request->getStringParam('backend', $backend);
+        $this->checkCSRFParam();
+
+        if ($this->authentication->backend($backend)->unlink($this->userSession->getId())) {
+            $this->session->flash(t('Your external account is not linked anymore to your profile.'));
+        }
+        else {
+            $this->session->flashError(t('Unable to unlink your external account.'));
+        }
+
+        $this->response->redirect($this->helper->url->to('user', 'external', array('user_id' => $this->userSession->getId())));
+    }
+
+    /**
+     * Redirect to the provider if no code received
+     *
+     * @access private
+     */
+    private function step1($backend)
+    {
+        $code = $this->request->getStringParam('code');
+
+        if (! empty($code)) {
+            $this->step2($backend, $code);
+        }
+        else {
+            $this->response->redirect($this->authentication->backend($backend)->getService()->getAuthorizationUrl());
+        }
+    }
+
+    /**
+     * Link or authenticate the user
+     *
+     * @access private
+     */
+    private function step2($backend, $code)
+    {
+        $profile = $this->authentication->backend($backend)->getProfile($code);
+
+        if ($this->userSession->isLogged()) {
+            $this->link($backend, $profile);
+        }
+
+        $this->authenticate($backend, $profile);
+    }
+
+    /**
+     * Link the account
+     *
+     * @access private
+     */
+    private function link($backend, $profile)
+    {
+        if (empty($profile)) {
+            $this->session->flashError(t('External authentication failed'));
+        }
+        else {
+            $this->session->flash(t('Your external account is linked to your profile successfully.'));
+            $this->authentication->backend($backend)->updateUser($this->userSession->getId(), $profile);
+        }
+
+        $this->response->redirect($this->helper->url->to('user', 'external', array('user_id' => $this->userSession->getId())));
+    }
+
+    /**
+     * Authenticate the account
+     *
+     * @access private
+     */
+    private function authenticate($backend, $profile)
+    {
+        if (! empty($profile) && $this->authentication->backend($backend)->authenticate($profile['id'])) {
+            $this->response->redirect($this->helper->url->to('app', 'index'));
+        }
+        else {
+            $this->response->html($this->template->layout('auth/index', array(
+                'errors' => array('login' => t('External authentication failed')),
+                'values' => array(),
+                'no_layout' => true,
+                'redirect_query' => '',
+                'title' => t('Login')
+            )));
+        }
+    }
+}
diff --git a/app/Controller/User.php b/app/Controller/User.php
index edebf5ba..7a17d98e 100644
--- a/app/Controller/User.php
+++ b/app/Controller/User.php
@@ -362,69 +362,6 @@ class User extends Base
     }
 
     /**
-     * Google authentication
-     *
-     * @access public
-     */
-    public function google()
-    {
-        $code = $this->request->getStringParam('code');
-
-        if ($code) {
-
-            $profile = $this->authentication->backend('google')->getGoogleProfile($code);
-
-            if (is_array($profile)) {
-
-                // If the user is already logged, link the account otherwise authenticate
-                if ($this->userSession->isLogged()) {
-
-                    if ($this->authentication->backend('google')->updateUser($this->userSession->getId(), $profile)) {
-                        $this->session->flash(t('Your Google Account is linked to your profile successfully.'));
-                    }
-                    else {
-                        $this->session->flashError(t('Unable to link your Google Account.'));
-                    }
-
-                    $this->response->redirect($this->helper->url->to('user', 'external', array('user_id' => $this->userSession->getId())));
-                }
-                else if ($this->authentication->backend('google')->authenticate($profile['id'])) {
-                    $this->response->redirect($this->helper->url->to('app', 'index'));
-                }
-                else {
-                    $this->response->html($this->template->layout('auth/index', array(
-                        'errors' => array('login' => t('Google authentication failed')),
-                        'values' => array(),
-                        'no_layout' => true,
-                        'redirect_query' => '',
-                        'title' => t('Login')
-                    )));
-                }
-            }
-        }
-
-        $this->response->redirect($this->authentication->backend('google')->getAuthorizationUrl());
-    }
-
-    /**
-     * Unlink a Google account
-     *
-     * @access public
-     */
-    public function unlinkGoogle()
-    {
-        $this->checkCSRFParam();
-        if ($this->authentication->backend('google')->unlink($this->userSession->getId())) {
-            $this->session->flash(t('Your Google Account is not linked anymore to your profile.'));
-        }
-        else {
-            $this->session->flashError(t('Unable to unlink your Google Account.'));
-        }
-
-        $this->response->redirect($this->helper->url->to('user', 'external', array('user_id' => $this->userSession->getId())));
-    }
-
-    /**
      * GitHub authentication
      *
      * @access public