Fix rubocop style issues

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

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index c7251f0a7c081f4ff23f485435f901514e73009c..819f74dc1f9cefb9691aa2efcd11f0172c5a588f 100644 (file)
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -35,15 +35,18 @@ class OauthController < ApplicationController
     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
 
-    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)
@@ -54,16 +57,21 @@ protected
           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?
               @redirect_url.query += "&oauth_verifier=#{@token.verifier}"
             end
+
             redirect_to @redirect_url.to_s
-          else
-            render :action => "authorize_success"
           end
         else
           @token.invalidate!
@@ -71,9 +79,6 @@ protected
           render :action => "authorize_failure"
         end
       end
-    else
-      @message = t "oauth.oauthorize_failure.invalid"
-      render :action => "authorize_failure"
     end
   end
 end