devise_sms_confirmable 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9b1b6aef5ee7fba9976ad18f1ab390b14f7028645a744125fdbc51e0880ecf0
-  data.tar.gz: 3ae010331a42bfe37a8b4780bf4c254104ba4204e9df48562fd5c80d7a1590e6
+  metadata.gz: 72b5f07bb2a2e7a9dccaa86e40923cff94d908e83cf5cf407561e35569212a2b
+  data.tar.gz: 6dce28e1612e0ca8e5103cd31abb2626cf1c0fab81ff9c14229b0b77be075fe3
 SHA512:
-  metadata.gz: 7cf7ee4aa615ba70651f7c988061dfa81d659ffc922110450d130df28166e1e027058135b7a9b26ee58ced97cf62d86bb7d3a99b7735386ccad1b061393e486b
-  data.tar.gz: 3585582f3148215b494ec276432bf2b5380878fda5ea819689117f7bea260745da867104da3278247e98cf0d0b89b4a60a337e758e4ace9056658a970f21eaad
+  metadata.gz: 0636ba30e347399714ea6f3f46e41b9bed5d9998da85d0f056b62737725c94e578fc593b88721489c394c81fcac8b2189ce7617df349a8258204b89bbdcf81be
+  data.tar.gz: 6ffbab26af4feee5563f21cae1a4998bd95213a86af593bddf495e0aacb115aa1ee1dc9ace1c751e891d9b5694804238f331f37183edbfce0aff7df4705c107e

data/Gemfile.lock

@@ -50,14 +50,14 @@ GEM
     bcrypt (3.1.13)
     builder (3.2.3)
     concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    devise (4.6.2)
+    crass (1.0.5)
+    devise (4.7.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 6.0)
+      railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    erubi (1.8.0)
+    erubi (1.9.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     globalid (0.4.2)
@@ -65,7 +65,7 @@ GEM
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     jwt (2.2.1)
-    loofah (2.2.3)
+    loofah (2.3.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -74,16 +74,16 @@ GEM
     method_source (0.9.2)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.12.2)
     mocha (1.9.0)
       metaclass (~> 0.0.1)
     multipart-post (2.1.1)
     nio4r (2.4.0)
-    nokogiri (1.10.4)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
     phony (2.18.5)
-    rack (2.0.7)
+    rack (2.0.8)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.1.7)
@@ -101,7 +101,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
+    rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
     railties (5.1.7)
       actionpack (= 5.1.7)

data/app/controllers/devise/sms_confirmations_controller.rb

@@ -29,7 +29,7 @@ class Devise::SmsConfirmationsController < DeviseController
   end
 
   def update
-    self.resource = resource_class.sms_confirm_by_token(confirmation_params[:sms_confirmation_token])
+    self.resource = resource_class.sms_confirm_by_token(confirmation_params[:phone], confirmation_params[:sms_confirmation_token])
     yield resource if block_given?
 
     if resource.errors.empty?
@@ -59,4 +59,8 @@ class Devise::SmsConfirmationsController < DeviseController
   def translation_scope
     'devise.sms_confirmations'
   end
+
+  def confirmation_params
+    params.require(resource_name).permit(:phone, :sms_confirmation_token)
+  end
 end

data/devise_sms_confirmable.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "devise", ">= 4.6.2"
-  spec.add_dependency "rails", "~> 5.1.4"
+  spec.add_dependency "rails", ">= 5.1.4"
   spec.add_dependency("textris", "~> 0.7")
 
   spec.add_development_dependency "bundler"

data/lib/devise_sms_confirmable/models/sms_confirmable.rb

@@ -221,11 +221,11 @@ module Devise
           confirmable
         end
 
-        def sms_confirm_by_token(sms_confirmation_token, context: nil)
-          confirmable = find_first_by_auth_conditions(sms_confirmation_token: sms_confirmation_token)
+        def sms_confirm_by_token(phone, sms_confirmation_token, context: nil)
+          confirmable = find_first_by_auth_conditions(phone: phone, sms_confirmation_token: sms_confirmation_token)
           unless confirmable
             confirmation_digest = Devise.token_generator.digest(self, :sms_confirmation_token, sms_confirmation_token)
-            confirmable = find_or_initialize_with_error_by(:sms_confirmation_token, confirmation_digest)
+            confirmable = find_or_initialize_with_errors([:phone, :sms_confirmation_token], { phone: phone, sms_confirmation_token: confirmation_digest }, :invalid)
           end
 
           # TODO: replace above lines with

data/lib/devise_sms_confirmable/version.rb

@@ -1,3 +1,3 @@
 module DeviseSmsConfirmable
-  VERSION = "0.1.21"
+  VERSION = "0.1.22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_sms_confirmable
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - uuushiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2020-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -28,14 +28,14 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.4
 - !ruby/object:Gem::Dependency