app/controllers/sessions_controller.rb in tkh_authentication-0.1.11 vs app/controllers/sessions_controller.rb in tkh_authentication-0.9
- old
+ new
@@ -1,41 +1,35 @@
class SessionsController < ApplicationController
def new
- set_target_page
redirect_to root_path if current_user
end
def create
- set_target_page
user = User.find_by_email(params[:email])
+ set_target_page
if user && user.authenticate(params[:password])
if params[:remember_me]
cookies.permanent[:auth_token] = user.auth_token
else
cookies[:auth_token] = user.auth_token
end
redirect_to (session[:target_page] || safe_root_url), notice: t('authentication.login_confirmation')
- destroy_target_page
+ session[:target_page] = nil
else
flash.now.alert = t('authentication.warning.email_or_password_invalid')
render "new"
end
end
def destroy
cookies.delete(:auth_token)
- destroy_target_page
redirect_to safe_root_url, notice: t('authentication.logout_confirmation')
end
-
+
private
-
+
def set_target_page
session[:target_page] = request.referer unless session[:target_page] # && !request.referer.nil?
- end
-
- def destroy_target_page
- session[:target_page] = nil
end
end