devise_phone 0.1.21 → 0.1.22
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/devise_phone/version.rb +1 -1
- data/lib/models/phone.rb +19 -14
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 14aabaac1ca4b621f9186e3811892746c71f5acf
|
|
4
|
+
data.tar.gz: e87f788f3f1d679587b8c43cbf7e5fc05c1a92be
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ab7243a9a5099e5b7d4da96a21a7c6515f47921539fb468944f6562d9fd54170d60786db888f1c4e5c99a104a481444a3be40a59cea077f638f821a71b6ffa7e
|
|
7
|
+
data.tar.gz: 4c60fe6efd94a3abc1cdac88d89f80a94022e65f4f973968266dc71668bbc75578e1a70d1cb109e507ccd25bc736df4a82d12fd7a36abfaa3e212f9d6219d743
|
data/lib/devise_phone/version.rb
CHANGED
data/lib/models/phone.rb
CHANGED
|
@@ -9,22 +9,28 @@ module Devise
|
|
|
9
9
|
# before_create :set_unverified_phone_attributes, :if => :phone_verification_needed?
|
|
10
10
|
# after_create :private_generate_verification_code_and_send_sms, :if => :phone_verification_needed?
|
|
11
11
|
# before_save :remember_old_phone_number
|
|
12
|
-
|
|
12
|
+
before_save :set_unverified_phone_attributes, :if => :regenerate_phone_verification_needed?
|
|
13
13
|
end
|
|
14
14
|
|
|
15
15
|
def generate_verification_code_and_send_sms(phone_number)
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
#
|
|
16
|
+
if(phone_verification_needed?)
|
|
17
|
+
private_generate_verification_code_and_send_sms(phone_number)
|
|
18
|
+
else
|
|
19
|
+
"Phone number #{phone_number} is already verified"
|
|
20
20
|
end
|
|
21
|
+
# self.save!
|
|
22
|
+
end
|
|
21
23
|
|
|
22
24
|
def verify_phone_number_with_code_entered(code_entered)
|
|
23
|
-
if phone_verification_needed?
|
|
24
|
-
|
|
25
|
-
|
|
25
|
+
if phone_verification_needed?
|
|
26
|
+
if code_entered == self.phone_verification_code
|
|
27
|
+
mark_phone_as_verified
|
|
28
|
+
nil
|
|
29
|
+
else
|
|
30
|
+
"Code entered does not match phone verification code in the database"
|
|
31
|
+
end
|
|
26
32
|
else
|
|
27
|
-
|
|
33
|
+
"Phone number #{self.phone_number} is already verified"
|
|
28
34
|
end
|
|
29
35
|
end
|
|
30
36
|
|
|
@@ -48,12 +54,7 @@ module Devise
|
|
|
48
54
|
|
|
49
55
|
# check if phone verification is needed and set errors here
|
|
50
56
|
def phone_verification_needed?
|
|
51
|
-
# if phone_number.blank?
|
|
52
|
-
# self.errors.add(:phone_verification_code, :empty_phone_number_field)
|
|
53
|
-
# false
|
|
54
|
-
# els
|
|
55
57
|
if phone_number_verified
|
|
56
|
-
self.errors.add(:phone_verification_code, :phone_verification_not_needed)
|
|
57
58
|
false
|
|
58
59
|
else
|
|
59
60
|
true
|
|
@@ -63,19 +64,23 @@ module Devise
|
|
|
63
64
|
def regenerate_phone_verification_needed?
|
|
64
65
|
if phone_number.present?
|
|
65
66
|
if phone_number_changed?
|
|
67
|
+
puts "yes regenerate phone code"
|
|
66
68
|
true
|
|
67
69
|
else
|
|
70
|
+
puts "no regenerate phone code"
|
|
68
71
|
false
|
|
69
72
|
end
|
|
70
73
|
# self.errors.add(:phone_verification_code, :empty_phone_number_field)
|
|
71
74
|
# false
|
|
72
75
|
else
|
|
76
|
+
puts "noo regenerate phone code"
|
|
73
77
|
false
|
|
74
78
|
end
|
|
75
79
|
end
|
|
76
80
|
|
|
77
81
|
# set attributes to user indicating the phone number is unverified
|
|
78
82
|
def set_unverified_phone_attributes
|
|
83
|
+
puts "setting phone unverified"
|
|
79
84
|
self.phone_number_verified = false
|
|
80
85
|
self.phone_verification_code_sent_at = DateTime.now
|
|
81
86
|
self.phone_verified_at = nil
|