brycesch-devise_oauth2_providable 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff678f09826117ad5fa3565501da31b00c427530
-  data.tar.gz: 756ae56d425b019a5d60f2d771f86b5c82f6995e
+  metadata.gz: e6e326eb53c592b6f71238d490ba036b3288b42a
+  data.tar.gz: 11ec8750713c7f0ef97fa6070e415837d66685e5
 SHA512:
-  metadata.gz: 9e697c457bc740da9d6a911167b331e652d041a435c3cb133d6926d25e6410a996eaff1c2c6b4fc18053e27e471fd1470348fca23c296547aba3f66bb44fb212
-  data.tar.gz: f1b15556ca8553705b3dd3b554860566c1cfe6808fdc508ad634fad31c6d3f425f29142003a662815f95fd00d9260799a99dda4f27d517f62d1dedbafe6bbf11
+  metadata.gz: ccd906373187384f8e3ca8e120f9a7b60ceba722e9a3814ed41922bbf59807b2a9852dd25fa7deedb458b677600305764d01466b7fa0fee9c5e2cc9677f4efb9
+  data.tar.gz: 34f5696ec1b7e9780bf94d52744fe27ff5b1a71695c9b25807e44b5e551cfb95d19bd8708f8f4d886cd57a68d75ff074d8bc02b98a3c1069f98dbf848dc14766

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

@@ -8,11 +8,13 @@ module Devise
       end
 
       def authenticate_grant_type(client)
-        resource = mapping.to.find_for_database_authentication(mapping.to.authentication_keys.first => params[:username])
+        keys = mapping.to.authentication_keys
+        resource = mapping.to.find_for_database_authentication(keys.first => params[:username])
         if validate(resource) { resource.valid_password?(params[:password]) }
           success! resource
         else
-          oauth_error! :invalid_grant, I18n.t("devise.failure.#{resource.unauthenticated_message}", authentication_keys: mapping.to.authentication_keys)
+          keys_string = keys.join(I18n.translate(:"support.array.words_connector"))
+          oauth_error! :invalid_grant, I18n.t("devise.failure.#{resource.unauthenticated_message}", authentication_keys: keys_string)
         end
       end
     end

data/lib/devise/oauth2_providable/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Oauth2Providable
-    VERSION = "1.2.1"
+    VERSION = "1.2.2"
   end
 end

data/spec/dummy/config/locales/devise.en.yml

@@ -17,7 +17,7 @@ en:
       unauthenticated: 'You need to sign in or sign up before continuing.'
       unconfirmed: 'You have to confirm your account before continuing.'
       locked: 'Your account is locked.'
-      invalid: 'Invalid email or password.'
+      invalid: 'Invalid %{authentication_keys} or password.'
       invalid_token: 'Invalid authentication token.'
       timeout: 'Your session expired, please sign in again to continue.'
       inactive: 'Your account was not activated yet.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brycesch-devise_oauth2_providable
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Ryan Sonnek