SHIMADA Koji
null+****@clear*****
Fri Oct 5 13:18:50 JST 2012
SHIMADA Koji 2012-10-05 13:18:50 +0900 (Fri, 05 Oct 2012) New Revision: df83a6022e6536953ff89a6efe1f8746553a664b https://github.com/logaling/logaling-server/commit/df83a6022e6536953ff89a6efe1f8746553a664b Merged 710c780: Merge pull request #25 from logaling/use-username-when-display-resource-on-service Log: Extract #sign_in, #sign_out Modified files: app/controllers/application_controller.rb app/controllers/sessions_controller.rb app/controllers/users_controller.rb Modified: app/controllers/application_controller.rb (+8 -0) =================================================================== --- app/controllers/application_controller.rb 2012-10-05 13:12:19 +0900 (c4f3ce7) +++ app/controllers/application_controller.rb 2012-10-05 13:18:50 +0900 (f8e349b) @@ -12,6 +12,14 @@ class ApplicationController < ActionController::Base !!current_user end + def sign_in(user) + session[:user_id] = user.id + end + + def sign_out + session[:user_id] = nil + end + def authenticate! unless signed_in? redirect_to root_path Modified: app/controllers/sessions_controller.rb (+2 -2) =================================================================== --- app/controllers/sessions_controller.rb 2012-10-05 13:12:19 +0900 (5358288) +++ app/controllers/sessions_controller.rb 2012-10-05 13:18:50 +0900 (2868e02) @@ -6,7 +6,7 @@ class SessionsController < ApplicationController auth = request.env['omniauth.auth'] user = User.find_by_provider_and_uid(auth[:provider], auth[:uid].to_s) if user - session[:user_id] = user.id + sign_in(user) redirect_to dashboard_url else session[:user_info] = { provider: auth.provider, uid: auth.uid, name: auth.info.nickname } @@ -15,7 +15,7 @@ class SessionsController < ApplicationController end def destroy - session[:user_id] = nil + sign_out redirect_to root_url, :notice => "Signed out!" end end Modified: app/controllers/users_controller.rb (+1 -1) =================================================================== --- app/controllers/users_controller.rb 2012-10-05 13:12:19 +0900 (464d966) +++ app/controllers/users_controller.rb 2012-10-05 13:18:50 +0900 (8eb104b) @@ -11,7 +11,7 @@ class UsersController < ApplicationController end if****@user***** - session[:user_id] =****@user***** + sign_in(user) session[:user_info] = nil redirect_to dashboard_url else -------------- next part -------------- An HTML attachment was scrubbed...Download
