token_authenticate_me 0.11.0 → 0.11.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/token_authenticate_me/concerns/controllers/password_resetable.rb +11 -3
- data/lib/token_authenticate_me/concerns/models/authenticatable.rb +4 -1
- data/lib/token_authenticate_me/version.rb +1 -1
- metadata +4 -7
- data/lib/token_authenticate_me/concerns/controllers/invitable.rb +0 -59
- data/test/dummy/log/test.log +0 -0
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3a2d1a6eda810005e325bccf3dd7248b322eb645
|
|
4
|
+
data.tar.gz: bdadf94301d0a01741244a7727386c02e1baa1f6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2f264c7d7d3984bda2a6a0e99b05c52bc71c65a905d3b8f54de4c825ff9ce56b3986e9ce1909605d1b5127b14caa613009ac8fb960597a4578c5e7c1c0d8501f
|
|
7
|
+
data.tar.gz: ff12edb3373f71d45053785edaadd352b546a380fa55e3f6c7bf2002b84df41901044db4523f9db7b931fbbfc0b1b5d55db185eb7b28947325534c889109fb66
|
|
@@ -16,7 +16,7 @@ module TokenAuthenticateMe
|
|
|
16
16
|
|
|
17
17
|
# Send reset token to user with e-mail address
|
|
18
18
|
def create
|
|
19
|
-
@user = User.
|
|
19
|
+
@user = User.find_by(find_by_hash)
|
|
20
20
|
|
|
21
21
|
if (/@/ =~ params[:email]) == nil
|
|
22
22
|
render status: 422, json: { errors: { email: ['The email address is invalid'] } }
|
|
@@ -48,20 +48,28 @@ module TokenAuthenticateMe
|
|
|
48
48
|
|
|
49
49
|
private
|
|
50
50
|
|
|
51
|
+
def find_by_hash
|
|
52
|
+
{ email: email }
|
|
53
|
+
end
|
|
54
|
+
|
|
55
|
+
def email
|
|
56
|
+
params[:email].blank? ? '' : params[:email].downcase
|
|
57
|
+
end
|
|
58
|
+
|
|
51
59
|
def send_valid_reset_email(user)
|
|
52
60
|
user.create_reset_token!
|
|
53
61
|
|
|
54
62
|
TokenAuthenticateMeMailer.valid_user_reset_password_email(
|
|
55
63
|
request.base_url,
|
|
56
64
|
user
|
|
57
|
-
).
|
|
65
|
+
).deliver_later
|
|
58
66
|
end
|
|
59
67
|
|
|
60
68
|
def send_invalid_reset_email(email)
|
|
61
69
|
TokenAuthenticateMeMailer.invalid_user_reset_password_email(
|
|
62
70
|
request.base_url,
|
|
63
71
|
email
|
|
64
|
-
).
|
|
72
|
+
).deliver_later
|
|
65
73
|
end
|
|
66
74
|
|
|
67
75
|
def session_params
|
|
@@ -42,7 +42,10 @@ module TokenAuthenticateMe
|
|
|
42
42
|
|
|
43
43
|
validates(
|
|
44
44
|
:username,
|
|
45
|
-
format: {
|
|
45
|
+
format: {
|
|
46
|
+
with: /\A[a-zA-Z0-9]+\Z/,
|
|
47
|
+
message: 'only alphanumeric characters are allowed'
|
|
48
|
+
},
|
|
46
49
|
unless: :ignore_username_format_validation?
|
|
47
50
|
)
|
|
48
51
|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: token_authenticate_me
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.11.
|
|
4
|
+
version: 0.11.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sam Clopton
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2018-11-
|
|
12
|
+
date: 2018-11-26 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: rails
|
|
@@ -17,14 +17,14 @@ dependencies:
|
|
|
17
17
|
requirements:
|
|
18
18
|
- - ">="
|
|
19
19
|
- !ruby/object:Gem::Version
|
|
20
|
-
version: '
|
|
20
|
+
version: '5.0'
|
|
21
21
|
type: :runtime
|
|
22
22
|
prerelease: false
|
|
23
23
|
version_requirements: !ruby/object:Gem::Requirement
|
|
24
24
|
requirements:
|
|
25
25
|
- - ">="
|
|
26
26
|
- !ruby/object:Gem::Version
|
|
27
|
-
version: '
|
|
27
|
+
version: '5.0'
|
|
28
28
|
- !ruby/object:Gem::Dependency
|
|
29
29
|
name: api_me
|
|
30
30
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -107,7 +107,6 @@ files:
|
|
|
107
107
|
- lib/token_authenticate_me.rb
|
|
108
108
|
- lib/token_authenticate_me/authentication.rb
|
|
109
109
|
- lib/token_authenticate_me/concerns/controllers/authenticateable.rb
|
|
110
|
-
- lib/token_authenticate_me/concerns/controllers/invitable.rb
|
|
111
110
|
- lib/token_authenticate_me/concerns/controllers/password_resetable.rb
|
|
112
111
|
- lib/token_authenticate_me/concerns/controllers/session_authenticateable.rb
|
|
113
112
|
- lib/token_authenticate_me/concerns/controllers/session_sessionable.rb
|
|
@@ -154,7 +153,6 @@ files:
|
|
|
154
153
|
- test/dummy/config/locales/en.yml
|
|
155
154
|
- test/dummy/config/routes.rb
|
|
156
155
|
- test/dummy/config/secrets.yml
|
|
157
|
-
- test/dummy/log/test.log
|
|
158
156
|
- test/dummy/public/404.html
|
|
159
157
|
- test/dummy/public/422.html
|
|
160
158
|
- test/dummy/public/500.html
|
|
@@ -221,7 +219,6 @@ test_files:
|
|
|
221
219
|
- test/dummy/config/routes.rb
|
|
222
220
|
- test/dummy/config/secrets.yml
|
|
223
221
|
- test/dummy/config.ru
|
|
224
|
-
- test/dummy/log/test.log
|
|
225
222
|
- test/dummy/public/404.html
|
|
226
223
|
- test/dummy/public/422.html
|
|
227
224
|
- test/dummy/public/500.html
|
|
@@ -1,59 +0,0 @@
|
|
|
1
|
-
require 'api_me'
|
|
2
|
-
|
|
3
|
-
module TokenAuthenticateMe
|
|
4
|
-
module Concerns
|
|
5
|
-
module Controllers
|
|
6
|
-
module Invitable
|
|
7
|
-
extend ActiveSupport::Concern
|
|
8
|
-
|
|
9
|
-
include TokenAuthenticateMe::Concerns::Controllers::TokenAuthenticateable
|
|
10
|
-
include ApiMe
|
|
11
|
-
|
|
12
|
-
included do |_base|
|
|
13
|
-
skip_before_action :authenticate, only: [:show]
|
|
14
|
-
|
|
15
|
-
def create
|
|
16
|
-
@object = model_klass.new(object_params)
|
|
17
|
-
authorize @object
|
|
18
|
-
@object.save!(object_params)
|
|
19
|
-
|
|
20
|
-
TokenAuthenticateMeMailer.invite_email(
|
|
21
|
-
@objec5,
|
|
22
|
-
request.base_url
|
|
23
|
-
).deliver_later
|
|
24
|
-
render status: 201, json: @object, serializer: serializer_klass
|
|
25
|
-
rescue ActiveRecord::RecordInvalid => e
|
|
26
|
-
handle_errors(e)
|
|
27
|
-
end
|
|
28
|
-
|
|
29
|
-
def accept
|
|
30
|
-
@object = model_klass.find(params[:id])
|
|
31
|
-
|
|
32
|
-
if @object.accepted.nil?
|
|
33
|
-
ActiveRecord::Base.transaction do
|
|
34
|
-
@object.accept!(current_user)
|
|
35
|
-
@object.update!(accepted: true)
|
|
36
|
-
end
|
|
37
|
-
|
|
38
|
-
head 204 # rails 5.2 styntax that renders a 204 status and no body
|
|
39
|
-
else
|
|
40
|
-
render json: { message: 'The request has already been processed' }, status: 422
|
|
41
|
-
end
|
|
42
|
-
end
|
|
43
|
-
|
|
44
|
-
def decline
|
|
45
|
-
@object = model_klass.find(params[:id])
|
|
46
|
-
|
|
47
|
-
if @object.accepted.nil?
|
|
48
|
-
@object.update!(accepted: false)
|
|
49
|
-
|
|
50
|
-
head 204 # rails 5.2 styntax that renders a 204 status and no body
|
|
51
|
-
else
|
|
52
|
-
render json: { message: 'The request has already been processed' }, status: 422
|
|
53
|
-
end
|
|
54
|
-
end
|
|
55
|
-
end
|
|
56
|
-
end
|
|
57
|
-
end
|
|
58
|
-
end
|
|
59
|
-
end
|
data/test/dummy/log/test.log
DELETED
|
File without changes
|