warden-oauth2-strategies 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e885487f2c3e237d8a7cffa9020ea86671d015e
-  data.tar.gz: 9b6d3b51466a0861cf876fa606d407fd9fd2da18
+  metadata.gz: f69d35d74b8c3c2634402bbcef1763f247ed8766
+  data.tar.gz: 9f6f94e8081c71a097f8a7faba877bb2200e395d
 SHA512:
-  metadata.gz: f3fd02b16da09b9454a707f3d8843e969d907239f824caa136892c80734e63ac37b20befd927c4b5b6985fa87ca0dfcaca25228bd5c8672c8d57c3bbe743b69d
-  data.tar.gz: 4a1ddb4c062dec57fbb06ea3e3a7d8da582baba7063d267bef97d2e404f0fa35b07d1ff07955d73a612bc21065e9fb55d46503c0c95d92ee8a5a8475eaa538f5
+  metadata.gz: 684cddb78f24c07f0369cb774ad52a9052d8af3260384417ade64cf4d93f359a03c3b1393c21dacc28c40eb9a3c900199719446aa7711662af21ef678dc031e0
+  data.tar.gz: 77d117334f06d35b5d5819e6f784ddfa3c814fee60ef69de004f2b293364d1c278df06176699f8a89dd91de226fe07f5f97f332c5ef46a88c3b01eac47f8957d

data/lib/warden/oauth2/failure_app.rb

@@ -1,3 +1,4 @@
+require 'json'
 module Warden
   module OAuth2
     class FailureApp
@@ -8,9 +9,13 @@ module Warden
       def call(env)
         warden = env['warden']
         strategy = warden.winning_strategy
+        error_description = strategy.respond_to?(:error_description) ? strategy.error_description : ''
 
-        body = '{"error":"' + strategy.message.to_s + '"}'
-        status = strategy.error_status rescue 401
+        body = {}
+        body[:error] = strategy.message
+        body[:error_description] = error_description
+        body = JSON.dump(body)
+        status = strategy.error_status
         headers = {'Content-Type' => 'application/json'}
 
         headers['X-Accepted-OAuth-Scopes'] = (strategy.scope || :public).to_s

data/lib/warden/oauth2/version.rb

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

data/spec/warden/oauth2/failure_app_spec.rb

@@ -1,13 +1,18 @@
 require 'spec_helper'
 
 describe Warden::OAuth2::FailureApp do
-  let(:app){ subject }
-  let(:warden){ double(:winning_strategy => @strategy || strategy) }
-  let(:strategy){ double(:message => 'invalid_request') }
+  let(:app) { subject }
+  let(:warden) { double(:winning_strategy => @strategy || strategy) }
 
+  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
+    last_response.body.should == '{"error":"custom","error_description":""}'
+  end
   context 'with all info' do
     before do
-      @strategy = double(:error_status => 502, :message => 'custom', :scope => 'random')
+      @strategy = double(:error_status => 502, :message => 'custom', error_description: 'description',
+                         :scope => 'random')
       get '/unauthenticated', {}, 'warden' => warden
     end
 
@@ -15,8 +20,8 @@ describe Warden::OAuth2::FailureApp do
       last_response.status.should == 502
     end
 
-    it 'should set the message from the message' do
-      last_response.body.should == '{"error":"custom"}'
+    it 'should set the message and error description from the message' do
+      last_response.body.should == '{"error":"custom","error_description":"description"}'
     end
 
     it 'should set the content type' do

data/warden-oauth2.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
   gem.name          = "warden-oauth2-strategies"
   gem.require_paths = ["lib"]
   gem.version       = Warden::OAuth2::VERSION
+  gem.licenses      = ['MIT']
 
   gem.add_dependency 'warden'
   gem.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warden-oauth2-strategies
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - AirService
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
@@ -102,7 +102,8 @@ files:
 - spec/warden/oauth2/strategies/token_spec.rb
 - warden-oauth2.gemspec
 homepage: https://github.com/airservice/warden-oauth2
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -120,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: OAuth 2.0 strategies for Warden