From 8daeee09f213c85f8bad267ccc26f7e5bd8177eb Mon Sep 17 00:00:00 2001 From: cktricky Date: Fri, 14 Mar 2014 09:07:52 -0400 Subject: [PATCH] working on cleaning up and testing if I can push changes to a PR --- app/controllers/application_controller.rb | 2 +- app/controllers/sessions_controller.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 02b8df5..c8605d7 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -9,7 +9,7 @@ class ApplicationController < ActionController::Base private def current_user - @current_user ||= User.find_by_auth_token(cookies[:auth_token].to_s) + @current_user ||= (User.find_by_auth_token(cookies[:auth_token].to_s) || User.find_by_user_id(session[:user_id].to_s)) end def authenticated diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 777bf6e..339cde8 100755 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -22,7 +22,8 @@ class SessionsController < ApplicationController if params[:remember_me] cookies.permanent[:auth_token] = user.auth_token if User.where(:user_id => user.user_id).exists? else - cookies[:auth_token] = user.auth_token if User.where(:user_id => user.user_id).exists? + session[:user_id] = user.user_id if User.where(:user_id => user.user_id).exists? + #cookies[:auth_token] = user.auth_token if User.where(:user_id => user.user_id).exists? end redirect_to path else