Update to iD v1.7.2

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

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 295b01bb47cc0bb6eada5d463d3e035748ab39a8..8ce53739fdff427bd656f9b9aba7b7c90aec273c 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,20 +30,18 @@ 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
-
-    unless @token.invalidated?
+    if @token.invalidated?
+      @message = t "oauth.oauthorize_failure.invalid"
+      render :action => "authorize_failure"
+    else

       if request.post?
         if user_authorizes_token?
           @token.authorize!(current_user)
       if request.post?
         if user_authorizes_token?
           @token.authorize!(current_user)


@@ -54,24 +52,28 @@ protected
           end
           @redirect_url = URI.parse(callback_url) unless callback_url.blank?
 
           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}"
+          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 @token.oauth10?
             unless @token.oauth10?

-              @redirect_url.query + "&oauth_verifier=#{@token.verifier}"
+              @redirect_url.query += "&oauth_verifier=#{@token.verifier}"

             end
             end

+

             redirect_to @redirect_url.to_s
             redirect_to @redirect_url.to_s

-          else
-            render :action => "authorize_success"

           end
         else
           @token.invalidate!
           end
         else
           @token.invalidate!

+          @message = t("oauth.oauthorize_failure.denied", :app_name => @token.client_application.name)

           render :action => "authorize_failure"
         end
       end
           render :action => "authorize_failure"
         end
       end

-    else
-      render :action => "authorize_failure"

     end
   end
 end
     end
   end
 end