better errors on missing token or not matching scope

2012-08-15 02:31:30 +02:00 · 2012-08-15 02:31:30 +02:00 · 8eb7aa11ce
commit 8eb7aa11ce
parent eed53952a3
1 changed files with 8 additions and 1 deletions
--- a/lib/travis/api/app/extensions/scoping.rb
+++ b/lib/travis/api/app/extensions/scoping.rb
@ -31,7 +31,14 @@ class Travis::Api::App
          name = settings.default_scope if name == :default
          headers['X-OAuth-Scopes'] = scopes.map(&:to_s).join(',')
          headers['X-Accepted-OAuth-Scopes'] = name.to_s
-          scopes.include? name
+
+          if scopes.include? name
+            true
+          elsif logged_in?
+            halt 403, "insufficient access"
+          else
+            halt 401, "no access token supplied"
+          end
        end
      end