devise_phone 0.0.1662 → 0.0.1663

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aea3bed47404803f7cccb39604bfa1b177198381
-  data.tar.gz: 507f7f19fb93b700d03d9b1b5c818f4a9de5b365
+  metadata.gz: aa23d1176a07078e34df9bc26d23abf25f3aadb8
+  data.tar.gz: 810341f073168f9a0eec605c52b491c33adaaa0a
 SHA512:
-  metadata.gz: 88aa689d5440ed65a222dbb48c9368e8effe606b64253de7f74eb72253fe52c033c8cf8aae75e0bf89c9606384b520ebff069b98300ba3c91fb44d292463772e
-  data.tar.gz: 006cba759729181bb1b1825258acca717def542d5c73f59ea3fe5fdae689f2e006190f533f9687006097e486110a1b51b0f6101ece86be089884b3d236413a74
+  metadata.gz: a0ddc5397e5d6f53c93682e028479c83001e75d626806f67a3ea943a476b4ebc67f0476b36cbf057626e4c61a97368b34c3e46184f0cd3a8fcfded3dbff14c3d
+  data.tar.gz: 43a835f4e774d7b1aba4ba499a7d7cb3117d57336e589e839f4145da3ecdb0d437a90bb6f01eaf2b142281f64af83c3ebce578c09bc1ba93e74607f55ad9a54e

data/app/controllers/devise/phone_verifications_controller.rb

@@ -1,28 +1,38 @@
 class Devise::PhoneVerificationsController < DeviseController
 
   # GET /resource/phone_verification/new
-  def new
-    build_resource({})
-    render :new
-  end
+  # def new
+  #   build_resource({})
+  #   render :new
+  # end
 
   # POST /resource/phone_verification
-  def create
-  end
+  # def create
+  # end
   
-  # GET /resource/phone_verification/insert
-  def insert
+  # GET /resource/phone_verification/send_code
+  def send_code
     current_user.generate_verification_code_and_send_sms
-    puts "hey"
-    render nothing: true
+    # render nothing: true
+    respond_to do |format|
+      msg = { :status => "ok", :message => "SMS sent!" }
+      format.json  { render :json => msg } # don't do msg.to_json
+    end
   end
   
-  # GET or POST /resource/phone_verification/consume?sms_token=abcdef
-  def consume
-    current_user.verify_phone_number_with_code_entered(params[:code_entered])
-    puts "hey2"
-
-    render nothing: true
+  # GET or POST /resource/phone_verification/verify_code
+  def verify_code
+    verify_success = current_user.verify_phone_number_with_code_entered(params[:code_entered])
+    # render nothing: true
+    respond_to do |format|
+      if verify_success
+        message_response = "verification successful"
+      else
+        message_response = "verification fail"
+      end
+      msg = { :status => "ok", :message => message_response }
+      format.json  { render :json => msg } # don't do msg.to_json
+    end
   end
   
   protected

data/app/views/devise/phone/_activate_phone.html.erb

@@ -1,4 +1,4 @@
-<%= form_for(resource, :as => resource_name, :url => consume_user_phone_verification_path(resource_name), :html => { :method => :post }, remote: true) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => verify_code_user_phone_verification_path(resource_name), :html => { :method => :post }, remote: true) do |f| %>
   
   <p><%=label_tag :code_entered %><br />
   <%=text_field_tag :code_entered, "" %></p>

data/app/views/devise/phone/_resend_code.html.erb

@@ -1,4 +1,4 @@
-<%= form_for(resource, :as => resource_name, :url => insert_user_phone_verification_path(resource_name), :html => { :method => :get }, remote: true) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => send_code_user_phone_verification_path(resource_name), :html => { :method => :get }, remote: true) do |f| %>
   <%= devise_error_messages! %>
 
   <%= f.submit "Resend Phone Verification Code" %>

data/lib/devise_phone/routes.rb

@@ -4,8 +4,8 @@ module ActionDispatch::Routing
     protected
       def devise_phone_verification(mapping, controllers)
         resource :phone_verification, :only => [:new, :create], :path => mapping.path_names[:phone_verification], :controller => controllers[:phone_verifications] do
-          post :consume, :path => mapping.path_names[:consume], :as => :consume
-          get :insert, :path => mapping.path_names[:insert], :as => :insert
+          post :verify_code, :path => mapping.path_names[:verify_code], :as => :verify_code
+          get :send_code, :path => mapping.path_names[:send_code], :as => :send_code
         end
       end
 

data/lib/devise_phone/version.rb

@@ -1,3 +1,3 @@
 module DevisePhone
-  VERSION = "0.0.1662".freeze
+  VERSION = "0.0.1663".freeze
 end

data/lib/models/phone.rb

@@ -31,9 +31,9 @@ module Devise
 
       included do
         before_create :set_unverified_phone_attributes, :if => :phone_verification_needed?
-        after_create  :private_generate_verification_code_and_send_sms, :if => :phone_verification_needed?
+        # after_create  :private_generate_verification_code_and_send_sms, :if => :phone_verification_needed?
         # before_save  :remember_old_phone_number
-        before_save  :private_generate_verification_code_and_send_sms, :if => :phone_number_changed?
+        after_save  :private_generate_verification_code_and_send_sms, :if => :regenerate_phone_verification_needed?
       end
 
       def generate_verification_code_and_send_sms
@@ -45,7 +45,10 @@ module Devise
 
       def verify_phone_number_with_code_entered(code_entered)
         if phone_verification_needed? && (code_entered == self.phone_verification_code)
-            mark_phone_as_verified!
+          mark_phone_as_verified!
+          true
+        else
+          false
         end
       end
 
@@ -108,6 +111,23 @@ module Devise
           end
         end
 
+        def regenerate_phone_verification_needed?
+          if phone_number.present?
+            if phone_number_changed?
+              # puts "condition 1"
+              true
+            else
+              # puts "condition 2"
+              false
+            end
+            # self.errors.add(:phone_verification_code, :empty_phone_number_field)
+            # false
+          else
+              # puts "condition 3"
+            false
+          end
+        end
+
         # set attributes to user indicating the phone number is unverified
         def set_unverified_phone_attributes
           self.phone_number_verified = false
@@ -130,13 +150,13 @@ module Devise
             number_to_send_to = self.phone_number
             verification_code = self.phone_verification_code
 
-            twilio_sid = Rails.application.secrets.twilio_sid
-            twilio_token = Rails.application.secrets.twilio_token
-            twilio_phone_number = Rails.application.secrets.twilio_phone_number
+            twilio_sid = Rails.application.config.twilio[:sid]
+            twilio_token = Rails.application.config.twilio[:token]
+            twilio_phone_number = Rails.application.config.twilio[:phone_number]
 
             @twilio_client = Twilio::REST::Client.new twilio_sid, twilio_token
          
-            @twilio_client.account.sms.messages.create(
+            @twilio_client.account.messages.create(
               :from => "+1#{twilio_phone_number}",
               :to => number_to_send_to,
               :body => "Hi! This is MathCrunch. Your verification code is #{verification_code}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_phone
 version: !ruby/object:Gem::Version
-  version: 0.0.1662
+  version: 0.0.1663
 platform: ruby
 authors:
 - Hubert Theodore
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler