rails_jwt_auth 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84bbab8a21df1dc0ab2aa4f1a4b3cf6bcdeeb300
-  data.tar.gz: 8c70773e3fa6760e87060c6d7540e733ae4b964f
+  metadata.gz: 44a233123ae5f2a0f6b39250ba799f8e31b2eea7
+  data.tar.gz: e0ed55e3d8c7f7912fca191a9232d9d961765f36
 SHA512:
-  metadata.gz: e9a59be18b4bb7579f66ff79c1beae53ea8b125ed8a7b521d587113535491e6151a83ba4469306bab5b3a093edd83b1b3dbf2dbe54a2103cf689d15bc276da56
-  data.tar.gz: 6a4617b02cae8cc664eafbc08e315dcbd7cc6b171bd2013cda4266f5a1df6cbd47d783b415bf9f815843e0e82edfdd426f55c473a5d6346d8add9567cb86e5b9
+  metadata.gz: f6ab7cb0cd8afc764a7e4afa8d2924b12b11de19764ac6138047a2488214ab84fc98d982f67e5efe634f06d041473ed5b18cee11504a335e37117750bc4ca220
+  data.tar.gz: e358f3a9332e4a2a2a75cb0d2e04677008e962e7feefac5a0f60a141bda4818841885b0b04a9d29c44ff902c0004a855266c17e03a71f7b507f2ef9dfd78b459

data/app/validators/email_validator.rb

@@ -1,7 +1,7 @@
 class EmailValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     unless value =~ /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
-      record.errors[attribute] << (options[:message] || "is not an email")
+      record.errors[attribute] << (options[:message] || I18n.t('rails_jwt_auth.errors.invalid_email'))
     end
   end
 end

data/config/locales/en.yml

@@ -13,3 +13,4 @@ en:
       invalid: "invalid"
       blank: "blank"
       not_found: "not found"
+      invalid_email: "is not an email"

data/lib/rails_jwt_auth/jwt/request.rb

@@ -6,11 +6,16 @@ module RailsJwtAuth
       def initialize(request)
         return unless request.env['HTTP_AUTHORIZATION']
         @jwt = request.env['HTTP_AUTHORIZATION'].split.last
-        @jwt_info = RailsJwtAuth::Jwt::Manager.decode(@jwt)
+
+        begin
+          @jwt_info = RailsJwtAuth::Jwt::Manager.decode(@jwt)
+        rescue JWT::ExpiredSignature
+          @jwt_info = false
+        end
       end
 
       def valid?
-        @jwt && RailsJwtAuth::Jwt::Manager.valid_payload?(payload)
+        @jwt && @jwt_info && RailsJwtAuth::Jwt::Manager.valid_payload?(payload)
       end
 
       def payload

data/lib/rails_jwt_auth/strategies/jwt.rb

@@ -7,10 +7,10 @@ module RailsJwtAuth
         jwt = RailsJwtAuth::Jwt::Request.new(request)
 
         if jwt.valid? && (model = RailsJwtAuth.model.get_by_token(jwt.auth_token))
-          success!(model)
-        else
-          fail!('strategies.authentication_token.failed')
+          return success!(model)
         end
+
+        fail!('strategies.authentication_token.failed')
       end
     end
   end

data/lib/rails_jwt_auth/version.rb

@@ -1,3 +1,3 @@
 module RailsJwtAuth
-  VERSION = '0.14.0'
+  VERSION = '0.15.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_jwt_auth
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - rjurado
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Rails jwt authentication.