devise_code_authenticatable 0.2.4 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 802cb621d38b1a1a2d105a2fb1861d33a6ccf86f1cdff22a160f7bf7b0263d8a
-  data.tar.gz: 2b84e12d2ca615676d14959a302c9237b5261a564e6b3680c8af6fdfc339e4d9
+  metadata.gz: e08a88d16136e63000624d73bf64ce578144d6562a57bc69873737014f06db28
+  data.tar.gz: d6744eb1d80ee200e8ee2d0b26a402e211680270640a2842022d7bffafa1a5f1
 SHA512:
-  metadata.gz: 242ca71ae2d6038956c38b7874c027a9b1e8ecb34deb4e7f14cea470eead8b1e34679e99f3d587824df16546b9085f0c4688f97092a6749ff4119ae41e7d86fb
-  data.tar.gz: 361444707ec37d0c5780f8d5f2081baa33f3064b4d8c46010431b5886b15fc87fa0e09e30b672746e925461e304cbcfa318c0f4f76d82f71b88aa7cdd24f6308
+  metadata.gz: 5fbde8f5031292f522e6d91325176a5a318a03efd72b62c084db28eca8699c3a0a427d90099c9afb294c02ba4ab4886e2782e402bc2c9b16314a83db085318f0
+  data.tar.gz: cbe97ca7607c636841e42d2acc9b63ecb8df9335b1e657b210a7c640da518ed5d2ebacf7c429b91069839df34ccc6508c8563075789c3228ed553675eb05a4a2

data/app/controllers/devise/login_codes_controller.rb

@@ -1,11 +1,14 @@
 class Devise::LoginCodesController < DeviseController
   prepend_before_action :allow_params_authentication!, only: :verify
 
-  def verify(&block)
-    self.resource = warden.authenticate!(auth_options, &block)
+  def verify
+    self.resource = warden.authenticate!(auth_options)
     set_flash_message!(:notice, :signed_in)
     sign_in(resource_name, resource)
-    respond_with resource, location: after_sign_in_path_for(resource)
+
+    yield resource if block_given?
+
+    redirect_to after_sign_in_path_for(resource)
   end
 
   def show
@@ -18,9 +21,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?
@@ -22,7 +21,7 @@ module DeviseCodeAuthenticatable
           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

data/lib/devise_code_authenticatable/version.rb

@@ -1,3 +1,3 @@
 module DeviseCodeAuthenticatable
-  VERSION = '0.2.4'
+  VERSION = '0.2.7'
 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.4
+  version: 0.2.7
 platform: ruby
 authors:
 - vincentying15
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-10 00:00:00.000000000 Z
+date: 2023-10-16 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