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 09:48:50 +01:00
|
|
|
# frozen_string_literal: true
|
|
|
|
|
|
|
|
class Auth::SetupController < ApplicationController
|
|
|
|
layout 'auth'
|
|
|
|
|
2019-10-01 12:31:27 +01:00
|
|
|
before_action :set_pack
|
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 09:48:50 +01:00
|
|
|
before_action :authenticate_user!
|
|
|
|
before_action :require_unconfirmed_or_pending!
|
|
|
|
before_action :set_body_classes
|
|
|
|
before_action :set_user
|
|
|
|
|
|
|
|
skip_before_action :require_functional!
|
|
|
|
|
|
|
|
def show
|
|
|
|
flash.now[:notice] = begin
|
|
|
|
if @user.pending?
|
|
|
|
I18n.t('devise.registrations.signed_up_but_pending')
|
|
|
|
else
|
|
|
|
I18n.t('devise.registrations.signed_up_but_unconfirmed')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def update
|
|
|
|
# This allows updating the e-mail without entering a password as is required
|
|
|
|
# on the account settings page; however, we only allow this for accounts
|
|
|
|
# that were not confirmed yet
|
|
|
|
|
|
|
|
if @user.update(user_params)
|
|
|
|
redirect_to auth_setup_path, notice: I18n.t('devise.confirmations.send_instructions')
|
|
|
|
else
|
|
|
|
render :show
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
helper_method :missing_email?
|
|
|
|
|
|
|
|
private
|
|
|
|
|
|
|
|
def require_unconfirmed_or_pending!
|
|
|
|
redirect_to root_path if current_user.confirmed? && current_user.approved?
|
|
|
|
end
|
|
|
|
|
|
|
|
def set_user
|
|
|
|
@user = current_user
|
|
|
|
end
|
|
|
|
|
|
|
|
def set_body_classes
|
|
|
|
@body_classes = 'lighter'
|
|
|
|
end
|
|
|
|
|
|
|
|
def user_params
|
|
|
|
params.require(:user).permit(:email)
|
|
|
|
end
|
|
|
|
|
|
|
|
def missing_email?
|
|
|
|
truthy_param?(:missing_email)
|
|
|
|
end
|
2019-10-01 12:31:27 +01:00
|
|
|
|
|
|
|
def set_pack
|
|
|
|
use_pack 'auth'
|
|
|
|
end
|
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 09:48:50 +01:00
|
|
|
end
|