mirror of
https://github.com/discourse/discourse.git
synced 2025-05-22 19:02:40 +08:00
DEV: Deprecate OAuth2Authenticator and OAuth2UserInfo (#15427)
These have been superseded by ManagedAuthenticator and UserAssociatedAccount. For more information, see https://meta.discourse.org/t/106695
This commit is contained in:
@ -3,6 +3,9 @@
|
|||||||
class Oauth2UserInfo < ActiveRecord::Base
|
class Oauth2UserInfo < ActiveRecord::Base
|
||||||
belongs_to :user
|
belongs_to :user
|
||||||
|
|
||||||
|
after_initialize do
|
||||||
|
Discourse.deprecate("Oauth2UserInfo is deprecated. Use `ManagedAuthenticator` and `UserAssociatedAccount` instead. For more information, see https://meta.discourse.org/t/106695", drop_from: '2.9.0', output_in_test: true)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# == Schema Information
|
# == Schema Information
|
||||||
|
@ -8,6 +8,7 @@ class Auth::OAuth2Authenticator < Auth::Authenticator
|
|||||||
|
|
||||||
# only option at the moment is :trusted
|
# only option at the moment is :trusted
|
||||||
def initialize(name, opts = {})
|
def initialize(name, opts = {})
|
||||||
|
Discourse.deprecate("OAuth2Authenticator is deprecated. Use `ManagedAuthenticator` and `UserAssociatedAccount` instead. For more information, see https://meta.discourse.org/t/106695", drop_from: '2.9.0', output_in_test: true)
|
||||||
@name = name
|
@name = name
|
||||||
@opts = opts
|
@opts = opts
|
||||||
end
|
end
|
||||||
|
@ -876,7 +876,7 @@ module Discourse
|
|||||||
digest = Digest::MD5.hexdigest(warning)
|
digest = Digest::MD5.hexdigest(warning)
|
||||||
redis_key = "deprecate-notice-#{digest}"
|
redis_key = "deprecate-notice-#{digest}"
|
||||||
|
|
||||||
if !Discourse.redis.without_namespace.get(redis_key)
|
if Rails.logger && !Discourse.redis.without_namespace.get(redis_key)
|
||||||
Rails.logger.warn(warning)
|
Rails.logger.warn(warning)
|
||||||
begin
|
begin
|
||||||
Discourse.redis.without_namespace.setex(redis_key, 3600, "x")
|
Discourse.redis.without_namespace.setex(redis_key, 3600, "x")
|
||||||
|
@ -203,12 +203,10 @@ describe UserAnonymizer do
|
|||||||
it "removes external auth associations" do
|
it "removes external auth associations" do
|
||||||
user.user_associated_accounts = [UserAssociatedAccount.create(user_id: user.id, provider_uid: "example", provider_name: "facebook")]
|
user.user_associated_accounts = [UserAssociatedAccount.create(user_id: user.id, provider_uid: "example", provider_name: "facebook")]
|
||||||
user.single_sign_on_record = SingleSignOnRecord.create(user_id: user.id, external_id: "example", last_payload: "looks good")
|
user.single_sign_on_record = SingleSignOnRecord.create(user_id: user.id, external_id: "example", last_payload: "looks good")
|
||||||
user.oauth2_user_infos = [Oauth2UserInfo.create(user_id: user.id, uid: "example", provider: "example")]
|
|
||||||
make_anonymous
|
make_anonymous
|
||||||
user.reload
|
user.reload
|
||||||
expect(user.user_associated_accounts).to be_empty
|
expect(user.user_associated_accounts).to be_empty
|
||||||
expect(user.single_sign_on_record).to eq(nil)
|
expect(user.single_sign_on_record).to eq(nil)
|
||||||
expect(user.oauth2_user_infos).to be_empty
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it "removes api key" do
|
it "removes api key" do
|
||||||
|
@ -999,13 +999,11 @@ describe UserMerger do
|
|||||||
|
|
||||||
it "deletes external auth infos of source user" do
|
it "deletes external auth infos of source user" do
|
||||||
UserAssociatedAccount.create(user_id: source_user.id, provider_name: "facebook", provider_uid: "1234")
|
UserAssociatedAccount.create(user_id: source_user.id, provider_name: "facebook", provider_uid: "1234")
|
||||||
Oauth2UserInfo.create(user_id: source_user.id, uid: "example", provider: "example")
|
|
||||||
SingleSignOnRecord.create(user_id: source_user.id, external_id: "example", last_payload: "looks good")
|
SingleSignOnRecord.create(user_id: source_user.id, external_id: "example", last_payload: "looks good")
|
||||||
|
|
||||||
merge_users!
|
merge_users!
|
||||||
|
|
||||||
expect(UserAssociatedAccount.where(user_id: source_user.id).count).to eq(0)
|
expect(UserAssociatedAccount.where(user_id: source_user.id).count).to eq(0)
|
||||||
expect(Oauth2UserInfo.where(user_id: source_user.id).count).to eq(0)
|
|
||||||
expect(SingleSignOnRecord.where(user_id: source_user.id).count).to eq(0)
|
expect(SingleSignOnRecord.where(user_id: source_user.id).count).to eq(0)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user