4 files changed, 6 insertions, 31 deletions
diff --git a/app/Template/auth/index.php b/app/Template/auth/index.php
index a1059d6f..99444d37 100644
--- a/app/Template/auth/index.php
+++ b/app/Template/auth/index.php
@@ -40,12 +40,8 @@
 
     <?= $this->hook->render('template:auth:login-form:after') ?>
 
-    <?php if (GOOGLE_AUTH || GITHUB_AUTH || GITLAB_AUTH): ?>
+    <?php if (GITHUB_AUTH || GITLAB_AUTH): ?>
     <ul class="no-bullet">
-        <?php if (GOOGLE_AUTH): ?>
-            <li><?= $this->url->link(t('Login with my Google Account'), 'oauth', 'google') ?></li>
-        <?php endif ?>
-
         <?php if (GITHUB_AUTH): ?>
             <li><?= $this->url->link(t('Login with my Github Account'), 'oauth', 'github') ?></li>
         <?php endif ?>
diff --git a/app/Template/config/integrations.php b/app/Template/config/integrations.php
index bba85672..ef490cdf 100644
--- a/app/Template/config/integrations.php
+++ b/app/Template/config/integrations.php
@@ -3,17 +3,9 @@
 </div>
 
 <form method="post" action="<?= $this->url->href('config', 'integrations') ?>" autocomplete="off">
-
     <?= $this->form->csrf() ?>
-
     <?= $this->hook->render('template:config:integrations', array('values' => $values)) ?>
 
-    <h3><i class="fa fa-google"></i> <?= t('Google Authentication') ?></h3>
-    <div class="listing">
-    <input type="text" class="auto-select" readonly="readonly" value="<?= $this->url->href('oauth', 'google', array(), false, '', true) ?>"/><br/>
-    <p class="form-help"><?= $this->url->doc(t('Help on Google authentication'), 'google-authentication') ?></p>
-    </div>
-
     <h3><i class="fa fa-github"></i> <?= t('Github Authentication') ?></h3>
     <div class="listing">
     <input type="text" class="auto-select" readonly="readonly" value="<?= $this->url->href('oauth', 'github', array(), false, '', true) ?>"/><br/>
diff --git a/app/Template/user/authentication.php b/app/Template/user/authentication.php
index 20c3d372..1f2d2a69 100644
--- a/app/Template/user/authentication.php
+++ b/app/Template/user/authentication.php
@@ -8,8 +8,7 @@
     <?= $this->form->hidden('id', $values) ?>
     <?= $this->form->hidden('username', $values) ?>
 
-    <?= $this->form->label(t('Google Id'), 'google_id') ?>
-    <?= $this->form->text('google_id', $values, $errors) ?>
+    <?= $this->hook->render('template:user:authentication:form', array('values' => $values, 'errors' => $errors, 'user' => $user)) ?>
 
     <?= $this->form->label(t('Github Id'), 'github_id') ?>
     <?= $this->form->text('github_id', $values, $errors) ?>
diff --git a/app/Template/user/external.php b/app/Template/user/external.php
index 8b1d3c46..8c9a0259 100644
--- a/app/Template/user/external.php
+++ b/app/Template/user/external.php
@@ -2,21 +2,7 @@
     <h2><?= t('External authentications') ?></h2>
 </div>
 
-<?php if (GOOGLE_AUTH): ?>
-    <h3><i class="fa fa-google"></i> <?= t('Google Account') ?></h3>
-
-    <p class="listing">
-    <?php if ($this->user->isCurrentUser($user['id'])): ?>
-        <?php if (empty($user['google_id'])): ?>
-            <?= $this->url->link(t('Link my Google Account'), 'oauth', 'google', array(), true) ?>
-        <?php else: ?>
-            <?= $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.') ?>
-    <?php endif ?>
-    </p>
-<?php endif ?>
+<?php $html = $this->hook->render('template:user:external', array('user' => $user)) ?>
 
 <?php if (GITHUB_AUTH): ?>
     <h3><i class="fa fa-github"></i> <?= t('Github Account') ?></h3>
@@ -50,6 +36,8 @@
     </p>
 <?php endif ?>
 
-<?php if (! GOOGLE_AUTH && ! GITHUB_AUTH && ! GITLAB_AUTH): ?>
+<?php if (empty($html) && ! GITHUB_AUTH && ! GITLAB_AUTH): ?>
     <p class="alert"><?= t('No external authentication enabled.') ?></p>
+<?php else: ?>
+    <?= $html ?>
 <?php endif ?>