devise_code_authenticatable 0.2.3 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2948fdbc5b0bc87a1d08ab431cee7d121abbec208a82836f8662216341d575c7
-  data.tar.gz: e08fee0dbc98b94e9b368dad6a96b41741698e7c9e9e802847c4ba556199732c
+  metadata.gz: '099b2a3088add3c99894f9da1b3591f17921fa587aef4a177fa61a1439e26f52'
+  data.tar.gz: 6d11c69d80ebe474c2092e1c71dbe99366c6a016dd233edb5a51a80276aa8e02
 SHA512:
-  metadata.gz: 34bf27cd625727f12d09d1cefde526810274493d93db5cd42ce6d82ebe5e1944d5472e6950466d20850f53a369aace9ab61a3b87a9265404982f79b2167c587c
-  data.tar.gz: 3b38efb389db6397e7818be56451ceaa7cfbb5dc4c1b4cdea87701ea7754589a2fea2476ee447a05c3bacacdf76d5ffd121ae75f2690c9b65873004377134e89
+  metadata.gz: dcc94d1f25ae0d6f9ec43747bb62ca12d4f75ef4230f75a00136a2ed61a93369054a0bd973aba6c8e86db0ca767ad3a62988f8dd5ef7a8763f02e4e16745718a
+  data.tar.gz: 151611f8921a90d82144a6fbc6c8acc6396a3651afd62a2b2a7e40890e70653fc69fa1cc99a193bbfbbec9095fde61d07bc985b7568ac1cbbdf19e6fa0bfbf2e

data/app/controllers/devise/login_codes_controller.rb

@@ -5,8 +5,8 @@ class Devise::LoginCodesController < DeviseController
     self.resource = warden.authenticate!(auth_options)
     set_flash_message!(:notice, :signed_in)
     sign_in(resource_name, resource)
-    yield resource if block_given?
-    respond_with resource, location: after_sign_in_path_for(resource)
+    redirect_to after_sign_in_path_for(resource)
+
   end
 
   def show
@@ -19,9 +19,8 @@ class Devise::LoginCodesController < DeviseController
     @login_code = LoginCode.find(params[:id])
     self.resource = @login_code.resource.send_code_login_instructions
     if successfully_sent?(resource)
+      redirect_to after_sending_login_code_path_for(resource_name, resource)
     end
-
-    redirect_to after_sending_login_code_path_for(resource_name, resource)
   end
 
   protected

data/app/controllers/devise_code_authenticatable/sessions_controller.rb

@@ -4,11 +4,12 @@ class DeviseCodeAuthenticatable::SessionsController < Devise::SessionsController
     self.resource = resource_class.send_code_login_instructions(resource_params)
     yield resource if block_given?
 
+    flash.clear 
     if successfully_sent?(resource)
-      respond_with(resource, location: after_sending_login_code_path_for(resource_name, resource))
+      respond_with resource, location: after_sending_login_code_path_for(resource_name, resource)
     else
       set_flash_message!(:alert, "send_mail_failed")
-      respond_with(resource)
+      respond_with resource, location: after_sign_in_path_for(resource)
     end
 
   end

data/config/locales/zh-CN.yml

@@ -6,21 +6,18 @@ zh-CN:
       show:
         sign_in: 登录
         resend_code: 重新发送验证码
-      user:
-        signed_in: 登录成功
-        send_instructions: "邮件发送成功！"
+      signed_in: 登录成功
+      send_instructions: 邮件发送成功!
     sessions:
+      send_instructions: 邮件发送成功!
+      send_mail_failed: 邮件发送失败
+      signed_in: 登录成功！
       new:
         send_code: 发送验证码
-      user:
-        send_instructions: 邮件发送成功!
-        send_mail_failed: 邮件发送失败
-        signed_in: 登录成功！
     mailer:
       login_code:
         submit: 登录验证码
         your_login_code: "您的登录验证码为: %{code}"
     failure:
-      user:
-        login_code_expired: 验证码过期，已重新发送验证码
-        invalid_login_code: 验证码错误
+      login_code_expired: 该验证码已过期，请重新获取验证码
+      invalid_login_code: 验证码错误

data/lib/devise_code_authenticatable/failure_app_ext.rb

@@ -0,0 +1,11 @@
+module DeviseCodeAuthenticatable
+  module FailureAppExt
+    def redirect_url
+      if warden_message == :invalid_login_code
+        request.referrer || super
+      else
+        super
+      end
+    end
+  end
+end

data/lib/devise_code_authenticatable/login_code.rb

@@ -20,7 +20,7 @@ module DeviseCodeAuthenticatable
         return false
       end
 
-      self.retry_times += 1; save
+      self.retry_times += 1; save!
       self.code == code
     end
 

data/lib/devise_code_authenticatable/rails.rb

@@ -18,6 +18,7 @@ module DeviseCodeAuthenticatable
     config.after_initialize do
       Devise::Mapping.send :prepend, DeviseCodeAuthenticatable::Mapping
       Devise::ParameterSanitizer.send :prepend, DeviseCodeAuthenticatable::ParameterSanitizer
+      Devise::FailureApp.send :prepend, DeviseCodeAuthenticatable::FailureAppExt
     end
   end
 end

data/lib/devise_code_authenticatable/strategies/code_authenticatable.rb

@@ -6,7 +6,6 @@ module DeviseCodeAuthenticatable
 
       def authenticate!
         resource = mapping.to.find_for_authentication(authentication_hash)
-        hashed = false
         login_code = params[scope].fetch "login_code", ""
 
         if resource.nil?
@@ -14,17 +13,17 @@ module DeviseCodeAuthenticatable
         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?
+          resource.expire_all_login_codes
           fail(:login_code_expired); return
         end
 
-        if validate(resource){ hashed = true; resource.login_codes.last.verify(login_code) }
+        if validate(resource){ resource.login_codes.last.verify(login_code) }
           remember_me(resource)
+          yield resource if block_given?
           resource.after_code_authentication
           success!(resource)
         else

data/lib/devise_code_authenticatable/version.rb

@@ -1,3 +1,3 @@
 module DeviseCodeAuthenticatable
-  VERSION = '0.2.3'
+  VERSION = '0.2.6'
 end

data/lib/devise_code_authenticatable.rb

@@ -3,6 +3,7 @@ module DeviseCodeAuthenticatable
   autoload :Mailer, 'devise_code_authenticatable/mailer'
   autoload :Mapping, 'devise_code_authenticatable/mapping'
   autoload :ParameterSanitizer, 'devise_code_authenticatable/parameter_sanitizer'
+  autoload :FailureAppExt, 'devise_code_authenticatable/failure_app_ext'
   module Controllers
     autoload :Sessions, 'devise_code_authenticatable/controllers/sessions'
     autoload :Helpers, 'devise_code_authenticatable/controllers/helpers'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_code_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.6
 platform: ruby
 authors:
 - vincentying15
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-04 00:00:00.000000000 Z
+date: 2023-10-13 00:00:00.000000000 Z
 dependencies: []
 description: Devise plugin to allow sign in by email sent code
 email:
@@ -30,6 +30,7 @@ files:
 - config/locales/zh-CN.yml
 - lib/devise_code_authenticatable.rb
 - lib/devise_code_authenticatable/controllers/helpers.rb
+- lib/devise_code_authenticatable/failure_app_ext.rb
 - lib/devise_code_authenticatable/login_code.rb
 - lib/devise_code_authenticatable/mailer.rb
 - lib/devise_code_authenticatable/mapping.rb
@@ -50,7 +51,7 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
   source_code_uri: https://github.com/vincentying15/devise_code_authenticatable
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -66,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: devise_code_authenticatable
 test_files: []