test/dummy/app/controllers/application_controller.rb in loco-rails-1.0.2 vs test/dummy/app/controllers/application_controller.rb in loco-rails-1.3.0
- old
+ new
@@ -6,18 +6,16 @@
helper_method :current_admin, :current_user
private
def current_admin
- return nil if session[:admin_id].nil?
- return @current_admin if @current_admin
- @current_admin = Admin.find session[:admin_id]
+ return nil if cookies.signed[:admin_id].nil?
+ @current_admin ||= Admin.find_by id: cookies.signed[:admin_id]
end
def current_user
- return nil if session[:user_id].nil?
- return @current_user if @current_user
- @current_user = User.find session[:user_id]
+ return nil if cookies.signed[:user_id].nil?
+ @current_user ||= User.find_by id: cookies.signed[:user_id]
end
def loco_permissions
[current_user, current_admin]
end