From 82b99decbbed20896b9d049cf96fa378c76699fe Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Fri, 24 Sep 2010 10:45:27 -0700
Subject: [PATCH] putting the token in the warden session
---
app/controllers/application_controller.rb | 2 +-
app/controllers/services_controller.rb | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1cbdc7c39e..2bf2bf1746 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -41,7 +41,7 @@ class ApplicationController < ActionController::Base
end
def fb_user_info
- @access_token = session[:access_token]
+ @access_token = env['warden'].session[:access_token]
@logged_in = @access_token.present?
end
diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb
index 373eb100ee..b39538d965 100644
--- a/app/controllers/services_controller.rb
+++ b/app/controllers/services_controller.rb
@@ -17,15 +17,15 @@ class ServicesController < ApplicationController
# TODO: This is where you'd want to store the token in your database
# but for now, we'll just keep it in the session so we don't need a database
- session[:access_token] = @access_token
+ env['warden'].session[:access_token] = @access_token
flash[:success] = "Authentication successful."
end
redirect_to edit_user_url current_user
end
def destroy
- session[:access_token] = nil
- session[:user_id] = nil
+ env['warden'].session[:access_token] = nil
+ env['warden'].session[:user_id] = nil
redirect_to edit_user_url current_user
end
--
GitLab