Merge pull request pelle#137 from thetizzo/master

allow? should return false if no token is found
eatskolnikov · Sep 24, 2013 · 5c2b591 · 5c2b591
2 parents 9899278 + 9c5cbb5
commit 5c2b591
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/oauth/controllers/application_controller_methods.rb b/lib/oauth/controllers/application_controller_methods.rb
@@ -44,8 +44,12 @@ def allow?
           if @strategies.include?(:interactive) && interactive
             true
           elsif !(@strategies & env["oauth.strategies"].to_a).empty?
-            @controller.send :current_user=, token.user if token
-            true
+            if token.present?
+              @controller.send :current_user=, token.user
+              true
+            else
+              false
+            end
           else
             if @strategies.include?(:interactive)
               controller.send :access_denied