Fixed link to DiaryComments

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

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index d4d1bd8883d942fa0e4858271f43e6acafa6e046..59ebfd631b0075d1279a6738bf55a9278713602c 100644 (file)
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -1,9 +1,9 @@
-require 'oauth/controllers/provider_controller'
+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


@@ -30,48 +30,48 @@ class OauthController < ApplicationController
     @token = current_user.oauth_tokens.find_by_token params[:token]
     if @token
       @token.invalidate!
     @token = current_user.oauth_tokens.find_by_token params[:token]
     if @token
       @token.invalidate!

-      flash[:notice] = t('oauth.revoke.flash', :application => @token.client_application.name)
+      flash[:notice] = t("oauth.revoke.flash", :application => @token.client_application.name)

     end
     end

-    redirect_to :controller => 'oauth_clients', :action => 'index'
+    redirect_to oauth_clients_url(:display_name => @token.user.display_name)

   end
 
   end
 

-protected
+  protected

 
   def oauth1_authorize
 
   def oauth1_authorize

-    unless @token
-      render :action=>"authorize_failure"
-      return
-    end
+    if @token.invalidated?
+      @message = t "oauth.oauthorize_failure.invalid"
+      render :action => "authorize_failure"
+    elsif request.post?
+      if user_authorizes_token?
+        @token.authorize!(current_user)
+        callback_url = if @token.oauth10?
+                         params[:oauth_callback] || @token.client_application.callback_url
+                       else
+                         @token.oob? ? @token.client_application.callback_url : @token.callback_url
+                       end
+        @redirect_url = URI.parse(callback_url) unless callback_url.blank?

 
 

-    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?
+        if @redirect_url.to_s.blank?
+          render :action => "authorize_success"
+        else
+          @redirect_url.query = if @redirect_url.query.blank?
+                                  "oauth_token=#{@token.token}"
+                                else
+                                  @redirect_url.query +
+                                    "&oauth_token=#{@token.token}"
+                                end

 
 

-          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"
+          unless @token.oauth10?
+            @redirect_url.query += "&oauth_verifier=#{@token.verifier}"

           end
           end

-        else
-          @token.invalidate!
-          render :action => "authorize_failure"
+
+          redirect_to @redirect_url.to_s

         end
         end

+      else
+        @token.invalidate!
+        @message = t("oauth.oauthorize_failure.denied", :app_name => @token.client_application.name)
+        render :action => "authorize_failure"

       end
       end

-    else
-      render :action => "authorize_failure"

     end
   end
 end
     end
   end
 end