devise_phone 0.0.1661 → 0.0.1662

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbe42d3c22685ac7b09bd947b1c2f104851d60a5
-  data.tar.gz: fd6796e5978e541bf11e71db29b23db842be60ba
+  metadata.gz: aea3bed47404803f7cccb39604bfa1b177198381
+  data.tar.gz: 507f7f19fb93b700d03d9b1b5c818f4a9de5b365
 SHA512:
-  metadata.gz: d1f251105637d81644f7d46f32cd461b55c75e92870f0f364c2de210cb837fb5d87b3d717a44c52f580677132443128f8f5027fafc0deba3a5074a6d4ce781de
-  data.tar.gz: 9622833e283c0581371135e7824c2cab59cd9ccb2073ecdb20a875ee8d3977739da131f1ceb7962cd47a0790c1341f790419dfdc5ae998749ed923e3e92e5ff8
+  metadata.gz: 88aa689d5440ed65a222dbb48c9368e8effe606b64253de7f74eb72253fe52c033c8cf8aae75e0bf89c9606384b520ebff069b98300ba3c91fb44d292463772e
+  data.tar.gz: 006cba759729181bb1b1825258acca717def542d5c73f59ea3fe5fdae689f2e006190f533f9687006097e486110a1b51b0f6101ece86be089884b3d236413a74

data/README.rdoc

@@ -27,6 +27,28 @@ 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 secrets.yml, please specify your twilio_sid, twilio_token, and twilio_phone_number:
+
+	development:
+	  secret_key_base: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+	  twilio_sid: xxxxxxxxxxxxxxxxxxxxxxxxxxxx
+	  twilio_token: xxxxxxxxxxxxxxxxxxxxxxxxxxxx
+	  twilio_phone_number: 12345678
+
+	test:
+	  secret_key_base: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+	  twilio_sid: xxxxxxxxxxxxxxxxxxxxxxxxxxxx
+	  twilio_token: xxxxxxxxxxxxxxxxxxxxxxxxxxxx
+	  twilio_phone_number: 12345678
+
+	# Do not keep production secrets in the repository,
+	# instead read values from the environment.
+	production:
+	  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
+	  twilio_sid: <%= ENV["TWILIO_SID"] %>
+	  twilio_token: <%= ENV["TWILIO_TOKEN"] %>
+	  twilio_phone_number: <%= ENV["TWILIO_PHONE_NUMBER"] %>
+
 == 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

@@ -8,51 +8,21 @@ class Devise::PhoneVerificationsController < DeviseController
 
   # POST /resource/phone_verification
   def create
-
-    # self.set_default_phone_attributes_and_send_verification_code
-
-    # self.resource = resource_class.send_verification_code
-    
-    # if resource.errors.empty?
-    #   set_flash_message :notice, :send_token, :phone => self.resource.phone
-    #   redirect_to new_session_path(resource_name)
-    # else
-    #   render :new
-    # end
   end
   
   # GET /resource/phone_verification/insert
   def insert
-    # puts "current_user"
-    # puts current_user
-    # puts "current_user methods"
-    # puts current_user.methods
-    # puts "User.all.first"
-    # puts User.all.first
-    # puts "the same?"
-    # puts User.all.first == current_user
-
-    # User.all.first.generate_verification_code_and_send_sms
-    # puts current_user.methods
     current_user.generate_verification_code_and_send_sms
-    # build_resource({})
+    puts "hey"
+    render nothing: true
   end
   
   # GET or POST /resource/phone_verification/consume?sms_token=abcdef
   def consume
-    
-    # puts current_user.phone_number
     current_user.verify_phone_number_with_code_entered(params[:code_entered])
+    puts "hey2"
 
-    # self.resource = resource_class.verify_phone_number_with_code_entered(params[:code_entered])
-
-    # if resource.errors.empty?
-    #   set_flash_message :notice, :confirmed
-    #   sign_in_and_redirect(resource_name, resource)
-    # else
-    #   render :new
-    # end
-
+    render nothing: true
   end
   
   protected

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

@@ -1,5 +1,3 @@
-<h2>Activate Phone Number</h2>
-
 <%= form_for(resource, :as => resource_name, :url => consume_user_phone_verification_path(resource_name), :html => { :method => :post }, remote: true) do |f| %>
   
   <p><%=label_tag :code_entered %><br />

data/config/locales/en.yml

@@ -1,15 +1,15 @@
 en:
   errors:
      messages:
-       no_phone_associated: "No phone associated"
-       sms_already_confirmed: "This token has been already used"
-       sms_token_invalid: "was not locked"
-  devise:
-    sms_activations:
-      send_token: 'An activation token was sent by SMS to %{phone}.'
-      sms_token_invalid: 'The sms token provided is not valid!'
-      confirmed: 'Your account has been activated. You are now signed in.'
-      sms_activation_required: 'SMS Activation is required'
-      sms_body: 'Your Activation Token is %{sms_confirmation_token}.'
-      unconfirmed_sms: 'Your account need to be activated with an SMS token'
+       empty_phone_number_field: "Phone number field is empty"
+       phone_verification_not_needed: "Phone number is already verified"
+       # sms_token_invalid: "was not locked"
+  # devise:
+  #   sms_activations:
+  #     send_token: 'An activation token was sent by SMS to %{phone}.'
+  #     sms_token_invalid: 'The sms token provided is not valid!'
+  #     confirmed: 'Your account has been activated. You are now signed in.'
+  #     sms_activation_required: 'SMS Activation is required'
+  #     sms_body: 'Your Activation Token is %{sms_confirmation_token}.'
+  #     unconfirmed_sms: 'Your account need to be activated with an SMS token'
       

data/lib/devise_phone.rb

@@ -10,54 +10,6 @@ require 'devise_phone/controllers/helpers'
 require 'devise_phone/rails'
 
 module Devise
-
-  # Get the phone class from the phone reference object.
-  def self.phone
-    @@phone_ref.get
-  end
-
-  # Set the phone reference object to access the phone.
-  def self.phone=(class_name)
-    @@phone_ref = ref(class_name)
-  end
-  self.phone = "Devise::Phone"
-  # mattr_accessor :sms_confirm_within
-  # @@sms_confirm_within = 2.days
-  # mattr_accessor :sms_confirmation_keys
-  # @@sms_confirmation_keys = [:email]
-  # def self.setup
-  #   yield self
-  # end
-
-  # class Getter
-  #   def initialize name
-  #     @name = name
-  #   end
-
-  #   def get
-  #     ActiveSupport::Dependencies.constantize(@name)
-  #   end
-  # end
-
-  # def self.ref(arg)
-  #   if defined?(ActiveSupport::Dependencies::ClassCache)
-  #     ActiveSupport::Dependencies::reference(arg)
-  #     Getter.new(arg)
-  #   else
-  #     ActiveSupport::Dependencies.ref(arg)
-  #   end
-  # end
-  # # Get the sms sender class from the phone reference object.
-  # def self.sms_sender
-  #   @@sms_sender_ref.get
-  # end
-
-  # # Set the smser reference object to access the smser.
-  # def self.sms_sender=(class_name)
-  #   @@phone_ref = ref(class_name)
-  # end
-  
-  # @@sms_sender = "Devise::SmsSender"
 end
 
 Devise.add_module :phone, :model => "models/phone", :controller => :phone_verifications, :route => :phone_verification

data/lib/devise_phone/version.rb

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

data/lib/generators/devise_phone/install_generator.rb

@@ -16,40 +16,11 @@ module DevisePhone
           if old_content.match(Regexp.new(/^\s# ==> Configuration for :phone\n/))
             false
           end
+
         end
-      end
-#           else
-#             inject_into_file(devise_initializer_path, :before => "  # ==> Configuration for :confirmable\n") do
-# <<-CONTENT
-#   # ==> Configuration for :phone
-#   # The period the generated sms token is valid, after
-#   # this period, the user won't be able to activate.
-#   # config.sms_confirm_within = 0.days
 
-#   # The keys searched for confirmation values.
-#   # config.sms_confirmation_keys = [:email]
-  
-#   # Your SmsSender class. The provided one uses 
-#   # moonshado-sms gem so install it and configure
-#   # if you want to use it.
-#   # A simple instance of the class has been copied in your lib folder
-#   # For further informations on using and configuring moonshado-sms gem check
-#   # https://github.com/moonshado/moonshado-sms
-#   # config.sms_sender = "Devise::SmsSender"
-  
-# CONTENT
-      #       end
-      #     end
-      #   end
-      # end
-      
-      # def copy_locale
-      #   copy_file "../../../config/locales/en.yml", "config/locales/devise_phone.en.yml"
-      # end
+      end
       
-      # def copy_default_smser
-      #   copy_file "lib/sms_sender.rb", "lib/devise_sms_sender.rb"
-      # end
     end
   end
 end

data/lib/models/phone.rb

@@ -31,76 +31,62 @@ module Devise
 
       included do
         before_create :set_unverified_phone_attributes, :if => :phone_verification_needed?
-        after_create  :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?
       end
 
-
-
-      # # Confirm a user by setting it's sms_confirmed_at to actual time. If the user
-      # # is already confirmed, add en error to email field
-      # def confirm_sms!
-      #   unless_sms_confirmed do
-      #     self.sms_confirmation_token = nil
-      #     self.sms_confirmed_at = Time.now
-      #     save(:validate => false)
-      #   end
-      # end
-
-      # # Verifies whether a user is sms-confirmed or not
-      # def confirmed_sms?
-      #   !!sms_confirmed_at
-      # end
-
-      # Send confirmation token by sms
       def generate_verification_code_and_send_sms
-        puts "in the public method"
-        if(self.phone_number?)
-          puts "generating code"
-          update!(phone_verification_code: generate_phone_verification_code)
-          send_sms_verification_code
-        else
-          self.errors.add(:phone_verification_code, :no_phone_associated)
-          false
+          if(phone_verification_needed?)
+            private_generate_verification_code_and_send_sms
+          end
+          self.save!
         end
-      end
 
       def verify_phone_number_with_code_entered(code_entered)
-        if (code_entered == self.phone_verification_code)
-          mark_phone_as_verified!
-          true
-        else
-          self.errors.add(:phone_verification_code, :wrong_code_entered)
-          false
+        if phone_verification_needed? && (code_entered == self.phone_verification_code)
+            mark_phone_as_verified!
         end
       end
 
+      private
 
-      # # Resend sms confirmation token. This method does not need to generate a new token.
-      # def resend_sms_token
-      #   unless_sms_confirmed { send_sms_token }
-      # end
-
-      # Overwrites active? from Devise::Models::Activatable for sms confirmation
-      # by verifying whether a user is active to sign in or not. If the user
-      # is already confirmed, it should never be blocked. Otherwise we need to
-      # calculate if the confirm time has not expired for this user.
-
-      # def active?
-      #   !sms_confirmation_required? || confirmed_sms? || confirmation_sms_period_valid?
-      # end
+        # def remember_old_phone_number
+        #   puts "phone number changed?: "
+        #   puts phone_number_changed?
+        #   if phone_number.present?
+        #     puts "Old phone number before save:"
+        #     puts phone_number
+        #     @old_phone_number = phone_number
+        #   else
+        #     @old_phone_number = nil
+        #   end
+        # end
 
-      # # The message to be shown if the account is inactive.
-      # def inactive_message
-      #   !confirmed_sms? ? I18n.t(:"devise.sms_activations.unconfirmed_sms") : super
-      # end
+        # def phone_number_changed?
+        #   puts "Old phone number after save:"
+        #   puts @old_phone_number
+        #   if @old_phone_number.present? && phone_number.present?
+        #     puts "condition 1"
+        #     @old_phone_number != phone_number
+        #   elsif @old_phone_number.blank? && phone_number.present?
+        #     puts "condition 2"
+        #     true
+        #   else
+        #     puts "condition 3"
+        #     set_unverified_phone_attributes
+        #     false
+        #   end
+        # end
 
-      # # If you don't want confirmation to be sent on create, neither a code
-      # # to be generated, call skip_sms_confirmation!
-      # def skip_sms_confirmation!
-      #   self.sms_confirmed_at = Time.now
-      # end
+        def private_generate_verification_code_and_send_sms
+            self.phone_verification_code = generate_phone_verification_code
+            set_unverified_phone_attributes
+            if phone_number.present?
+              send_sms_verification_code
+            end
+        end
 
-      private
 
         def mark_phone_as_verified!
           update!(phone_number_verified: true,
@@ -109,36 +95,44 @@ module Devise
                  phone_verified_at: DateTime.now)
         end
 
-        # Callback to overwrite if an sms confirmation is required or not.
+        # check if phone verification is needed and set errors here
         def phone_verification_needed?
-          phone_number.present? && !phone_number_verified
+          if phone_number.blank?
+            self.errors.add(:phone_verification_code, :empty_phone_number_field)
+            false
+          elsif phone_number_verified
+            self.errors.add(:phone_verification_code, :phone_verification_not_needed)
+            false
+          else
+            true
+          end
         end
 
-        # Generates a new random token for confirmation, and stores the time
-        # this token is being generated
+        # set attributes to user indicating the phone number is unverified
         def set_unverified_phone_attributes
-
           self.phone_number_verified = false
           self.phone_verification_code_sent_at = DateTime.now
           self.phone_verified_at = nil
           # removes all white spaces, hyphens, and parenthesis
-          self.phone_number.gsub!(/[\s\-\(\)]+/, '')
+          if self.phone_number
+            self.phone_number.gsub!(/[\s\-\(\)]+/, '')
+          end
         end
 
+        # return 6 digits random code a-z,0-9
         def generate_phone_verification_code
           verification_code = SecureRandom.hex(3)
           verification_code
         end
 
+        # sends a message to number indicated in the secrets.yml
         def send_sms_verification_code
-            puts "in the private method"
-
             number_to_send_to = self.phone_number
             verification_code = self.phone_verification_code
 
-            twilio_sid = "ACd35391c08cde7926e2295d1812ada918"
-            twilio_token = "44d79a36adb3d54cc15711d94d149119"
-            twilio_phone_number = "6502810746"
+            twilio_sid = Rails.application.secrets.twilio_sid
+            twilio_token = Rails.application.secrets.twilio_token
+            twilio_phone_number = Rails.application.secrets.twilio_phone_number
 
             @twilio_client = Twilio::REST::Client.new twilio_sid, twilio_token
          
@@ -148,56 +142,25 @@ module Devise
               :body => "Hi! This is MathCrunch. Your verification code is #{verification_code}"
             )
         end
+      #end of private methods
 
-      module ClassMethods
+      # module ClassMethods # 'public' methods for class user
 
-        def generate_verification_code_and_send_sms
-          puts "in the public method"
-          if(self.phone_number?)
-            puts "generating code"
-            update!(phone_verification_code: generate_phone_verification_code)
-            send_sms_verification_code
-          else
-            self.errors.add(:phone_verification_code, :no_phone_associated)
-            false
-          end
-        end
+      #   def generate_verification_code_and_send_sms
+      #     if(phone_verification_needed?)
+      #       private_generate_verification_code_and_send_sms
+      #     end
+      #     self.save!
+      #   end
 
-        def verify_phone_number_with_code_entered(code_entered)
-          if (code_entered == self.phone_verification_code)
-            mark_phone_as_verified!
-            true
-          else
-            self.errors.add(:phone_verification_code, :wrong_code_entered)
-            false
-          end
-        end
+      #   def verify_phone_number_with_code_entered(code_entered)
+      #     if phone_verification_needed? && (code_entered == self.phone_verification_code)
+      #         mark_phone_as_verified!
+      #     end
+      #   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)
-        #   end 
+      # end #end of ClassMethods
 
-        #   def verify_phone_number_with_code_entered(code_entered)
-        #     if self.phone_verification_code == code_entered
-        #       mark_phone_as_verified!
-        #     end
-        #   end
-
-        #   def set_unverified_phone_attributes_and_send_verification_code
-        #     self.set_verified_phone_attributes
-        #     if self.save!
-        #       send_sms_for_verification_code
-        #     end
-        #   end
-
-        # end
     end
   end
 end

metadata

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