devise_code_authenticatable 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cce90a203a25809100b7b3c57585810ec8c0110ac0d7dd64052d89d6c6f3c6c
-  data.tar.gz: 75348b97c4f32e62cb1a24071c61773832286892b1aae8959dc3f26f77a4a520
+  metadata.gz: '071439b7cb5e3c0f836077669f4df4f276987ae5f3f11f2b99bca0cf3bcddce2'
+  data.tar.gz: 0275fe3087847ecb4c7c32c0e37f6f0085e49adfcd5068cef7baaf2ad843725f
 SHA512:
-  metadata.gz: 3e270bd9585ea8b723210508d0836f22bb92ae0eb0cb623a4786d4c7f17e2153ce72b3fa060d98148a637fddad896ab9333f499b121b9e257d5677b47a192e16
-  data.tar.gz: ff870f4a74bcf74f0d0d457c93db8f9bbd7ae91c82c0cd202b01cb7f490e3e898a252661c35c9112ea12a523a5ae94eeaa89ab61962fcb54850455011aea0609
+  metadata.gz: 68d370d6158d0b259307cfe1ec4c848d7462c357bfc4639eead56c35d22d56911aad4fa80a2aef2e9e641fcbcf54012a5737f7a35a90df02ad8d90b4ab08d33b
+  data.tar.gz: 9af50707444f3785d1aca3d8ef77d74790f9d444757a34c1910c5841d52d394720000d68c9653f31f2a3424fdd0caf6ef0e197bf0f178ce4faf93f9438875b6f

data/lib/devise_code_authenticatable/login_code.rb

@@ -17,7 +17,7 @@ module DeviseCodeAuthenticatable
 
     def verify(code)
       if expired?
-        raise ActiveModel::Errors "expired code should never be validated!"
+        return false
       end
 
       self.retry_times += 1; save

data/lib/devise_code_authenticatable/strategies/code_authenticatable.rb

@@ -10,25 +10,25 @@ module DeviseCodeAuthenticatable
         login_code = params[scope].fetch "login_code", ""
 
         if resource.nil?
-          fail(:not_found_in_database)
+          fail(:not_found_in_database); return
+        end
+
+        if resource.login_codes.empty?
+          resource.send_code_login_instructions
+          fail(:login_code_expired); return
+        end
+
+        if resource.login_codes.last.expired?
+          resource.send_code_login_instructions unless resource.login_codes.last.used?
+          fail(:login_code_expired); return
+        end
+
+        if validate(resource){ hashed = true; resource.login_codes.last.verify(login_code) }
+          remember_me(resource)
+          resource.after_code_authentication
+          success!(resource)
         else
-          if resource.login_codes.empty?
-            resource.send_code_login_instructions
-            fail(:login_code_expired)
-          end
-
-          if resource.login_codes.last.expired?
-            resource.send_code_login_instructions unless resource.login_codes.last.used?
-            fail(:login_code_expired)
-          end
-
-          if validate(resource){ hashed = true; resource.login_codes.last.verify(login_code) }
-            remember_me(resource)
-            resource.after_code_authentication
-            success!(resource)
-          else
-            fail(:invalid_login_code)
-          end
+          fail(:invalid_login_code)
         end
       end
 

data/lib/devise_code_authenticatable/version.rb

@@ -1,3 +1,3 @@
 module DeviseCodeAuthenticatable
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_code_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - vincentying15
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails