Merge branch 'master' into openid

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

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index c8ae122776112e6b6710aa90c241a58f0ed7577a..4b539b1fdc879207eca038bdfe59e31be2b429ff 100644 (file)
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -12,13 +12,11 @@ class OauthController < ApplicationController
   def request_token
     @token = current_client_application.create_request_token
 
   def request_token
     @token = current_client_application.create_request_token
 

-    logger.info "in REQUEST TOKEN"

     if @token
       logger.info "request token params: #{params.inspect}"
       # request tokens indicate what permissions the client *wants*, not
       # necessarily the same as those which the user allows.
       current_client_application.permissions.each do |pref|
     if @token
       logger.info "request token params: #{params.inspect}"
       # request tokens indicate what permissions the client *wants*, not
       # necessarily the same as those which the user allows.
       current_client_application.permissions.each do |pref|

-        logger.info "PARAMS found #{pref}"

         @token.write_attribute(pref, true)
       end
       @token.save!
         @token.write_attribute(pref, true)
       end
       @token.save!


@@ -40,12 +38,11 @@ class OauthController < ApplicationController
 
   def oauthorize
     @token = RequestToken.find_by_token params[:oauth_token]
 
   def oauthorize
     @token = RequestToken.find_by_token params[:oauth_token]

-    unless @token.invalidated?
+    unless @token.nil? or @token.invalidated? 

       if request.post?
         any_auth = false
         @token.client_application.permissions.each do |pref|
           if params[pref]
       if request.post?
         any_auth = false
         @token.client_application.permissions.each do |pref|
           if params[pref]

-            logger.info "OAUTHORIZE PARAMS found #{pref}"

             @token.write_attribute(pref, true)
             any_auth ||= true
           else
             @token.write_attribute(pref, true)
             any_auth ||= true
           else


@@ -75,9 +72,8 @@ class OauthController < ApplicationController
     @token = @user.oauth_tokens.find_by_token params[:token]
     if @token
       @token.invalidate!
     @token = @user.oauth_tokens.find_by_token params[:token]
     if @token
       @token.invalidate!

-      flash[:notice] = "You've revoked the token for #{@token.client_application.name}"
+      flash[:notice] = t('oauth.revoke.flash', :application => @token.client_application.name)

     end
     end

-    logger.info "about to redirect"

     redirect_to :controller => 'oauth_clients', :action => 'index'
   end
 end
     redirect_to :controller => 'oauth_clients', :action => 'index'
   end
 end