|
|
|
require 'rails_helper'
|
|
|
|
require 'devise_two_factor/spec_helpers'
|
|
|
|
|
|
|
|
RSpec.describe User, type: :model do
|
|
|
|
it_behaves_like 'two_factor_backupable'
|
|
|
|
|
|
|
|
describe 'otp_secret' do
|
|
|
|
it 'is encrypted with OTP_SECRET environment variable' do
|
|
|
|
user = Fabricate(:user,
|
|
|
|
encrypted_otp_secret: "Fttsy7QAa0edaDfdfSz094rRLAxc8cJweDQ4BsWH/zozcdVA8o9GLqcKhn2b\nGi/V\n",
|
|
|
|
encrypted_otp_secret_iv: 'rys3THICkr60BoWC',
|
|
|
|
encrypted_otp_secret_salt: '_LMkAGvdg7a+sDIKjI3mR2Q==')
|
|
|
|
|
|
|
|
expect(user.otp_secret).to eq 'anotpsecretthatshouldbeencrypted'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'validations' do
|
|
|
|
it 'is invalid without an account' do
|
|
|
|
user = Fabricate.build(:user, account: nil)
|
|
|
|
user.valid?
|
|
|
|
expect(user).to model_have_error_on_field(:account)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'is invalid without a valid locale' do
|
|
|
|
user = Fabricate.build(:user, locale: 'toto')
|
|
|
|
user.valid?
|
|
|
|
expect(user).to model_have_error_on_field(:locale)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'is invalid without a valid email' do
|
|
|
|
user = Fabricate.build(:user, email: 'john@')
|
|
|
|
user.valid?
|
|
|
|
expect(user).to model_have_error_on_field(:email)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'is valid with an invalid e-mail that has already been saved' do
|
|
|
|
user = Fabricate.build(:user, email: 'invalid-email')
|
|
|
|
user.save(validate: false)
|
|
|
|
expect(user.valid?).to be true
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'cleans out empty string from languages' do
|
|
|
|
user = Fabricate.build(:user, chosen_languages: [''])
|
|
|
|
user.valid?
|
|
|
|
expect(user.chosen_languages).to eq nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'scopes' do
|
|
|
|
describe 'recent' do
|
|
|
|
it 'returns an array of recent users ordered by id' do
|
|
|
|
user_1 = Fabricate(:user)
|
|
|
|
user_2 = Fabricate(:user)
|
|
|
|
expect(User.recent).to eq [user_2, user_1]
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'admins' do
|
|
|
|
it 'returns an array of users who are admin' do
|
|
|
|
user_1 = Fabricate(:user, admin: false)
|
|
|
|
user_2 = Fabricate(:user, admin: true)
|
|
|
|
expect(User.admins).to match_array([user_2])
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'confirmed' do
|
|
|
|
it 'returns an array of users who are confirmed' do
|
|
|
|
user_1 = Fabricate(:user, confirmed_at: nil)
|
|
|
|
user_2 = Fabricate(:user, confirmed_at: Time.zone.now)
|
|
|
|
expect(User.confirmed).to match_array([user_2])
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'inactive' do
|
|
|
|
it 'returns a relation of inactive users' do
|
|
|
|
specified = Fabricate(:user, current_sign_in_at: 15.days.ago)
|
|
|
|
Fabricate(:user, current_sign_in_at: 6.days.ago)
|
|
|
|
|
|
|
|
expect(User.inactive).to match_array([specified])
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'matches_email' do
|
|
|
|
it 'returns a relation of users whose email starts with the given string' do
|
|
|
|
specified = Fabricate(:user, email: 'specified@spec')
|
|
|
|
Fabricate(:user, email: 'unspecified@spec')
|
|
|
|
|
|
|
|
expect(User.matches_email('specified')).to match_array([specified])
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
let(:account) { Fabricate(:account, username: 'alice') }
|
|
|
|
let(:password) { 'abcd1234' }
|
|
|
|
|
|
|
|
describe 'blacklist' do
|
|
|
|
around(:each) do |example|
|
|
|
|
old_blacklist = Rails.configuration.x.email_blacklist
|
|
|
|
|
|
|
|
Rails.configuration.x.email_domains_blacklist = 'mvrht.com'
|
|
|
|
|
|
|
|
example.run
|
|
|
|
|
|
|
|
Rails.configuration.x.email_domains_blacklist = old_blacklist
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'should allow a non-blacklisted user to be created' do
|
|
|
|
user = User.new(email: 'foo@example.com', account: account, password: password, agreement: true)
|
|
|
|
|
|
|
|
expect(user.valid?).to be_truthy
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'should not allow a blacklisted user to be created' do
|
|
|
|
user = User.new(email: 'foo@mvrht.com', account: account, password: password, agreement: true)
|
|
|
|
|
|
|
|
expect(user.valid?).to be_falsey
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'should not allow a subdomain blacklisted user to be created' do
|
|
|
|
user = User.new(email: 'foo@mvrht.com.topdomain.tld', account: account, password: password, agreement: true)
|
|
|
|
|
|
|
|
expect(user.valid?).to be_falsey
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#confirmed?' do
|
|
|
|
it 'returns true when a confirmed_at is set' do
|
|
|
|
user = Fabricate.build(:user, confirmed_at: Time.now.utc)
|
|
|
|
expect(user.confirmed?).to be true
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns false if a confirmed_at is nil' do
|
|
|
|
user = Fabricate.build(:user, confirmed_at: nil)
|
|
|
|
expect(user.confirmed?).to be false
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#confirm' do
|
|
|
|
it 'sets email to unconfirmed_email' do
|
|
|
|
user = Fabricate.build(:user, confirmed_at: Time.now.utc, unconfirmed_email: 'new-email@example.com')
|
|
|
|
user.confirm
|
|
|
|
expect(user.email).to eq 'new-email@example.com'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#disable_two_factor!' do
|
|
|
|
it 'saves false for otp_required_for_login' do
|
|
|
|
user = Fabricate.build(:user, otp_required_for_login: true)
|
|
|
|
user.disable_two_factor!
|
|
|
|
expect(user.reload.otp_required_for_login).to be false
|
|
|
|
end
|
|
|
|
|
Add WebAuthn as an alternative 2FA method (#14466)
* feat: add possibility of adding WebAuthn security keys to use as 2FA
This adds a basic UI for enabling WebAuthn 2FA. We did a little refactor
to the Settings page for editing the 2FA methods – now it will list the
methods that are available to the user (TOTP and WebAuthn) and from
there they'll be able to add or remove any of them.
Also, it's worth mentioning that for enabling WebAuthn it's required to
have TOTP enabled, so the first time that you go to the 2FA Settings
page, you'll be asked to set it up.
This work was inspired by the one donde by Github in their platform, and
despite it could be approached in different ways, we decided to go with
this one given that we feel that this gives a great UX.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add request for WebAuthn as second factor at login if enabled
This commits adds the feature for using WebAuthn as a second factor for
login when enabled.
If users have WebAuthn enabled, now a page requesting for the use of a
WebAuthn credential for log in will appear, although a link redirecting
to the old page for logging in using a two-factor code will also be
present.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add possibility of deleting WebAuthn Credentials
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: disable WebAuthn when an Admin disables 2FA for a user
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: remove ability to disable TOTP leaving only WebAuthn as 2FA
Following examples form other platforms like Github, we decided to make
Webauthn 2FA secondary to 2FA with TOTP, so that we removed the
possibility of removing TOTP authentication only, leaving users with
just WEbAuthn as 2FA. Instead, users will have to click on 'Disable 2FA'
in order to remove second factor auth.
The reason for WebAuthn being secondary to TOPT is that in that way,
users will still be able to log in using their code from their phone's
application if they don't have their security keys with them – or maybe
even lost them.
* We had to change a little the flow for setting up TOTP, given that now
it's possible to setting up again if you already had TOTP, in order to
let users modify their authenticator app – given that now it's not
possible for them to disable TOTP and set it up again with another
authenticator app.
So, basically, now instead of storing the new `otp_secret` in the
user, we store it in the session until the process of set up is
finished.
This was because, as it was before, when users clicked on 'Edit' in
the new two-factor methods lists page, but then went back without
finishing the flow, their `otp_secret` had been changed therefore
invalidating their previous authenticator app, making them unable to
log in again using TOTP.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* refactor: fix eslint errors
The PR build was failing given that linting returning some errors.
This commit attempts to fix them.
* refactor: normalize i18n translations
The build was failing given that i18n translations files were not
normalized.
This commits fixes that.
* refactor: avoid having the webauthn gem locked to a specific version
* refactor: use symbols for routes without '/'
* refactor: avoid sending webauthn disabled email when 2FA is disabled
When an admins disable 2FA for users, we were sending two mails
to them, one notifying that 2FA was disabled and the other to notify
that WebAuthn was disabled.
As the second one is redundant since the first email includes it, we can
remove it and send just one email to users.
* refactor: avoid creating new env variable for webauthn_origin config
* refactor: improve flash error messages for webauthn pages
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
4 years ago
|
|
|
it 'saves nil for otp_secret' do
|
|
|
|
user = Fabricate.build(:user, otp_secret: 'oldotpcode')
|
|
|
|
user.disable_two_factor!
|
|
|
|
expect(user.reload.otp_secret).to be nil
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'saves cleared otp_backup_codes' do
|
|
|
|
user = Fabricate.build(:user, otp_backup_codes: %w(dummy dummy))
|
|
|
|
user.disable_two_factor!
|
|
|
|
expect(user.reload.otp_backup_codes.empty?).to be true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#send_confirmation_instructions' do
|
|
|
|
around do |example|
|
|
|
|
queue_adapter = ActiveJob::Base.queue_adapter
|
|
|
|
example.run
|
|
|
|
ActiveJob::Base.queue_adapter = queue_adapter
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'delivers confirmation instructions later' do
|
|
|
|
user = Fabricate(:user)
|
|
|
|
ActiveJob::Base.queue_adapter = :test
|
|
|
|
|
|
|
|
expect { user.send_confirmation_instructions }.to have_enqueued_job(ActionMailer::DeliveryJob)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'settings' do
|
|
|
|
it 'is instance of Settings::ScopedSettings' do
|
|
|
|
user = Fabricate(:user)
|
|
|
|
expect(user.settings).to be_kind_of Settings::ScopedSettings
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#setting_default_privacy' do
|
|
|
|
it 'returns default privacy setting if user has configured' do
|
|
|
|
user = Fabricate(:user)
|
|
|
|
user.settings[:default_privacy] = 'unlisted'
|
|
|
|
expect(user.setting_default_privacy).to eq 'unlisted'
|
|
|
|
end
|
|
|
|
|
|
|
|
it "returns 'private' if user has not configured default privacy setting and account is locked" do
|
|
|
|
user = Fabricate(:user, account: Fabricate(:account, locked: true))
|
|
|
|
expect(user.setting_default_privacy).to eq 'private'
|
|
|
|
end
|
|
|
|
|
|
|
|
it "returns 'public' if user has not configured default privacy setting and account is not locked" do
|
|
|
|
user = Fabricate(:user, account: Fabricate(:account, locked: false))
|
|
|
|
expect(user.setting_default_privacy).to eq 'public'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'whitelist' do
|
|
|
|
around(:each) do |example|
|
|
|
|
old_whitelist = Rails.configuration.x.email_whitelist
|
|
|
|
|
|
|
|
Rails.configuration.x.email_domains_whitelist = 'mastodon.space'
|
|
|
|
|
|
|
|
example.run
|
|
|
|
|
|
|
|
Rails.configuration.x.email_domains_whitelist = old_whitelist
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'should not allow a user to be created unless they are whitelisted' do
|
|
|
|
user = User.new(email: 'foo@example.com', account: account, password: password, agreement: true)
|
|
|
|
expect(user.valid?).to be_falsey
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'should allow a user to be created if they are whitelisted' do
|
|
|
|
user = User.new(email: 'foo@mastodon.space', account: account, password: password, agreement: true)
|
|
|
|
expect(user.valid?).to be_truthy
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'should not allow a user with a whitelisted top domain as subdomain in their email address to be created' do
|
|
|
|
user = User.new(email: 'foo@mastodon.space.userdomain.com', account: account, password: password, agreement: true)
|
|
|
|
expect(user.valid?).to be_falsey
|
|
|
|
end
|
|
|
|
|
|
|
|
context do
|
|
|
|
around do |example|
|
|
|
|
old_blacklist = Rails.configuration.x.email_blacklist
|
|
|
|
example.run
|
|
|
|
Rails.configuration.x.email_domains_blacklist = old_blacklist
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'should not allow a user to be created with a specific blacklisted subdomain even if the top domain is whitelisted' do
|
|
|
|
Rails.configuration.x.email_domains_blacklist = 'blacklisted.mastodon.space'
|
|
|
|
|
|
|
|
user = User.new(email: 'foo@blacklisted.mastodon.space', account: account, password: password)
|
|
|
|
expect(user.valid?).to be_falsey
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like 'Settings-extended' do
|
|
|
|
def create!
|
|
|
|
User.create!(account: Fabricate(:account), email: 'foo@mastodon.space', password: 'abcd1234', agreement: true)
|
|
|
|
end
|
|
|
|
|
|
|
|
def fabricate
|
|
|
|
Fabricate(:user)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'token_for_app' do
|
|
|
|
let(:user) { Fabricate(:user) }
|
|
|
|
let(:app) { Fabricate(:application, owner: user) }
|
|
|
|
|
|
|
|
it 'returns a token' do
|
|
|
|
expect(user.token_for_app(app)).to be_a(Doorkeeper::AccessToken)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'persists a token' do
|
|
|
|
t = user.token_for_app(app)
|
|
|
|
expect(user.token_for_app(app)).to eql(t)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'is nil if user does not own app' do
|
|
|
|
app.update!(owner: nil)
|
|
|
|
|
|
|
|
expect(user.token_for_app(app)).to be_nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#role' do
|
|
|
|
it 'returns admin for admin' do
|
|
|
|
user = User.new(admin: true)
|
|
|
|
expect(user.role).to eq 'admin'
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns moderator for moderator' do
|
|
|
|
user = User.new(moderator: true)
|
|
|
|
expect(user.role).to eq 'moderator'
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns user otherwise' do
|
|
|
|
user = User.new
|
|
|
|
expect(user.role).to eq 'user'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#role?' do
|
|
|
|
it 'returns false when invalid role requested' do
|
|
|
|
user = User.new(admin: true)
|
|
|
|
expect(user.role?('disabled')).to be false
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns true when exact role match' do
|
|
|
|
user = User.new
|
|
|
|
mod = User.new(moderator: true)
|
|
|
|
admin = User.new(admin: true)
|
|
|
|
|
|
|
|
expect(user.role?('user')).to be true
|
|
|
|
expect(mod.role?('moderator')).to be true
|
|
|
|
expect(admin.role?('admin')).to be true
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns true when role higher than needed' do
|
|
|
|
mod = User.new(moderator: true)
|
|
|
|
admin = User.new(admin: true)
|
|
|
|
|
|
|
|
expect(mod.role?('user')).to be true
|
|
|
|
expect(admin.role?('user')).to be true
|
|
|
|
expect(admin.role?('moderator')).to be true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#disable!' do
|
|
|
|
subject(:user) { Fabricate(:user, disabled: false, current_sign_in_at: current_sign_in_at, last_sign_in_at: nil) }
|
|
|
|
let(:current_sign_in_at) { Time.zone.now }
|
|
|
|
|
|
|
|
before do
|
|
|
|
user.disable!
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'disables user' do
|
|
|
|
expect(user).to have_attributes(disabled: true)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#enable!' do
|
|
|
|
subject(:user) { Fabricate(:user, disabled: true) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
user.enable!
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'enables user' do
|
|
|
|
expect(user).to have_attributes(disabled: false)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#confirm!' do
|
|
|
|
subject(:user) { Fabricate(:user, confirmed_at: confirmed_at) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
ActionMailer::Base.deliveries.clear
|
|
|
|
user.confirm!
|
|
|
|
end
|
|
|
|
|
|
|
|
after { ActionMailer::Base.deliveries.clear }
|
|
|
|
|
|
|
|
context 'when user is new' do
|
|
|
|
let(:confirmed_at) { nil }
|
|
|
|
|
|
|
|
it 'confirms user' do
|
|
|
|
expect(user.confirmed_at).to be_present
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'delivers mails' do
|
|
|
|
expect(ActionMailer::Base.deliveries.count).to eq 2
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when user is not new' do
|
|
|
|
let(:confirmed_at) { Time.zone.now }
|
|
|
|
|
|
|
|
it 'confirms user' do
|
|
|
|
expect(user.confirmed_at).to be_present
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not deliver mail' do
|
|
|
|
expect(ActionMailer::Base.deliveries.count).to eq 0
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#promote!' do
|
|
|
|
subject(:user) { Fabricate(:user, admin: is_admin, moderator: is_moderator) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
user.promote!
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when user is an admin' do
|
|
|
|
let(:is_admin) { true }
|
|
|
|
|
|
|
|
context 'when user is a moderator' do
|
|
|
|
let(:is_moderator) { true }
|
|
|
|
|
|
|
|
it 'changes moderator filed false' do
|
|
|
|
expect(user).to be_admin
|
|
|
|
expect(user).not_to be_moderator
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when user is not a moderator' do
|
|
|
|
let(:is_moderator) { false }
|
|
|
|
|
|
|
|
it 'does not change status' do
|
|
|
|
expect(user).to be_admin
|
|
|
|
expect(user).not_to be_moderator
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when user is not admin' do
|
|
|
|
let(:is_admin) { false }
|
|
|
|
|
|
|
|
context 'when user is a moderator' do
|
|
|
|
let(:is_moderator) { true }
|
|
|
|
|
|
|
|
it 'changes user into an admin' do
|
|
|
|
expect(user).to be_admin
|
|
|
|
expect(user).not_to be_moderator
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when user is not a moderator' do
|
|
|
|
let(:is_moderator) { false }
|
|
|
|
|
|
|
|
it 'changes user into a moderator' do
|
|
|
|
expect(user).not_to be_admin
|
|
|
|
expect(user).to be_moderator
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#demote!' do
|
|
|
|
subject(:user) { Fabricate(:user, admin: admin, moderator: moderator) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
user.demote!
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when user is an admin' do
|
|
|
|
let(:admin) { true }
|
|
|
|
|
|
|
|
context 'when user is a moderator' do
|
|
|
|
let(:moderator) { true }
|
|
|
|
|
|
|
|
it 'changes user into a moderator' do
|
|
|
|
expect(user).not_to be_admin
|
|
|
|
expect(user).to be_moderator
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when user is not a moderator' do
|
|
|
|
let(:moderator) { false }
|
|
|
|
|
|
|
|
it 'changes user into a moderator' do
|
|
|
|
expect(user).not_to be_admin
|
|
|
|
expect(user).to be_moderator
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when user is not an admin' do
|
|
|
|
let(:admin) { false }
|
|
|
|
|
|
|
|
context 'when user is a moderator' do
|
|
|
|
let(:moderator) { true }
|
|
|
|
|
|
|
|
it 'changes user into a plain user' do
|
|
|
|
expect(user).not_to be_admin
|
|
|
|
expect(user).not_to be_moderator
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when user is not a moderator' do
|
|
|
|
let(:moderator) { false }
|
|
|
|
|
|
|
|
it 'does not change any fields' do
|
|
|
|
expect(user).not_to be_admin
|
|
|
|
expect(user).not_to be_moderator
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#active_for_authentication?' do
|
|
|
|
subject { user.active_for_authentication? }
|
|
|
|
let(:user) { Fabricate(:user, disabled: disabled, confirmed_at: confirmed_at) }
|
|
|
|
|
|
|
|
context 'when user is disabled' do
|
|
|
|
let(:disabled) { true }
|
|
|
|
|
|
|
|
context 'when user is confirmed' do
|
|
|
|
let(:confirmed_at) { Time.zone.now }
|
|
|
|
|
|
|
|
it { is_expected.to be true }
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when user is not confirmed' do
|
|
|
|
let(:confirmed_at) { nil }
|
|
|
|
|
Change unconfirmed user login behaviour (#11375)
Allow access to account settings, 2FA, authorized applications, and
account deletions to unconfirmed and pending users, as well as
users who had their accounts disabled. Suspended users cannot update
their e-mail or password or delete their account.
Display account status on account settings page, for example, when
an account is frozen, limited, unconfirmed or pending review.
After sign up, login users straight away and show a simple page that
tells them the status of their account with links to account settings
and logout, to reduce onboarding friction and allow users to correct
wrongly typed e-mail addresses.
Move the final sign-up step of SSO integrations to be the same
as above to reduce code duplication.
6 years ago
|
|
|
it { is_expected.to be true }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when user is not disabled' do
|
|
|
|
let(:disabled) { false }
|
|
|
|
|
|
|
|
context 'when user is confirmed' do
|
|
|
|
let(:confirmed_at) { Time.zone.now }
|
|
|
|
|
|
|
|
it { is_expected.to be true }
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when user is not confirmed' do
|
|
|
|
let(:confirmed_at) { nil }
|
|
|
|
|
Change unconfirmed user login behaviour (#11375)
Allow access to account settings, 2FA, authorized applications, and
account deletions to unconfirmed and pending users, as well as
users who had their accounts disabled. Suspended users cannot update
their e-mail or password or delete their account.
Display account status on account settings page, for example, when
an account is frozen, limited, unconfirmed or pending review.
After sign up, login users straight away and show a simple page that
tells them the status of their account with links to account settings
and logout, to reduce onboarding friction and allow users to correct
wrongly typed e-mail addresses.
Move the final sign-up step of SSO integrations to be the same
as above to reduce code duplication.
6 years ago
|
|
|
it { is_expected.to be true }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|