Hide route steps sidebar when user presses close button.

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

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 3c56a4bf4141158d79c2ce6385be4d3299e92860..c7251f0a7c081f4ff23f485435f901514e73009c 100644 (file)
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -3,7 +3,7 @@ require 'oauth/controllers/provider_controller'
 class OauthController < ApplicationController
   include OAuth::Controllers::ProviderController
 
 class OauthController < ApplicationController
   include OAuth::Controllers::ProviderController
 

-  layout 'slim'
+  layout 'site'

 
   def login_required
     authorize_web
 
   def login_required
     authorize_web


@@ -32,6 +32,48 @@ class OauthController < ApplicationController
       @token.invalidate!
       flash[:notice] = t('oauth.revoke.flash', :application => @token.client_application.name)
     end
       @token.invalidate!
       flash[:notice] = t('oauth.revoke.flash', :application => @token.client_application.name)
     end

-    redirect_to :controller => 'oauth_clients', :action => 'index'
+    redirect_to oauth_clients_url(:display_name => @token.user.display_name)
+  end
+
+protected
+
+  def oauth1_authorize
+    unless @token
+      render :action=>"authorize_failure"
+      return
+    end
+
+    unless @token.invalidated?
+      if request.post?
+        if user_authorizes_token?
+          @token.authorize!(current_user)
+          if @token.oauth10?
+            callback_url = params[:oauth_callback] || @token.client_application.callback_url
+          else
+            callback_url = @token.oob? ? @token.client_application.callback_url : @token.callback_url
+          end
+          @redirect_url = URI.parse(callback_url) unless callback_url.blank?
+
+          unless @redirect_url.to_s.blank?
+            @redirect_url.query = @redirect_url.query.blank? ?
+            "oauth_token=#{@token.token}" :
+              @redirect_url.query + "&oauth_token=#{@token.token}"
+            unless @token.oauth10?
+              @redirect_url.query += "&oauth_verifier=#{@token.verifier}"
+            end
+            redirect_to @redirect_url.to_s
+          else
+            render :action => "authorize_success"
+          end
+        else
+          @token.invalidate!
+          @message = t("oauth.oauthorize_failure.denied", :app_name => @token.client_application.name)
+          render :action => "authorize_failure"
+        end
+      end
+    else
+      @message = t "oauth.oauthorize_failure.invalid"
+      render :action => "authorize_failure"
+    end

   end
 end
   end
 end