discourse
/
discourse-oauth2-basic
mirror of https://github.com/discourse/discourse-oauth2-basic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pull in id from token

This commit is contained in:
Sam 2016-05-27 17:58:02 +10:00
parent 812364b9bb
commit ac16343335
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugin.rb
View File

@ -7,9 +7,21 @@ require_dependency 'auth/oauth2_authenticator.rb'
enabled_site_setting :oauth2_enabled enabled_site_setting :oauth2_enabled
class ::OmniAuth::Strategies::Oauth2Basic < ::OmniAuth::Strategies::OAuth2
def callback_url
"https://discuss.jibo.com/auth/oauth2_basic/callback"
end
option :name, "oauth2_basic"
info do
{
id: access_token['id']
}
end
end
class OAuth2BasicAuthenticator < ::Auth::OAuth2Authenticator class OAuth2BasicAuthenticator < ::Auth::OAuth2Authenticator
def register_middleware(omniauth) def register_middleware(omniauth)
omniauth.provider :oauth2, omniauth.provider :oauth2_basic,
name: 'oauth2_basic', name: 'oauth2_basic',
setup: lambda {|env| setup: lambda {|env|
opts = env['omniauth.strategy'].options opts = env['omniauth.strategy'].options
@ -54,8 +66,8 @@ class OAuth2BasicAuthenticator < ::Auth::OAuth2Authenticator
Rails.logger.warn("OAuth2 Debugging: #{info}") if SiteSetting.oauth2_debug_auth Rails.logger.warn("OAuth2 Debugging: #{info}") if SiteSetting.oauth2_debug_auth
end end
def fetch_user_details(token) def fetch_user_details(token, id)
user_json_url = SiteSetting.oauth2_user_json_url.sub(':token', token) user_json_url = SiteSetting.oauth2_user_json_url.sub(':token', token).sub(':id', id)
log("user_json_url: #{user_json_url}") log("user_json_url: #{user_json_url}")
@ -79,7 +91,7 @@ class OAuth2BasicAuthenticator < ::Auth::OAuth2Authenticator
result = Auth::Result.new result = Auth::Result.new
token = auth['credentials']['token'] token = auth['credentials']['token']
user_details = fetch_user_details(token) user_details = fetch_user_details(token, auth[:id])
result.name = user_details[:name] result.name = user_details[:name]
result.username = user_details[:username] result.username = user_details[:username]