devise_phone 0.0.1667 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c176b0ae9dd33d8529a09c7f6285450068286b23
-  data.tar.gz: 08739ec130d4aec423abc3156c2a358f5e462cf3
+  metadata.gz: 61c65710b5aad79d543060e435f11260bd150c8f
+  data.tar.gz: c98c335e7d5eb587f60afb86555ad5394081b993
 SHA512:
-  metadata.gz: dba66214746d0b4e0dff898fa2618265593e556a4eb427a41c7eb1c5d82607dcf9697d426522caf85487575cfda97ef3fed5d1f379f1398b61bddc2b2e931d25
-  data.tar.gz: e80d5a8319edcbd207389c8cce248ac20261a454e1084bea047ebdf4dbd55c306f7353ef0c0ff38c8cc1c038cc92a91e07979a60a5d344d4e974100ff6103b1f
+  metadata.gz: ca18ab1f037adda6f1d5c38bce90bc0bdd423a8006256c8b826553c26e3b19c3b7d963d52a0f787edea818bc07f15c3e6b667930adf4777f1bfce909d837d6ef
+  data.tar.gz: b60f0b555fdc1cbdfb9bd5fb6646495ae1cb6dee3ceecabbd236d0b57bb77d1371ab75ea42bc8daedd01df509c08cb0fe0e3c715bf552b4333d026cb47eb3e7b

data/README.rdoc

@@ -27,15 +27,21 @@ When you are done, you are ready to add DevisePhone to any of your Devise models
 
 Replace MODEL by the class name you want to add DevisePhone, like User, Admin, etc. This will add the :phone flag to your model's Devise modules. The generator will also create a migration file (if your ORM support them). Continue reading this file to understand exactly what the generator produces and how to use it.
 
-In your config/environments, please specify your twilio_sid, twilio_token, and twilio_phone_number, and twilio_message_body (use #{verification_code} to include the phone verification code of the user) :
+In your config/environments, please specify your twilio_sid, twilio_token, and twilio_phone_number:
 
-	dconfig.twilio = {
+	config.twilio = {
     sid:          'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
     token:        'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
     phone_number: '123455678',
-    message_body: "Hi! This is from company u asked for. Your verification code is #{verification_code}"
   }
 
+To specify the message body, in devise.en.yml add:
+
+en:
+	devise:
+		phone:
+		      message_body: "Hi! This is Company Name. Your verification code is %{verification_code}."
+
 == Configuring views
 
 All the views are packaged inside the gem. If you'd like to customize the views, invoke the following generator and it will copy all the views to your application:

data/app/controllers/devise/phone_verifications_controller.rb

@@ -1,5 +1,7 @@
 class Devise::PhoneVerificationsController < DeviseController
 
+  before_action :authenticate_user!
+
   # GET /resource/phone_verification/new
   # def new
   #   build_resource({})
@@ -12,27 +14,30 @@ class Devise::PhoneVerificationsController < DeviseController
   
   # GET /resource/phone_verification/send_code
   def send_code
-    current_user.generate_verification_code_and_send_sms
-    # 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
+    current_user.generate_verification_code_and_send_sms(phone_number_params[:phone_number])
+    
+    render nothing: true
+    # respond_to do |format|
+    #   msg = { :status => "ok", :message => "SMS sent!" }
+    #   format.json  { render :json => msg } # don't do msg.to_json
+    #   format.html { render nothing: true }
+    # end
   end
   
   # 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
+    verify_success = current_user.verify_phone_number_with_code_entered(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
+    #   format.html { render nothing: true }
+    # end
   end
   
   protected
@@ -41,4 +46,14 @@ class Devise::PhoneVerificationsController < DeviseController
       self.resource = resource_class.new
     end
 
+
+  private
+    def phone_number_params
+      params.permit(:phone_number)
+    end
+
+    def code_entered_params
+      params.permit(:code_entered)
+    end
+
 end

data/lib/devise_phone.rb

@@ -3,7 +3,7 @@ require "twilio-ruby"
 
 $: << File.expand_path("..", __FILE__)
 
-require "devise_phone/routes"
+# require "devise_phone/routes"
 require "devise_phone/schema"
 require 'devise_phone/controllers/url_helpers'
 require 'devise_phone/controllers/helpers'

data/lib/devise_phone/routes.rb

@@ -2,12 +2,12 @@ module ActionDispatch::Routing
   class Mapper
     
     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 :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
+      # def devise_phone_verification(mapping, controllers)
+      #   resource :phone_verification, :only => [:new, :create], :path => mapping.path_names[:phone_verification], :controller => controllers[:phone_verifications] do
+      #     post :verify_code, :path => mapping.path_names[:verify_code], :as => :verify_code
+      #     post :send_code, :path => mapping.path_names[:send_code], :as => :send_code
+      #   end
+      # end
 
   end
 end

data/lib/devise_phone/version.rb

@@ -1,3 +1,3 @@
 module DevisePhone
-  VERSION = "0.0.1667".freeze
+  VERSION = "0.1.0".freeze
 end

data/lib/models/phone.rb

@@ -5,23 +5,23 @@ module Devise
     module Phone
       extend ActiveSupport::Concern
 
-      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?
-        # before_save  :remember_old_phone_number
-        after_save  :private_generate_verification_code_and_send_sms, :if => :regenerate_phone_verification_needed?
-      end
-
-      def generate_verification_code_and_send_sms
+      # 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?
+      #   # before_save  :remember_old_phone_number
+      #   after_save  :private_generate_verification_code_and_send_sms, :if => :regenerate_phone_verification_needed?
+      # end
+
+      def generate_verification_code_and_send_sms(phone_number)
           if(phone_verification_needed?)
-            private_generate_verification_code_and_send_sms
+            private_generate_verification_code_and_send_sms(phone_number)
           end
-          self.save!
+          # self.save!
         end
 
       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
@@ -30,28 +30,29 @@ module Devise
 
       private
 
-        def private_generate_verification_code_and_send_sms
+        def private_generate_verification_code_and_send_sms(phone_number)
             self.phone_verification_code = generate_phone_verification_code
             set_unverified_phone_attributes
-            if phone_number.present?
-              send_sms_verification_code
-            end
+            # if phone_number.present?
+            send_sms_verification_code(phone_number)
+            # end
         end
 
 
-        def mark_phone_as_verified!
-          update!(phone_number_verified: true,
-                 phone_verification_code: nil,
-                 phone_verification_code_sent_at: nil,
-                 phone_verified_at: DateTime.now)
+        def mark_phone_as_verified
+          self.phone_number_verified = true
+          self.phone_verification_code = nil
+          self.phone_verification_code_sent_at = nil
+          self.phone_verified_at = DateTime.now
         end
 
         # check if phone verification is needed and set errors here
         def phone_verification_needed?
-          if phone_number.blank?
-            self.errors.add(:phone_verification_code, :empty_phone_number_field)
-            false
-          elsif phone_number_verified
+          # if phone_number.blank?
+          #   self.errors.add(:phone_verification_code, :empty_phone_number_field)
+          #   false
+          # els
+          if phone_number_verified
             self.errors.add(:phone_verification_code, :phone_verification_not_needed)
             false
           else
@@ -79,20 +80,20 @@ module Devise
           self.phone_verification_code_sent_at = DateTime.now
           self.phone_verified_at = nil
           # removes all white spaces, hyphens, and parenthesis
-          if self.phone_number
-            self.phone_number.gsub!(/[\s\-\(\)]+/, '')
-          end
+          # if self.phone_number
+          #   self.phone_number.gsub!(/[\s\-\(\)]+/, '')
+          # end
         end
 
-        # return 6 digits random code a-z,0-9
+        # return 4 digits random code 0-9
         def generate_phone_verification_code
-          verification_code = SecureRandom.hex(3)
+          verification_code = SecureRandom.random_number(10 ** 4).to_s.rjust(4,'0')
           verification_code
         end
 
         # sends a message to number indicated in the secrets.yml
-        def send_sms_verification_code
-            number_to_send_to = self.phone_number
+        def send_sms_verification_code(phone_number)
+            number_to_send_to = phone_number.gsub!(/[\s\-\(\)]+/, '')
             verification_code = self.phone_verification_code
 
             twilio_sid = Rails.application.config.twilio[:sid]

metadata

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