diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 17:34:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 17:34:42 +0300 |
commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /lib/google_api | |
parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'lib/google_api')
-rw-r--r-- | lib/google_api/auth.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/google_api/auth.rb b/lib/google_api/auth.rb index 56f056fd869..319e5d2063c 100644 --- a/lib/google_api/auth.rb +++ b/lib/google_api/auth.rb @@ -37,6 +37,10 @@ module GoogleApi Gitlab::Auth::OAuth::Provider.config_for('google_oauth2') end + def client_options + config.args.client_options.deep_symbolize_keys + end + def client return @client if defined?(@client) @@ -49,7 +53,8 @@ module GoogleApi config.app_secret, site: 'https://accounts.google.com', token_url: '/o/oauth2/token', - authorize_url: '/o/oauth2/auth' + authorize_url: '/o/oauth2/auth', + **client_options ) end end |