@@ -3,7 +3,8 @@ class SessionsController < ApplicationController def new if TwitterAuth.oauth? - @request_token = TwitterAuth.consumer.get_request_token + oauth_callback = request.protocol + request.host_with_port + '/oauth_callback' + @request_token = TwitterAuth.consumer.get_request_token({:oauth_callback=>oauth_callback}) session[:request_token] = @request_token.token session[:request_token_secret] = @request_token.secret @@ -36,7 +37,8 @@ class SessionsController < ApplicationController @request_token = OAuth::RequestToken.new(TwitterAuth.consumer, session[:request_token], session[:request_token_secret]) - @access_token = @request_token.get_access_token + oauth_verifier = params["oauth_verifier"] + @access_token = @request_token.get_access_token(:oauth_verifier => oauth_verifier) # The request token has been invalidated # so we nullify it in the session. @@ -50,7 +52,7 @@ class SessionsController < ApplicationController cookies[:remember_token] = @user.remember_me authentication_succeeded - rescue Net::HTTPServerException, Net::HTTPFatalError, TwitterAuth::Dispatcher::Error => e + rescue Net::HTTPServerException => e case e.message when '401 "Unauthorized"' authentication_failed('This authentication request is no longer valid. Please try again.') and return app/controllers/sessions_controller.rb @@ -16,7 +16,7 @@ module TwitterAuth def authentication_succeeded(message = 'You have logged in successfully.', destination = '/') flash[:notice] = message - redirect_to destination + redirect_back_or_default destination end def current_user lib/twitter_auth/controller_extensions.rb b64af9689ea4a5c0d1695f5ef15131cdcb69fb64 Wynn Netherland wynn@pengwynn.local http://github.com/mbleigh/twitter-auth/commit/d7a6798e9a2b2a59e2de9ecf24bd295dab929d5f d7a6798e9a2b2a59e2de9ecf24bd295dab929d5f 2009-06-16T19:38:20-07:00 2009-06-16T19:38:20-07:00 OAuth 1.0a (requires oauth gem 0.3.5) b86fe8dbf6495272ab021b1cf2b89dc7261aa1c8 Wynn Netherland wynn@pengwynn.local