X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/093651c208e90c20c818c1bfc4d167131976a8cb..ef7f3d800cbdd49b692df10d312e5fd880e2e938:/app/controllers/oauth_controller.rb

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 295b01bb4..4f094b981 100644
--- 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
 
-  layout 'slim'
+  layout 'site'
 
   def login_required
     authorize_web
@@ -32,14 +32,14 @@ class OauthController < ApplicationController
       @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
+  protected
 
   def oauth1_authorize
     unless @token
-      render :action=>"authorize_failure"
+      render :action => "authorize_failure"
       return
     end
 
@@ -59,7 +59,7 @@ protected
             "oauth_token=#{@token.token}" :
               @redirect_url.query + "&oauth_token=#{@token.token}"
             unless @token.oauth10?
-              @redirect_url.query + "&oauth_verifier=#{@token.verifier}"
+              @redirect_url.query += "&oauth_verifier=#{@token.verifier}"
             end
             redirect_to @redirect_url.to_s
           else
@@ -67,10 +67,12 @@ protected
           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