devise_code_authenticatable 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58dd319ab275d8bc675530752f29a3c0ff3f2686811ace551d0dbf62c4b576bf
-  data.tar.gz: 4974ef85404132a51582a8dbe9caf09bdf3e3e1fc35240f9b381bde28813e1d0
+  metadata.gz: b1da93534d7b83b5a5145fe964ba7583b48a18a9eb49ccdeb76455336fada640
+  data.tar.gz: e96bebb40070bf1ce17931248e95f9b41af24680776cad170f6654dd0a310dad
 SHA512:
-  metadata.gz: 107e94a1b717569c65b9b0c827a9b638d2c793b2c69b998fd0170948548ec7965744a032a67972824e6b9e86cb7d697857c7530c82adeb2a19812d7c312baf54
-  data.tar.gz: 3247e9563aaef5ff0df03602d50da5db013850308bcb82f47712acd185808ca5b9a69c11ac1ae744c163b3ee89484c50aa70415bc39180358a08fa9aece8ab39
+  metadata.gz: 44d912429da981c598766eb2b5f44e53e855718576d9a150890a7ec64008f19cd045d35298e473cacd9f4f19974c798ebec5968f71e7236ba3fd0e7db08f2027
+  data.tar.gz: e8644c65f7b6266e29a7dd8dc79ec258e70c8eb88f1ec66cd4ebc422e16bc4c6dadd5597d52ea43334c6bd7ceec0008f442624bf43b5a71374d4d06fd94f7688

data/app/controllers/devise_code_authenticatable/sessions_controller.rb

@@ -5,9 +5,12 @@ class DeviseCodeAuthenticatable::SessionsController < Devise::SessionsController
     yield resource if block_given?
 
     if successfully_sent?(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)
     end
 
-    respond_with(resource, location: after_sending_login_code_path_for(resource_name, resource))
   end
 
   protected

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

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

data/app/views/devise/mailer/login_code.html.erb

@@ -1,3 +1,3 @@
-<p><%= t('greeting', scope: "devise.mailer.confirmation_instructions", recipient: @resource.name) %></p>
+<p><%= t('greeting', scope: "devise.mailer.confirmation_instructions", recipient: @resource.email) %></p>
 
 <p><%= t('your_login_code', scope: "devise.mailer.login_code", code: @code) %></p>

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

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

data/config/locales/en.yml

@@ -0,0 +1,18 @@
+en:
+  devise:
+    sessions:
+      new:
+        send_code: Send code
+      user:
+        send_instructions: "You will receive an email with login code."
+        send_mail_failed: "Fail to send mail, does the email exist?"
+    failure:
+      invalid_login_code: Invalid code
+    login_codes:
+      show:
+        sign_in: Sign In
+      user:
+        signed_in: "Successfully signed in!"
+    mailer:
+      login_code:
+        your_login_code: "Your login code: %{code}"

data/config/locales/zh-CN.yml

@@ -6,6 +6,8 @@ zh-CN:
       show:
         sign_in: 登录
         resend_code: 重新发送验证码
+      user:
+        signed_in: 登录成功
     sessions:
       new:
         send_code: 发送验证码

data/lib/devise_code_authenticatable.rb

@@ -1,21 +1,19 @@
 module DeviseCodeAuthenticatable
-  autoload :Mailer, 'devise_code_authenticatable/mailer'
   autoload :LoginCode, 'devise_code_authenticatable/login_code'
+  autoload :Mailer, 'devise_code_authenticatable/mailer'
   autoload :Mapping, 'devise_code_authenticatable/mapping'
   autoload :ParameterSanitizer, 'devise_code_authenticatable/parameter_sanitizer'
-
-
   module Controllers
-    autoload :Helpers, 'devise_code_authenticatable/controllers/helpers'
     autoload :Sessions, 'devise_code_authenticatable/controllers/sessions'
+    autoload :Helpers, 'devise_code_authenticatable/controllers/helpers'
   end
 end
 
 
 require 'devise'
-require 'devise_code_authenticatable/strategies/code_authenticatable'
 require 'devise_code_authenticatable/routes'
 require 'devise_code_authenticatable/rails'
+require 'devise_code_authenticatable/strategies/code_authenticatable'
 
 module Devise
 end
@@ -25,4 +23,4 @@ end
 Devise.add_module :code_authenticatable,
   strategy: true,
   model: 'devise_code_authenticatable/models',
-  route: { login_code: [nil, :new, :create] }
+  route: { login_code: [nil, :show, :resend, :verify] }

data/lib/devise_code_authenticatable/mapping.rb

@@ -4,7 +4,7 @@ module DeviseCodeAuthenticatable
 
       def default_controllers(options)
         options[:controllers] ||= {}
-        options[:controllers][:sessions] = 'devise_code_authenticatable/sessions'
+        options[:controllers][:sessions] ||= 'devise_code_authenticatable/sessions'
         super
       end
   end

data/lib/devise_code_authenticatable/rails.rb

@@ -16,6 +16,7 @@ module DeviseCodeAuthenticatable
     end
     # extend mapping with after_initialize because it's not reloaded
     config.after_initialize do
+      Devise::Mapping.send :prepend, DeviseCodeAuthenticatable::Mapping
       Devise::ParameterSanitizer.send :prepend, DeviseCodeAuthenticatable::ParameterSanitizer
     end
   end

data/lib/devise_code_authenticatable/routes.rb

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

data/lib/devise_code_authenticatable/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_code_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - vincentying15
@@ -46,6 +46,7 @@ files:
 - 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/en.yml
 - config/locales/zh-CN.yml
 - lib/devise_code_authenticatable.rb
 - lib/devise_code_authenticatable/controllers/helpers.rb