devise_code_authenticatable 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5df2a3e0ff87db76b742906c93d2d6789fc90feebb43324040747e7132c373e3
-  data.tar.gz: 00f26ec893b188625eff3250371b35fa3b9dad6debf76cc76003a23baf91e9b4
+  metadata.gz: 58dd319ab275d8bc675530752f29a3c0ff3f2686811ace551d0dbf62c4b576bf
+  data.tar.gz: 4974ef85404132a51582a8dbe9caf09bdf3e3e1fc35240f9b381bde28813e1d0
 SHA512:
-  metadata.gz: 9a6e8a89807b2d415f1e9f6f64d4fefc978f547c9a814c1d1f01d8e473e7c360c88bfed27b1953e637f0c7bd2b69cf65ea5daf5f0ec0212bb10947913d436176
-  data.tar.gz: 55c6a35a65eac8634a3c90a783243bdf4c47e29066c7316847fb3386ecc5ac27f3828bd6724e700fc0f97769b2fa896ab6f793e8ae75ea6b380e74e13e768eb0
+  metadata.gz: 107e94a1b717569c65b9b0c827a9b638d2c793b2c69b998fd0170948548ec7965744a032a67972824e6b9e86cb7d697857c7530c82adeb2a19812d7c312baf54
+  data.tar.gz: 3247e9563aaef5ff0df03602d50da5db013850308bcb82f47712acd185808ca5b9a69c11ac1ae744c163b3ee89484c50aa70415bc39180358a08fa9aece8ab39

data/app/controllers/devise/login_codes_controller.rb

@@ -10,11 +10,20 @@ class Devise::LoginCodesController < DeviseController
   end
 
   def show
-    email = LoginCode.find(params[:id]).user.email
-    @login_code_id = params[:id]
+    @login_code = LoginCode.find(params[:id])
+    email = @login_code.resource.email
     self.resource = resource_class.new(email: email)
   end
 
+  def resend
+    @login_code = LoginCode.find(params[:id])
+    self.resource = @login_code.resource.send_code_login_instructions
+    if successfully_sent?(resource)
+    end
+
+    redirect_to after_sending_login_code_path_for(resource_name, resource)
+  end
+
   protected
     def auth_options
       :code_authenticatable
@@ -31,4 +40,7 @@ class Devise::LoginCodesController < DeviseController
       { methods: methods, only: [:login_code] }
     end
 
+    def after_sending_login_code_path_for(resource_name, resource)
+      login_code_path(resource_name, resource.login_codes.last) if is_navigational_format?
+    end
 end

data/app/controllers/devise_code_authenticatable/sessions_controller.rb

@@ -5,7 +5,6 @@ class DeviseCodeAuthenticatable::SessionsController < Devise::SessionsController
     yield resource if block_given?
 
     if successfully_sent?(resource)
-      cookies[:devise_resource_email] = resource.email
     end
 
     respond_with(resource, location: after_sending_login_code_path_for(resource_name, resource))
@@ -17,6 +16,6 @@ class DeviseCodeAuthenticatable::SessionsController < Devise::SessionsController
     end
 
     def after_sending_login_code_path_for(resource_name, resource)
-      login_code_path(resource_name, resource.existing_login_code) if is_navigational_format?
+      login_code_path(resource_name, resource.login_codes.last) if is_navigational_format?
     end
 end

data/app/models/login_code.rb

@@ -0,0 +1,3 @@
+class LoginCode < ActiveRecord::Base
+  include DeviseCodeAuthenticatable::LoginCode
+end

data/app/views/devise/login_codes/show.html.erb

@@ -0,0 +1,15 @@
+<h2><%= t(".sign_in") %></h2>
+<%= simple_form_for resource, url: verify_user_login_code_path(@login_code) do |f| %>
+  <div class="field">
+    <%= f.input :email, placeholder: "email" %>
+  </div>
+
+  <div class="field">
+    <%= f.input :login_code, placeholder: "code" %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit t(".sign_in"), class: "btn btn-brand btn-elevate btn-pill" %>
+  </div>
+<% end %>
+<%= link_to t(".resend_code"), resend_user_login_code_path(@login_code) %>

data/app/views/devise/sessions/new.html.erb

@@ -0,0 +1,8 @@
+<h2><%= t(".sign_in") %></h2>
+<%= simple_form_for resource, url: new_session_path(resource_name) do |f| %>
+
+  <%= f.input :email, placeholder: "email" %>
+
+  <%= f.submit t(".send_code"), class: "btn btn-brand btn-elevate btn-pill" %>
+
+<% end %>

data/config/locales/zh-CN.yml

@@ -1,11 +1,14 @@
 zh-CN:
   devise:
-    sessions:
-      user:
-        send_instructions: 邮件发送成功!
     login_codes:
       new:
         sign_in: 登录
+      show:
+        sign_in: 登录
+        resend_code: 重新发送验证码
+    sessions:
+      new:
+        send_code: 发送验证码
       user:
         send_instructions: 邮件发送成功!
         signed_in: 登录成功！

data/lib/devise_code_authenticatable/login_code.rb

@@ -3,7 +3,8 @@ module DeviseCodeAuthenticatable
     extend ActiveSupport::Concern
 
     included do
-      belongs_to :user
+      extend ClassMethods
+      belongs_to :resource, polymorphic: true
 
       after_initialize :default_values
     end
@@ -12,7 +13,6 @@ module DeviseCodeAuthenticatable
       self.code           ||= rand(10000..99999)
       self.expired        ||= false
       self.retry_times    ||= 0
-      self.deliver_method ||= "email"
     end
 
     def verify(code)
@@ -35,5 +35,9 @@ module DeviseCodeAuthenticatable
       self.expired = true; save
     end
 
+    module ClassMethods
+      Devise::Models.config(self, :login_codes)
+    end
+
   end
 end

data/lib/devise_code_authenticatable/models/code_authenticatable.rb

@@ -4,25 +4,22 @@ module Devise
       extend ActiveSupport::Concern
 
       included do
-        has_many :login_codes
+        has_many :login_codes, as: :resource
       end
 
       def login_code
-        existing_login_code&.code
+        existing_login_code
       end
 
       def send_code_login_instructions
         login_code = existing_login_code || generate_login_code
         send_devise_notification(:code_login_instructions, login_code, {})
+        self
       end
 
       def existing_login_code
-        latest_code = login_codes.last
-        if latest_code && !latest_code.expired?
-          login_codes.last
-        else
-          nil
-        end
+        login_code = login_codes.last
+        login_code && !login_code.expired? ? login_code.code : nil
       end
 
       def generate_login_code

data/lib/devise_code_authenticatable/routes.rb

@@ -6,6 +6,7 @@ module ActionDispatch::Routing
     def devise_login_code(mapping, controllers)
       resources :login_codes, only: [:show] do
         member do
+          get :resend
           post :verify
         end
       end

data/lib/devise_code_authenticatable/strategies/code_authenticatable.rb

@@ -9,15 +9,14 @@ module DeviseCodeAuthenticatable
         hashed = false
         login_code = params[scope].fetch "login_code", ""
 
-        if resource.existing_login_code.expired?
+        if resource.login_codes.last.expired?
+          resource.generate_login_code
+          resource.send_code_login_instructions
           fail(:login_code_expired)
-          resource.send_login_code
-          respond_with(resource, location: after_sending_login_code_path_for(resource))
         end
 
-        if validate(resource){ hashed = true; resource.existing_login_code.verify(login_code) }
+        if validate(resource){ hashed = true; resource.login_codes.last.verify(login_code) }
           remember_me(resource)
-          cookies[:devise_resource_email] = resource.email
           resource.after_code_authentication
           success!(resource)
         else

data/lib/devise_code_authenticatable/version.rb

@@ -1,3 +1,3 @@
 module DeviseCodeAuthenticatable
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_code_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - vincentying15
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-15 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -42,7 +42,10 @@ files:
 - Rakefile
 - app/controllers/devise/login_codes_controller.rb
 - app/controllers/devise_code_authenticatable/sessions_controller.rb
+- app/models/login_code.rb
+- app/views/devise/login_codes/show.html.erb
 - app/views/devise/mailer/login_code.html.erb
+- app/views/devise/sessions/new.html.erb
 - config/locales/zh-CN.yml
 - lib/devise_code_authenticatable.rb
 - lib/devise_code_authenticatable/controllers/helpers.rb