warden-oauth2-strategies 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f69d35d74b8c3c2634402bbcef1763f247ed8766
-  data.tar.gz: 9f6f94e8081c71a097f8a7faba877bb2200e395d
+  metadata.gz: b5f58493bf08099b52076a588bec5a9b085a87dc
+  data.tar.gz: c035adbefd44c2d638f4083837bdf177556d4daa
 SHA512:
-  metadata.gz: 684cddb78f24c07f0369cb774ad52a9052d8af3260384417ade64cf4d93f359a03c3b1393c21dacc28c40eb9a3c900199719446aa7711662af21ef678dc031e0
-  data.tar.gz: 77d117334f06d35b5d5819e6f784ddfa3c814fee60ef69de004f2b293364d1c278df06176699f8a89dd91de226fe07f5f97f332c5ef46a88c3b01eac47f8957d
+  metadata.gz: 82c79f570379db6077afae398c31ac2fae751e6e1dabdd38c44a653340d48432eb98125dde64905ce2cd515cd47c4f7f67add125a569595e46acc650f965bca2
+  data.tar.gz: 9fa9d1e8aaa201fa5a1644d985f4456e26aab48c9ed625a71b3cd2b0ff2c565340421ff0fc32f6e1bb61912034681bedc668cf01dd2145e07f11f3ebeb50ddba

data/lib/warden/oauth2/failure_app.rb

@@ -9,18 +9,22 @@ module Warden
       def call(env)
         warden = env['warden']
         strategy = warden.winning_strategy
-        error_description = strategy.respond_to?(:error_description) ? strategy.error_description : ''
 
-        body = {}
-        body[:error] = strategy.message
-        body[:error_description] = error_description
-        body = JSON.dump(body)
-        status = strategy.error_status
         headers = {'Content-Type' => 'application/json'}
+        body = {}
+        if strategy
+          error_description = strategy.respond_to?(:error_description) ? strategy.error_description : ''
+          body[:error] = strategy.message
+          body[:error_description] = error_description
+          status = strategy.error_status
 
-        headers['X-Accepted-OAuth-Scopes'] = (strategy.scope || :public).to_s
-
-        [status, headers, [body]]
+          headers['X-Accepted-OAuth-Scopes'] = (strategy.scope || :public).to_s
+        else
+          status = 400
+          body[:error] = "invalid_grant"
+          body[:error_description] = "grant_type is not specified or invalid"
+        end
+        [status, headers, [JSON.dump(body)]]
       end
     end
   end

data/lib/warden/oauth2/version.rb

@@ -1,5 +1,5 @@
 module Warden
   module OAuth2
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/warden/oauth2/failure_app_spec.rb

@@ -2,8 +2,14 @@ require 'spec_helper'
 
 describe Warden::OAuth2::FailureApp do
   let(:app) { subject }
-  let(:warden) { double(:winning_strategy => @strategy || strategy) }
+  let(:warden) { double(:winning_strategy => @strategy) }
 
+  it 'defaults to invalid_grant if strategy is not found' do
+    @strategy = nil
+    get '/unauthenticated', {}, 'warden' => warden
+    last_response.status.should == 400
+    last_response.body.should == '{"error":"invalid_grant","error_description":"grant_type is not specified or invalid"}'
+  end
   it 'uses empty string is strategy does not provide a description' do
     @strategy = double(error_status: 500,:message => 'custom', scope: 'bla')
     get '/unauthenticated', {}, 'warden' => warden

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: warden-oauth2-strategies
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - AirService