Make /user/new handle already logged in users better

[rails.git] / app / controllers / oauth_controller.rb

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 98075b8f810d40bf9cdd6faf8012095e4d0aed3f..5c84be0cf4c27cb9c073dda4b3eae678ea8705bd 100644 (file)
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -1,5 +1,5 @@
 class OauthController < ApplicationController
 class OauthController < ApplicationController

-  layout 'site'
+  layout 'slim'

 
   before_filter :authorize_web, :only => [:oauthorize, :revoke]
   before_filter :set_locale, :only => [:oauthorize, :revoke]
 
   before_filter :authorize_web, :only => [:oauthorize, :revoke]
   before_filter :set_locale, :only => [:oauthorize, :revoke]


@@ -38,7 +38,7 @@ class OauthController < ApplicationController
 
   def oauthorize
     @token = RequestToken.find_by_token params[:oauth_token]
 
   def oauthorize
     @token = RequestToken.find_by_token params[:oauth_token]

-    unless @token.invalidated?
+    unless @token.nil? or @token.invalidated? 

       if request.post?
         any_auth = false
         @token.client_application.permissions.each do |pref|
       if request.post?
         any_auth = false
         @token.client_application.permissions.each do |pref|


@@ -52,9 +52,17 @@ class OauthController < ApplicationController
 
         if any_auth
           @token.authorize!(@user)
 
         if any_auth
           @token.authorize!(@user)

-          redirect_url = params[:oauth_callback] || @token.client_application.callback_url
-          if redirect_url
-            redirect_to "#{redirect_url}?oauth_token=#{@token.token}"
+          if @token.oauth10?
+            redirect_url = params[:oauth_callback] || @token.client_application.callback_url
+          else
+            redirect_url = @token.oob? ? @token.client_application.callback_url : @token.callback_url
+          end
+          if redirect_url and not redirect_url.empty?
+            if @token.oauth10?
+              redirect_to "#{redirect_url}?oauth_token=#{@token.token}"
+            else
+              redirect_to "#{redirect_url}?oauth_token=#{@token.token}&oauth_verifier=#{@token.verifier}"
+            end

           else
             render :action => "authorize_success"
           end
           else
             render :action => "authorize_success"
           end