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

Merge pull request from GHSA-7cmh-wm9h-j63f

Browse Source
This commit is contained in:
David Taylor
2019-08-27 17:11:19 +01:00
committed by Jeff Atwood
parent 03d51d6519
commit 8e5a8d1d54
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spec/requests/omniauth_callbacks_controller_spec.rb
View File

@ -286,7 +286,7 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(user.email_confirmed?).to eq(true)
end
it "should activate/unstage staged user" do
it "should unstage staged user" do
user.update!(staged: true, registration_ip_address: nil)
user.reload
@ -306,6 +306,22 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(user.registration_ip_address).to be_present
end
it "should activate user with matching email" do
user.update!(password: "securepassword", active: false)
user.reload
expect(user.active).to eq(false)
expect(user.confirm_password?("securepassword")).to eq(true)
get "/auth/google_oauth2/callback.json"
user.reload
expect(user.active).to eq(true)
# Delete the password, it may have been set by someone else
expect(user.confirm_password?("securepassword")).to eq(false)
end
context 'when user has second factor enabled' do
before do
user.create_totp(enabled: true)