brycesch-devise_oauth2_providable 1.1.7 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89087ce6dfc7e93ca6f2dd4188c32ddb3b088c75
-  data.tar.gz: 21f7d31bfc441e0eb30ad55fec67f7c952a3448c
+  metadata.gz: 09dbe4d5fdfe303bf1b13d2e683ccd6abd30419c
+  data.tar.gz: 74ff05e0eb6663d40484e121e573e90b9ddda358
 SHA512:
-  metadata.gz: 970b338d028b599b04666f7818febca2b0e7ed1feefc7bf165f2a2bf6eb6fe43d0607b1a095cec6fe3c2c2ca4aea27a6e5a0bb5957ca1a4a5d52c9ab26c0eb12
-  data.tar.gz: c2975a80ad4c94df699f70957dc7d5172a5e88623a739a43b91dec70af7941ca577b83f04d038121bf5b0962c044b4850b5f6c5009a3ac425c72d1983d64662a
+  metadata.gz: e6cf5f68adf86cd7bbd8c986738554c31bc729fe6f4cff39f535cabcd9cc3b16d487503ceda1ec6ec443ee2b33b8679bf2e1f9ae5a3105fd49e3767912dd9d89
+  data.tar.gz: c97a6bacf12d426766462f4cbe1ac479615bb597404ed3fd3b4a02e78aa975fbff25b83df3772b02fce63e6e8066c8266b4d23993aca05cef087a8a5d85da37e

data/app/controllers/devise/oauth2_providable/tokens_controller.rb

@@ -10,12 +10,14 @@ class Devise::Oauth2Providable::TokensController < ApplicationController
   def create
     @refresh_token = oauth2_current_refresh_token || oauth2_current_client.refresh_tokens.create!(:user => current_user)
     @access_token = @refresh_token.access_tokens.create!(:client => oauth2_current_client, :user => current_user)
+    yield if block_given?
     render :json => @access_token.token_response
   end
 
   def destroy
     raise Rack::OAuth2::Server::Authorize::BadRequest unless current_user && oauth2_current_client
     oauth2_current_client.expire_tokens_for_user(current_user)
+    yield if block_given?
     head :no_content
   end
 

data/config/locales/en.yml

@@ -0,0 +1,6 @@
+en:
+  devise:
+    failure:
+      invalid_client: "Invalid client credentials."
+      invalid_refresh_token: "Invalid refresh token."
+      invalid_auth_code: "Invalid authorization code."

data/lib/devise/oauth2_providable/strategies/oauth2_authorization_code_grant_type_strategy.rb

@@ -11,7 +11,7 @@ module Devise
         if code = client.authorization_codes.find_by_token(params[:code])
           success! code.user
         else
-          oauth_error! :invalid_grant, 'invalid authorization code request'
+          oauth_error! :invalid_grant, I18n.t('devise.failure.invalid_auth_code')
         end
       end
     end

data/lib/devise/oauth2_providable/strategies/oauth2_grant_type_strategy.rb

@@ -27,14 +27,13 @@ module Devise
           env[Devise::Oauth2Providable::CLIENT_ENV_REF] = client
           authenticate_grant_type(client)
         else
-          oauth_error! :invalid_client, 'invalid client credentials'
+          oauth_error! :invalid_client
         end
       end
 
-      # return custom error response in accordance with the oauth spec
-      # see http://tools.ietf.org/html/draft-ietf-oauth-v2-16#section-4.3
       def oauth_error!(error_code = :invalid_request, description = nil)
         body = {:error => error_code}
+        description = I18n.t("devise.failure.#{error_code}") unless description
         body[:error_description] = description if description
         custom! [400, {'Content-Type' => 'application/json'}, [body.to_json]]
         throw :warden

data/lib/devise/oauth2_providable/strategies/oauth2_password_grant_type_strategy.rb

@@ -12,7 +12,7 @@ module Devise
         if validate(resource) { resource.valid_password?(params[:password]) }
           success! resource
         else
-          oauth_error! :invalid_grant, 'invalid password authentication request'
+          oauth_error! :invalid_grant, I18n.t("devise.failure.#{resource.unauthenticated_message}")
         end
       end
     end

data/lib/devise/oauth2_providable/strategies/oauth2_refresh_token_grant_type_strategy.rb

@@ -12,7 +12,7 @@ module Devise
           env[Devise::Oauth2Providable::REFRESH_TOKEN_ENV_REF] = refresh_token
           success! refresh_token.user
         else
-          oauth_error! :invalid_grant, 'invalid refresh token'
+          oauth_error! :invalid_grant, I18n.t("devise.failure.invalid_refresh_token")
         end
       end
     end

data/lib/devise/oauth2_providable/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Oauth2Providable
-    VERSION = "1.1.7"
+    VERSION = "1.2.0"
   end
 end

data/lib/devise_oauth2_providable.rb

@@ -30,10 +30,10 @@ end
 Devise.add_module(:oauth2_providable,
   :strategy => true,
   :model => 'devise/oauth2_providable/models/oauth2_providable')
-Devise.add_module(:oauth2_password_grantable, 
+Devise.add_module(:oauth2_password_grantable,
   :strategy => true,
   :model => 'devise/oauth2_providable/models/oauth2_password_grantable')
-Devise.add_module(:oauth2_refresh_token_grantable, 
+Devise.add_module(:oauth2_refresh_token_grantable,
   :strategy => true,
   :model => 'devise/oauth2_providable/models/oauth2_refresh_token_grantable')
 Devise.add_module(:oauth2_authorization_code_grantable,

data/spec/dummy/app/controllers/protected_controller.rb

@@ -1,7 +1,6 @@
 class ProtectedController < ApplicationController
   before_filter :authenticate_user!
   def index
-    # binding.pry
     render :nothing => true, :status => :ok
   end
 end

data/spec/integration/oauth2_authorization_token_grant_type_strategy_spec.rb

@@ -54,7 +54,7 @@ describe Devise::Strategies::Oauth2AuthorizationCodeGrantTypeStrategy do
         it 'returns json' do
           expected = {
             :error => 'invalid_grant',
-            :error_description => 'invalid authorization code request'
+            :error_description => 'Invalid authorization code.'
           }
           response.body.should match_json(expected)
         end
@@ -78,7 +78,7 @@ describe Devise::Strategies::Oauth2AuthorizationCodeGrantTypeStrategy do
         it 'returns json' do
           expected = {
             :error => 'invalid_grant',
-            :error_description => 'invalid authorization code request'
+            :error_description => 'Invalid authorization code.'
           }
           response.body.should match_json(expected)
         end
@@ -102,7 +102,7 @@ describe Devise::Strategies::Oauth2AuthorizationCodeGrantTypeStrategy do
         it 'returns json' do
           expected = {
             :error => 'invalid_client',
-            :error_description => 'invalid client credentials'
+            :error_description => 'Invalid client credentials.'
           }
           response.body.should match_json(expected)
         end
@@ -126,7 +126,7 @@ describe Devise::Strategies::Oauth2AuthorizationCodeGrantTypeStrategy do
         it 'returns json' do
           expected = {
             :error => 'invalid_client',
-            :error_description => 'invalid client credentials'
+            :error_description => 'Invalid client credentials.'
           }
           response.body.should match_json(expected)
         end

data/spec/integration/oauth2_password_grant_type_strategy_spec.rb

@@ -65,7 +65,7 @@ describe Devise::Strategies::Oauth2PasswordGrantTypeStrategy do
         it { response.content_type.should == 'application/json'  }
         it 'returns json' do
           expected = {
-            :error_description => "invalid client credentials",
+            :error_description => "Invalid client credentials.",
             :error => "invalid_client"
           }
           response.body.should match_json(expected)
@@ -87,7 +87,7 @@ describe Devise::Strategies::Oauth2PasswordGrantTypeStrategy do
         it { response.content_type.should == 'application/json'  }
         it 'returns json' do
           expected = {
-            :error_description => "invalid client credentials",
+            :error_description => "Invalid client credentials.",
             :error => "invalid_client"
           }
           response.body.should match_json(expected)
@@ -112,7 +112,7 @@ describe Devise::Strategies::Oauth2PasswordGrantTypeStrategy do
         it { response.content_type.should == 'application/json'  }
         it 'returns json' do
           expected = {
-            :error_description => "invalid password authentication request",
+            :error_description => "Invalid email or password.",
             :error => "invalid_grant"
           }
           response.body.should match_json(expected)
@@ -137,7 +137,7 @@ describe Devise::Strategies::Oauth2PasswordGrantTypeStrategy do
         it { response.content_type.should == 'application/json'  }
         it 'returns json' do
           expected = {
-            :error_description => "invalid client credentials",
+            :error_description => "Invalid client credentials.",
             :error => "invalid_client"
           }
           response.body.should match_json(expected)
@@ -162,7 +162,7 @@ describe Devise::Strategies::Oauth2PasswordGrantTypeStrategy do
         it { response.content_type.should == 'application/json'  }
         it 'returns json' do
           expected = {
-            :error_description => "invalid client credentials",
+            :error_description => "Invalid client credentials.",
             :error => "invalid_client"
           }
           response.body.should match_json(expected)

data/spec/integration/oauth2_refresh_token_grant_type_strategy_spec.rb

@@ -53,7 +53,7 @@ describe Devise::Strategies::Oauth2RefreshTokenGrantTypeStrategy do
         it 'returns json' do
           expected = {
             :error => 'invalid_grant',
-            :error_description => 'invalid refresh token'
+            :error_description => 'Invalid refresh token.'
           }
           response.body.should match_json(expected)
         end
@@ -79,7 +79,7 @@ describe Devise::Strategies::Oauth2RefreshTokenGrantTypeStrategy do
           refresh_token = @refresh_token
           expected = {
             :error => 'invalid_grant',
-            :error_description => 'invalid refresh token'
+            :error_description => 'Invalid refresh token.'
           }
           response.body.should match_json(expected)
         end
@@ -103,7 +103,7 @@ describe Devise::Strategies::Oauth2RefreshTokenGrantTypeStrategy do
         it 'returns json' do
           expected = {
             :error => 'invalid_client',
-            :error_description => 'invalid client credentials'
+            :error_description => 'Invalid client credentials.'
           }
           response.body.should match_json(expected)
         end
@@ -127,7 +127,7 @@ describe Devise::Strategies::Oauth2RefreshTokenGrantTypeStrategy do
         it 'returns json' do
           expected = {
             :error => 'invalid_client',
-            :error_description => 'invalid client credentials'
+            :error_description => 'Invalid client credentials.'
           }
           response.body.should match_json(expected)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brycesch-devise_oauth2_providable
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.2.0
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -175,6 +175,7 @@ files:
 - app/views/devise/oauth2_providable/authorizations/_form.html.erb
 - app/views/devise/oauth2_providable/authorizations/error.html.erb
 - app/views/devise/oauth2_providable/authorizations/new.html.erb
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/20111014160714_create_devise_oauth2_providable_schema.rb
 - devise_oauth2_providable.gemspec