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.
2019-07-22 17:48:50 +09:00
|
|
|
%h3= t('auth.status.account_status')
|
|
|
|
|
|
2019-09-20 03:58:19 +09:00
|
|
|
.simple_form
|
|
|
|
|
%p.hint
|
|
|
|
|
- if @user.account.suspended?
|
|
|
|
|
%span.negative-hint= t('user_mailer.warning.explanation.suspend')
|
|
|
|
|
- elsif @user.disabled?
|
|
|
|
|
%span.negative-hint= t('user_mailer.warning.explanation.disable')
|
|
|
|
|
- elsif @user.account.silenced?
|
|
|
|
|
%span.warning-hint= t('user_mailer.warning.explanation.silence')
|
|
|
|
|
- elsif !@user.confirmed?
|
|
|
|
|
%span.warning-hint= t('auth.status.confirming')
|
|
|
|
|
= link_to t('auth.didnt_get_confirmation'), new_user_confirmation_path
|
|
|
|
|
- elsif !@user.approved?
|
|
|
|
|
%span.warning-hint= t('auth.status.pending')
|
|
|
|
|
- elsif @user.account.moved_to_account_id.present?
|
|
|
|
|
%span.positive-hint= t('auth.status.redirecting_to', acct: @user.account.moved_to_account.acct)
|
|
|
|
|
= link_to t('migrations.cancel'), settings_migration_path
|
|
|
|
|
- else
|
|
|
|
|
%span.positive-hint= t('auth.status.functional')
|
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.
2019-07-22 17:48:50 +09:00
|
|
|
|
|
|
|
|
%hr.spacer/
|
