github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 06:21:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

REFACTOR: Migrate TwitterAuthenticator to use ManagedAuthenticator (#6739)

Browse Source 
No changes to functionality. TwitterAuthenticator goes from 136 lines to 24, and all twitter-specific logic elsewhere has been deleted 🎉
This commit is contained in:
David Taylor
2018-12-07 15:39:06 +00:00
committed by GitHub
parent 9e3143445b
commit 160d29b18a
12 changed files with 52 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
script/bulk_import/discourse_merger.rb
View File

@ -152,7 +152,7 @@ class BulkImport::DiscourseMerger < BulkImport::Base
end
[UserAssociatedAccount, GithubUserInfo, GoogleUserInfo, InstagramUserInfo, Oauth2UserInfo,
SingleSignOnRecord, TwitterUserInfo, EmailChangeRequest
SingleSignOnRecord, EmailChangeRequest
].each do |c|
copy_model(c, skip_if_merged: true, is_a_user_model: true)
end
@ -653,11 +653,6 @@ class BulkImport::DiscourseMerger < BulkImport::Base
r
end
def process_twitter_user_info(r)
return nil if TwitterUserInfo.where(twitter_user_id: r['twitter_user_id']).exists?
r
end
def process_user_badge(user_badge)
user_badge['granted_by_id'] = user_id_from_imported_id(user_badge['granted_by_id']) if user_badge['granted_by_id']
user_badge['notification_id'] = notification_id_from_imported_id(user_badge['notification_id']) if user_badge['notification_id']