rails_jwt_auth 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2d3d72328f4fd09857c817cdcb70aa8950badbdce4f4b24eef9c0c03cd33c40
-  data.tar.gz: 6324cd6f9d293b683e273972ab8dafaee11b89f2ffb209ef1574c69c42b9b377
+  metadata.gz: 8f352112fd6b12718777361e279d9e4ff743cc60ff9fe631ea21379478dc3040
+  data.tar.gz: 94981bb16178f532ce0ef5c7ec5da60b3afd8c85483a884c3fae8ddb6303429c
 SHA512:
-  metadata.gz: b9a3821d06717a9ca57ca1f56358401a67d6028f5b537f0a80c02f39069932754369d1611d26412b7e0762fd0a53ee358321dc3925c54c35f8b4010cbcae3d12
-  data.tar.gz: 1f8c0a8a8270bc776b37b4ed8edd00485df3a1693224c81f47dcf735285f3684ff53ad6ae8a0e50cadba84c790e871819e7e1d8478c9bc82a7f81401eee13b6c
+  metadata.gz: 26221283e2e5fa7191d37fc41470dc60ca3aee634a69de10d2b5844fe34ac9fc3329840f74ceac08209bc0bdd77ee5666cb15bb3dd0a79721a46e9446fff19db
+  data.tar.gz: fc03b5a3fb9642674de2f218fdbcc733c57ad5c7fa39dd77299129c14d4b7f2fc3e2040366fe3e15abee0fa67e15f57258b16ffd86849eea96e18f0da9219d60

data/README.md

@@ -539,7 +539,7 @@ class UsersController < ApplicationController
 
   def create
     user = User.new(create_params)
-    user.set_and_send_password_instructions ? render_204 : render_422(user.errors)
+    user.set_and_send_password_instructions ? render_204 : render_422(user.errors.details)
   end
 
   private

data/app/controllers/rails_jwt_auth/confirmations_controller.rb

@@ -5,20 +5,20 @@ module RailsJwtAuth
 
     def create
       user = RailsJwtAuth.model.where(email: confirmation_create_params[:email]).first
-      return render_422(email: [I18n.t('rails_jwt_auth.errors.not_found')]) unless user
+      return render_422(email: [{error: :not_found}]) unless user
 
-      user.send_confirmation_instructions ? render_204 : render_422(user.errors)
+      user.send_confirmation_instructions ? render_204 : render_422(user.errors.details)
     end
 
     def update
       if params[:confirmation_token].blank?
-        return render_422(confirmation_token: [I18n.t('rails_jwt_auth.errors.not_found')])
+        return render_422(confirmation_token: [{error: :not_found}])
       end
 
       user = RailsJwtAuth.model.where(confirmation_token: params[:confirmation_token]).first
-      return render_422(confirmation_token: [I18n.t('rails_jwt_auth.errors.not_found')]) unless user
+      return render_422(confirmation_token: [{error: :not_found}]) unless user
 
-      user.confirm! ? render_204 : render_422(user.errors)
+      user.confirm! ? render_204 : render_422(user.errors.details)
     end
   end
 end

data/app/controllers/rails_jwt_auth/invitations_controller.rb

@@ -6,7 +6,7 @@ module RailsJwtAuth
     def create
       attr_hash = invitation_create_params
       user = RailsJwtAuth.model.invite!(attr_hash)
-      user.errors.empty? ? render_204 : render_422(user.errors)
+      user.errors.empty? ? render_204 : render_422(user.errors.details)
     end
 
     def update
@@ -17,7 +17,7 @@ module RailsJwtAuth
 
       return render_204 if user.errors.empty? && user.save
 
-      render_422(user.errors)
+      render_422(user.errors.details)
     end
   end
 end

data/app/controllers/rails_jwt_auth/passwords_controller.rb

@@ -5,27 +5,23 @@ module RailsJwtAuth
 
     def create
       user = RailsJwtAuth.model.where(email: password_create_params[:email].to_s.downcase).first
-      return render_422(email: [I18n.t('rails_jwt_auth.errors.not_found')]) unless user
+      return render_422(email: [{error: :not_found}]) unless user
 
-      user.send_reset_password_instructions ? render_204 : render_422(user.errors)
+      user.send_reset_password_instructions ? render_204 : render_422(user.errors.details)
     end
 
     def update
       if params[:reset_password_token].blank?
-        return render_422(reset_password_token: [I18n.t('rails_jwt_auth.errors.not_found')])
+        return render_422(reset_password_token: [{error: :not_found}])
       end
 
       user = RailsJwtAuth.model.where(reset_password_token: params[:reset_password_token]).first
 
-      unless user
-        return render_422(reset_password_token: [I18n.t('rails_jwt_auth.errors.not_found')])
-      end
+      return render_422(reset_password_token: [{error: :not_found}]) unless user
 
-      unless password_update_params[:password].present?
-        return render_422(password: [I18n.t('rails_jwt_auth.errors.password.blank')])
-      end
+      return render_422(password: [{error: :blank}]) if password_update_params[:password].blank?
 
-      user.update_attributes(password_update_params) ? render_204 : render_422(user.errors)
+      user.update(password_update_params) ? render_204 : render_422(user.errors.details)
     end
   end
 end

data/app/controllers/rails_jwt_auth/registrations_controller.rb

@@ -5,7 +5,7 @@ module RailsJwtAuth
 
     def create
       user = RailsJwtAuth.model.new(registration_create_params)
-      user.save ? render_registration(user) : render_422(user.errors)
+      user.save ? render_registration(user) : render_422(user.errors.details)
     end
   end
 end

data/app/controllers/rails_jwt_auth/sessions_controller.rb

@@ -11,13 +11,13 @@ module RailsJwtAuth
         session_create_params[RailsJwtAuth.auth_field_name].to_s.downcase).first
 
       if !user
-        render_422 session: [create_session_error]
+        render_422 session: [{error: :invalid_session}]
       elsif user.respond_to?('confirmed?') && !user.confirmed?
-        render_422 session: [I18n.t('rails_jwt_auth.errors.unconfirmed')]
+        render_422 session: [{error: :unconfirmed}]
       elsif user.authenticate(session_create_params[:password])
         render_session get_jwt(user), user
       else
-        render_422 session: [create_session_error]
+        render_422 session: [{error: :invalid_session}]
       end
     end
 
@@ -32,9 +32,5 @@ module RailsJwtAuth
     def get_jwt(user)
       RailsJwtAuth::Jwt::Manager.encode(user.to_token_payload(request))
     end
-
-    def create_session_error
-      I18n.t('rails_jwt_auth.errors.create_session', field: RailsJwtAuth.auth_field_name)
-    end
   end
 end

data/app/models/concerns/rails_jwt_auth/authenticatable.rb

@@ -26,13 +26,13 @@ module RailsJwtAuth
 
     def update_with_password(params)
       if (current_password = params.delete(:current_password)).blank?
-        errors.add(:current_password, I18n.t('rails_jwt_auth.errors.current_password.blank'))
+        errors.add(:current_password, 'blank')
       elsif !authenticate(current_password)
-        errors.add(:current_password, I18n.t('rails_jwt_auth.errors.current_password.invalid'))
+        errors.add(:current_password, 'invalid')
       end
 
       if params[:password].blank?
-        errors.add(:password, I18n.t('rails_jwt_auth.errors.password.blank'))
+        errors.add(:password, 'blank')
       end
 
       errors.empty? ? update_attributes(params) : false

data/app/models/concerns/rails_jwt_auth/confirmable.rb

@@ -2,7 +2,7 @@ module RailsJwtAuth
   module Confirmable
     def send_confirmation_instructions
       if confirmed? && !unconfirmed_email
-        errors.add(:email, I18n.t('rails_jwt_auth.errors.already_confirmed'))
+        errors.add(:email, :already_confirmed)
         return false
       end
 
@@ -80,10 +80,10 @@ module RailsJwtAuth
       return true unless confirmed_at
 
       if confirmed_at_was && !email_changed?
-        errors.add(:email, I18n.t('rails_jwt_auth.errors.already_confirmed'))
+        errors.add(:email, :already_confirmed)
       elsif confirmation_sent_at &&
             (confirmation_sent_at < (Time.now - RailsJwtAuth.confirmation_expiration_time))
-        errors.add(:confirmation_token, I18n.t('rails_jwt_auth.errors.expired'))
+        errors.add(:confirmation_token, :expired)
       end
     end
   end

data/app/models/concerns/rails_jwt_auth/invitable.rb

@@ -5,7 +5,7 @@ module RailsJwtAuth
     def self.included(base)
       base.extend ClassMethods
       base.class_eval do
-        if ancestors.include? Mongoid::Document
+        if defined?(Mongoid) && ancestors.include?(Mongoid::Document)
           # include GlobalID::Identification to use deliver_later method
           # http://edgeguides.rubyonrails.org/active_job_basics.html#globalid
           include GlobalID::Identification if RailsJwtAuth.deliver_later
@@ -28,9 +28,7 @@ module RailsJwtAuth
       # @param [Hash] attributes Hash containing user's attributes to be filled.
       #               Must contain an email key.
       #
-      #
       # @return [user] The user created or found by email.
-
       def invite!(attributes={})
         attrs = ActiveSupport::HashWithIndifferentAccess.new(attributes.to_h)
         auth_field = RailsJwtAuth.auth_field_name
@@ -54,6 +52,7 @@ module RailsJwtAuth
 
     def accept_invitation!
       return unless invited?
+
       if valid_invitation?
         accept_invitation
         self.confirmed_at = Time.now.utc if respond_to? :confirmed_at
@@ -62,7 +61,6 @@ module RailsJwtAuth
       end
     end
 
-    # rubocop:disable Metrics/AbcSize
     def invite!
       self.invitation_created_at = Time.now.utc if new_record?
 
@@ -74,12 +72,12 @@ module RailsJwtAuth
 
       valid?
 
-      # Users that are registered and were not invited are not reinvitable
+      # users that are registered and were not invited are not reinvitable
       if !new_record? && !invited?
         errors.add(RailsJwtAuth.auth_field_name, :taken)
       end
 
-      # Users that have already accepted an invitation are not reinvitable
+      # users that have already accepted an invitation are not reinvitable
       if !new_record? && invited? && invitation_accepted_at.present?
         errors.add(RailsJwtAuth.auth_field_name, :taken)
       end
@@ -92,7 +90,6 @@ module RailsJwtAuth
       send_invitation_mail if save(validate: false)
       self
     end
-    # rubocop:enable Metrics/AbcSize
 
     def invited?
       (persisted? && invitation_token.present?)

data/app/models/concerns/rails_jwt_auth/recoverable.rb

@@ -2,7 +2,7 @@ module RailsJwtAuth
   module Recoverable
     def send_reset_password_instructions
       if self.class.ancestors.include?(RailsJwtAuth::Confirmable) && !confirmed?
-        errors.add(:email, I18n.t('rails_jwt_auth.errors.unconfirmed'))
+        errors.add(:email, :unconfirmed)
         return false
       end
 
@@ -56,7 +56,7 @@ module RailsJwtAuth
     def validate_reset_password_token
       if reset_password_sent_at &&
          (reset_password_sent_at < (Time.now - RailsJwtAuth.reset_password_expiration_time))
-        errors.add(:reset_password_token, I18n.t('rails_jwt_auth.errors.expired'))
+        errors.add(:reset_password_token, :expired)
       end
     end
   end

data/app/validators/email_validator.rb

@@ -1,7 +1,7 @@
 class EmailValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     unless value =~ RailsJwtAuth.email_regex
-      record.errors[attribute] << (options[:message] || I18n.t('rails_jwt_auth.errors.email.invalid'))
+      record.errors.add(attribute, (options[:message] || 'invalid'))
     end
   end
 end

data/config/locales/en.yml

@@ -9,20 +9,3 @@ en:
         subject: "Set password instructions"
       send_invitation:
         subject: "Someone has sent you an invitation!"
-
-    errors:
-      unconfirmed: "unconfirmed email"
-      already_confirmed: "was already confirmed, please try signing in"
-      create_session: "invalid %{field} / password"
-      expired: "has expired, please request a new one"
-      invalid: "invalid"
-      blank: "blank"
-      not_found: "not found"
-      missing: "is missing"
-      email:
-        invalid: "is not an email"
-      current_password:
-        blank: "blank"
-        invalid: "invalid"
-      password:
-        blank: "blank"

data/lib/rails_jwt_auth/version.rb

@@ -1,3 +1,3 @@
 module RailsJwtAuth
-  VERSION = '0.21.0'
+  VERSION = '0.22.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_jwt_auth
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - rjurado
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2018-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt