Prevent double credential processing on tokens controller for passwor…

…d grant types.
powershift · Aug 22, 2012 · d112c59 · d112c59
1 parent 51c0977
commit d112c59
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/app/controllers/doorkeeper/tokens_controller.rb b/app/controllers/doorkeeper/tokens_controller.rb
@@ -23,14 +23,17 @@ def credentials
   end
 
   def token
-    case params[:grant_type]
-    when 'password'
-      owner = resource_owner_from_credentials
-      @token ||= Doorkeeper::OAuth::PasswordAccessTokenRequest.new(client, owner, params)
-    when 'client_credentials'
-      @token ||= Doorkeeper::OAuth::ClientCredentialsRequest.new(Doorkeeper.configuration, client, params)
-    else
-      @token ||= Doorkeeper::OAuth::AccessTokenRequest.new(client, params)
+    unless defined?(@token) && @token
+      case params[:grant_type]
+      when 'password'
+        owner = resource_owner_from_credentials
+        @token = Doorkeeper::OAuth::PasswordAccessTokenRequest.new(client, owner, params)
+      when 'client_credentials'
+        @token = Doorkeeper::OAuth::ClientCredentialsRequest.new(Doorkeeper.configuration, client, params)
+      else
+        @token = Doorkeeper::OAuth::AccessTokenRequest.new(client, params)
+      end
     end
+    @token
   end
 end