devise_sms_confirmable 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 750ac29541d9079dae8b3750d785cf5b8a9fd49ad0c7be8a159d0681c0687c86
-  data.tar.gz: b154451a79ee1a106120d3143f0aaacf2e6b42c16499a3fd7b20788a6610759a
+  metadata.gz: 0e48132fe8f049a59c4132004cb1058fd482e63e1125a7547ff1d3bb5fe25bea
+  data.tar.gz: 99b5a0f6bc24d7a6c1a4f35001b7e8c6a17663d6ed091a44cfffc9313b054cf8
 SHA512:
-  metadata.gz: 0dabbafe45db1246735bd1b43e632e6bc4dc92b572bdc910f93db434676ec82a0283b6dd2894a6ac889f68022c856fc07e16f61be0009c4b9893aa491ba776a0
-  data.tar.gz: fc970a3637e85b1277da0dd7cd9c17def39d2fb54eb32db2a33d73c763b4c14c9bede15b7118e1946d37816f8c379c423fa5f15712e37328ffc546ffb62ee5b1
+  metadata.gz: d06f5881545332ed233008e862bafb1af659920b52bcf410cda96ab62aa1f054702a528079221373840a5235e51f4ab3b4e2ab99943838a3d65885a056807f73
+  data.tar.gz: 9d8867071103f6737a5bb907a140d81741429440ca6cdb8400a40f4d36b350a15dfa482b57b5db946dffbc2b2478e5ff0506e12827ccef33b9b3993d066edb34

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devise_sms_confirmable (0.1.16)
+    devise_sms_confirmable (0.1.17)
       devise (>= 4.6.2)
       rails (~> 5.1.4)
       textris (~> 0.7)

data/app/controllers/devise/sms_confirmations_controller.rb

@@ -19,16 +19,24 @@ class Devise::SmsConfirmationsController < DeviseController
     end
   end
 
-  # GET /resource/sms_confirmation?sms_confirmation_token=abcdef
-  def show
-    self.resource = resource_class.sms_confirm_by_token(params[:sms_confirmation_token])
+  # GET /resource/sms_confirmation/edit?phone=abcdef
+  def edit
+    self.resource = resource_class.find_by_phone(confirmation_params[:phone])
+
+    if resource.blank?
+      redirect_to sms_confirmation_path and return
+    end
+  end
+
+  def update
+    self.resource = resource_class.sms_confirm_by_token(confirmation_params[:sms_confirmation_token])
     yield resource if block_given?
 
     if resource.errors.empty?
-      set_flash_message!(:notice, :confirmed)
+      set_flash_message!(:notice, :sms_confirmed)
       respond_with_navigational(resource){ redirect_to after_confirmation_path_for(resource_name, resource) }
     else
-      respond_with_navigational(resource.errors, status: :unprocessable_entity){ render :new }
+      respond_with_navigational(resource.errors, status: :unprocessable_entity){ render :show }
     end
   end
 
@@ -36,7 +44,7 @@ class Devise::SmsConfirmationsController < DeviseController
 
   # The path used after resending confirmation instructions.
   def after_resending_confirmation_instructions_path_for(resource_name)
-    is_navigational_format? ? new_session_path(resource_name) : '/'
+    is_navigational_format? ? sms_confirmation_path(resource_name) : '/'
   end
 
   # The path used after confirmation.

data/lib/devise_sms_confirmable/models/sms_confirmable.rb

@@ -125,10 +125,6 @@ module Devise
         @skip_sms_reconfirmation_in_callback = true
       end
 
-      def devise_texter
-        Devise.texter
-      end
-
       def sms_confirmation_period_valid?
         return true if self.class.allow_sms_unconfirmed_access_for.nil?
         return false if self.class.allow_sms_unconfirmed_access_for == 0.days

data/lib/devise_sms_confirmable/rails/routes.rb

@@ -3,7 +3,7 @@ module ActionDispatch::Routing
     protected
 
     def devise_sms_confirmation(mapping, controllers)
-      resource :sms_confirmation, only: [:new, :create, :show], path: mapping.path_names[:sms_confirmation], controller: controllers[:sms_confirmations]
+      resource :sms_confirmation, only: [:new, :create, :show, :edit, :update], path: mapping.path_names[:sms_confirmation], controller: controllers[:sms_confirmations]
     end
   end
 end

data/lib/devise_sms_confirmable/version.rb

@@ -1,3 +1,3 @@
 module DeviseSmsConfirmable
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_sms_confirmable
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - uuushiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-04 00:00:00.000000000 Z
+date: 2019-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise