12c8ac9e14
Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.
109 lines
2.5 KiB
Ruby
109 lines
2.5 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class Auth::SessionsController < Devise::SessionsController
|
|
include Devise::Controllers::Rememberable
|
|
|
|
layout 'auth'
|
|
|
|
skip_before_action :require_no_authentication, only: [:create]
|
|
skip_before_action :require_functional!
|
|
|
|
prepend_before_action :set_pack
|
|
|
|
include TwoFactorAuthenticationConcern
|
|
include SignInTokenAuthenticationConcern
|
|
|
|
before_action :set_instance_presenter, only: [:new]
|
|
before_action :set_body_classes
|
|
|
|
def new
|
|
Devise.omniauth_configs.each do |provider, config|
|
|
return redirect_to(omniauth_authorize_path(resource_name, provider)) if config.strategy.redirect_at_sign_in
|
|
end
|
|
|
|
super
|
|
end
|
|
|
|
def create
|
|
super do |resource|
|
|
remember_me(resource)
|
|
flash.delete(:notice)
|
|
end
|
|
end
|
|
|
|
def destroy
|
|
tmp_stored_location = stored_location_for(:user)
|
|
super
|
|
session.delete(:challenge_passed_at)
|
|
flash.delete(:notice)
|
|
store_location_for(:user, tmp_stored_location) if continue_after?
|
|
end
|
|
|
|
protected
|
|
|
|
def find_user
|
|
if session[:attempt_user_id]
|
|
User.find(session[:attempt_user_id])
|
|
else
|
|
user = User.authenticate_with_ldap(user_params) if Devise.ldap_authentication
|
|
user ||= User.authenticate_with_pam(user_params) if Devise.pam_authentication
|
|
user ||= User.find_for_authentication(email: user_params[:email])
|
|
end
|
|
end
|
|
|
|
def user_params
|
|
params.require(:user).permit(:email, :password, :otp_attempt, :sign_in_token_attempt)
|
|
end
|
|
|
|
def after_sign_in_path_for(resource)
|
|
last_url = stored_location_for(:user)
|
|
|
|
if home_paths(resource).include?(last_url)
|
|
root_path
|
|
else
|
|
last_url || root_path
|
|
end
|
|
end
|
|
|
|
def after_sign_out_path_for(_resource_or_scope)
|
|
Devise.omniauth_configs.each_value do |config|
|
|
return root_path if config.strategy.redirect_at_sign_in
|
|
end
|
|
|
|
super
|
|
end
|
|
|
|
def require_no_authentication
|
|
super
|
|
# Delete flash message that isn't entirely useful and may be confusing in
|
|
# most cases because /web doesn't display/clear flash messages.
|
|
flash.delete(:alert) if flash[:alert] == I18n.t('devise.failure.already_authenticated')
|
|
end
|
|
|
|
private
|
|
|
|
def set_pack
|
|
use_pack 'auth'
|
|
end
|
|
|
|
def set_instance_presenter
|
|
@instance_presenter = InstancePresenter.new
|
|
end
|
|
|
|
def set_body_classes
|
|
@body_classes = 'lighter'
|
|
end
|
|
|
|
def home_paths(resource)
|
|
paths = [about_path]
|
|
if single_user_mode? && resource.is_a?(User)
|
|
paths << short_account_path(username: resource.account)
|
|
end
|
|
paths
|
|
end
|
|
|
|
def continue_after?
|
|
truthy_param?(:continue)
|
|
end
|
|
end
|