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

REFACTOR: Migrate InstagramAuthenticator to use ManagedAuthenticator (#7081)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2019-03-04 14:54:28 +01:00
committed by GitHub
parent 7078d39f96
commit 703c724cf3
8 changed files with 88 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
script/bulk_import/discourse_merger.rb
View File

@ -151,7 +151,7 @@ class BulkImport::DiscourseMerger < BulkImport::Base
copy_model(c, skip_if_merged: true, is_a_user_model: true, skip_processing: true)
end
[UserAssociatedAccount, GithubUserInfo, GoogleUserInfo, InstagramUserInfo, Oauth2UserInfo,
[UserAssociatedAccount, GithubUserInfo, GoogleUserInfo, Oauth2UserInfo,
SingleSignOnRecord, EmailChangeRequest
].each do |c|
copy_model(c, skip_if_merged: true, is_a_user_model: true)
@ -633,11 +633,6 @@ class BulkImport::DiscourseMerger < BulkImport::Base
r
end
def process_instagram_user_info(r)
return nil if InstagramUserInfo.where(instagram_user_id: r['instagram_user_id']).exists?
r
end
def process_oauth2_user_info(r)
return nil if Oauth2UserInfo.where(uid: r['uid'], provider: r['provider']).exists?
r