From 12036aa21f4308aca4d816864b357f9627a0f437 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Thu, 16 Jul 2015 07:28:46 -0400
Subject: Refactoring of Google Authentication (new callback url)

---
 app/Template/auth/index.php    | 2 +-
 app/Template/user/external.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/Template')

diff --git a/app/Template/auth/index.php b/app/Template/auth/index.php
index 39d007f5..ed923f07 100644
--- a/app/Template/auth/index.php
+++ b/app/Template/auth/index.php
@@ -17,7 +17,7 @@
         <?= $this->form->checkbox('remember_me', t('Remember Me'), 1, true) ?><br/>
 
         <?php if (GOOGLE_AUTH): ?>
-            <?= $this->url->link(t('Login with my Google Account'), 'user', 'google') ?>
+            <?= $this->url->link(t('Login with my Google Account'), 'oauth', 'google') ?>
         <?php endif ?>
 
         <?php if (GITHUB_AUTH): ?>
diff --git a/app/Template/user/external.php b/app/Template/user/external.php
index df85ace7..18d40d79 100644
--- a/app/Template/user/external.php
+++ b/app/Template/user/external.php
@@ -8,9 +8,9 @@
     <p class="listing">
     <?php if ($this->user->isCurrentUser($user['id'])): ?>
         <?php if (empty($user['google_id'])): ?>
-            <?= $this->url->link(t('Link my Google Account'), 'user', 'google', array(), true) ?>
+            <?= $this->url->link(t('Link my Google Account'), 'oauth', 'google', array(), true) ?>
         <?php else: ?>
-            <?= $this->url->link(t('Unlink my Google Account'), 'user', 'unlinkGoogle', array(), true) ?>
+            <?= $this->url->link(t('Unlink my Google Account'), 'oauth', 'unlink', array('backend' => 'google'), true) ?>
         <?php endif ?>
     <?php else: ?>
         <?= empty($user['google_id']) ? t('No account linked.') : t('Account linked.') ?>
-- 
cgit v1.2.3