Add use_oidc_mode in Google OAuth

Fixes #587 By default still uses the Google+ API, but the Directus configuration by default it enables the OIDC mode
directus · Dec 3, 2018 · 9601d56 · 9601d56
1 parent 2ba02ec
commit 9601d56
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/config/api_sample.php b/config/api_sample.php
@@ -140,6 +140,9 @@
             //     'client_id'       => '',
             //     'client_secret'   => '',
             //     'hosted_domain'   => '*',
+            //     // Uses OpenIDConnect to fetch the email instead of using the Google+ API
+            //     // Disabling the OIDC Mode, requires you to enable the Google+ API otherwise it will fail
+            //     'use_oidc_mode'   => true,
             // ],
             // 'twitter' => [
             //     'identifier'   => '',

diff --git a/public/extensions/core/auth/google/Provider.php b/public/extensions/core/auth/google/Provider.php
@@ -33,7 +33,8 @@ protected function createProvider()
             'clientId'          => $this->config->get('client_id'),
             'clientSecret'      => $this->config->get('client_secret'),
             'redirectUri'       => $this->getRedirectUrl(),
-            'hostedDomain'      => $this->config->get('hosted_domain')
+            'hostedDomain'      => $this->config->get('hosted_domain'),
+            'useOidcMode'       => (bool) $this->config->get('use_oidc_mode'),
         ]);
 
         return $this->provider;

diff --git a/src/core/Directus/Util/Installation/stubs/config.stub b/src/core/Directus/Util/Installation/stubs/config.stub
@@ -140,6 +140,9 @@ return [
             //     'client_id'       => '',
             //     'client_secret'   => '',
             //     'hosted_domain'   => '*',
+            //     // Uses OpenIDConnect to fetch the email instead of using the Google+ API
+            //     // Disabling the OIDC Mode, requires you to enable the Google+ API otherwise it will fail
+            //     'use_oidc_mode'   => true,
             // ],
             // 'twitter' => [
             //     'identifier'   => '',

diff --git a/tests/api/Util/Installation/mock/config.sample.php b/tests/api/Util/Installation/mock/config.sample.php
@@ -140,6 +140,9 @@
             //     'client_id'       => '',
             //     'client_secret'   => '',
             //     'hosted_domain'   => '*',
+            //     // Uses OpenIDConnect to fetch the email instead of using the Google+ API
+            //     // Disabling the OIDC Mode, requires you to enable the Google+ API otherwise it will fail
+            //     'use_oidc_mode'   => true,
             // ],
             // 'twitter' => [
             //     'identifier'   => '',

diff --git a/tests/api/Util/Installation/mock/config.sample2.php b/tests/api/Util/Installation/mock/config.sample2.php
@@ -140,6 +140,9 @@
             //     'client_id'       => '',
             //     'client_secret'   => '',
             //     'hosted_domain'   => '*',
+            //     // Uses OpenIDConnect to fetch the email instead of using the Google+ API
+            //     // Disabling the OIDC Mode, requires you to enable the Google+ API otherwise it will fail
+            //     'use_oidc_mode'   => true,
             // ],
             // 'twitter' => [
             //     'identifier'   => '',