github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-13 01:46:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Allow plugins that implement OAuth and OAuth2 to show up under associated accounts in the Admin area. (#4333)

Browse Source
This commit is contained in:
cpradio
2016-07-18 03:02:41 -04:00
committed by Régis Hanol
parent d55da4fe1b
commit 64bdededd3
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/user.rb
View File

@ -778,10 +778,11 @@ class User < ActiveRecord::Base
def associated_accounts def associated_accounts
result = [] result = []
result << "Twitter(#{twitter_user_info.screen_name})" if twitter_user_info result << "Twitter(#{twitter_user_info.screen_name})" if twitter_user_info
result << "Facebook(#{facebook_user_info.username})" if facebook_user_info result << "Facebook(#{facebook_user_info.username})" if facebook_user_info
result << "Google(#{google_user_info.email})" if google_user_info result << "Google(#{google_user_info.email})" if google_user_info
result << "Github(#{github_user_info.screen_name})" if github_user_info result << "Github(#{github_user_info.screen_name})" if github_user_info
result << "#{oauth2_user_info.provider}(#{oauth2_user_info.email})" if oauth2_user_info
user_open_ids.each do |oid| user_open_ids.each do |oid|
result << "OpenID #{oid.url[0..20]}...(#{oid.email})" result << "OpenID #{oid.url[0..20]}...(#{oid.email})"

3
spec/models/user_spec.rb
View File

@ -323,9 +323,10 @@ describe User do
FacebookUserInfo.create(user_id: user.id, username: "sam", facebook_user_id: 1) FacebookUserInfo.create(user_id: user.id, username: "sam", facebook_user_id: 1)
GoogleUserInfo.create(user_id: user.id, email: "sam@sam.com", google_user_id: 1) GoogleUserInfo.create(user_id: user.id, email: "sam@sam.com", google_user_id: 1)
GithubUserInfo.create(user_id: user.id, screen_name: "sam", github_user_id: 1) GithubUserInfo.create(user_id: user.id, screen_name: "sam", github_user_id: 1)
Oauth2UserInfo.create(user_id: user.id, provider: "linkedin", email: "sam@sam.com", uid: 1)
user.reload user.reload
expect(user.associated_accounts).to eq("Twitter(sam), Facebook(sam), Google(sam@sam.com), Github(sam)") expect(user.associated_accounts).to eq("Twitter(sam), Facebook(sam), Google(sam@sam.com), Github(sam), linkedin(sam@sam.com)")
end end
end end