devise_token_auth 0.1.28.beta6 → 0.1.28.beta7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +75 -20
- data/app/controllers/devise_token_auth/application_controller.rb +12 -0
- data/app/controllers/devise_token_auth/auth_controller.rb +1 -2
- data/app/controllers/devise_token_auth/concerns/set_user_by_token.rb +26 -10
- data/app/controllers/devise_token_auth/confirmations_controller.rb +1 -3
- data/app/controllers/devise_token_auth/passwords_controller.rb +11 -15
- data/app/controllers/devise_token_auth/registrations_controller.rb +16 -14
- data/app/controllers/devise_token_auth/sessions_controller.rb +2 -6
- data/app/models/devise_token_auth/concerns/user.rb +49 -1
- data/app/views/devise/mailer/confirmation_instructions.html.erb +1 -1
- data/app/views/devise/mailer/reset_password_instructions.html.erb +1 -1
- data/config/initializers/devise.rb +9 -0
- data/lib/devise_token_auth.rb +2 -0
- data/lib/devise_token_auth/controllers/helpers.rb +129 -0
- data/lib/devise_token_auth/controllers/url_helpers.rb +8 -0
- data/lib/devise_token_auth/engine.rb +4 -0
- data/lib/devise_token_auth/version.rb +1 -1
- data/test/controllers/demo_group_controller_test.rb +126 -0
- data/test/controllers/{demo_controller_test.rb → demo_mang_controller_test.rb} +32 -59
- data/test/controllers/demo_user_controller_test.rb +262 -0
- data/test/controllers/devise_token_auth/auth_controller_test.rb +1 -1
- data/test/controllers/devise_token_auth/confirmations_controller_test.rb +19 -6
- data/test/controllers/devise_token_auth/passwords_controller_test.rb +35 -7
- data/test/controllers/devise_token_auth/registrations_controller_test.rb +61 -8
- data/test/dummy/app/controllers/demo_group_controller.rb +13 -0
- data/test/dummy/app/controllers/demo_mang_controller.rb +12 -0
- data/test/dummy/app/controllers/demo_user_controller.rb +12 -0
- data/test/dummy/config/routes.rb +6 -5
- data/test/dummy/db/development.sqlite3 +0 -0
- data/test/dummy/db/migrate/20140916224624_add_favorite_color_to_mangs.rb +5 -0
- data/test/dummy/db/schema.rb +2 -3
- data/test/dummy/db/test.sqlite3 +0 -0
- data/test/dummy/log/development.log +3977 -0
- data/test/dummy/log/test.log +165539 -0
- data/test/dummy/tmp/generators/app/controllers/application_controller.rb +8 -0
- data/test/dummy/tmp/generators/app/models/user.rb +0 -4
- data/test/dummy/tmp/generators/db/migrate/{20140916215707_devise_token_auth_create_users.rb → 20140922164332_devise_token_auth_create_users.rb} +0 -0
- data/test/lib/generators/devise_token_auth/install_generator_test.rb +2 -2
- data/test/models/user_test.rb +0 -12
- data/test/test_helper.rb +9 -9
- metadata +22 -8
- data/test/dummy/app/controllers/demo_controller.rb +0 -16
File without changes
|
@@ -112,7 +112,7 @@ end
|
|
112
112
|
|
113
113
|
describe 'subsequent models' do
|
114
114
|
before do
|
115
|
-
run_generator %w(Mang /
|
115
|
+
run_generator %w(Mang /mangs)
|
116
116
|
end
|
117
117
|
|
118
118
|
test 'migration is created' do
|
@@ -121,7 +121,7 @@ end
|
|
121
121
|
|
122
122
|
test 'route method is appended to routes file' do
|
123
123
|
assert_file 'config/routes.rb' do |routes|
|
124
|
-
assert_match(/mount_devise_token_auth_for 'Mang', at: '\/
|
124
|
+
assert_match(/mount_devise_token_auth_for 'Mang', at: '\/mangs'/, routes)
|
125
125
|
end
|
126
126
|
end
|
127
127
|
|
data/test/models/user_test.rb
CHANGED
@@ -20,21 +20,10 @@ class UserTest < ActiveSupport::TestCase
|
|
20
20
|
@user.provider = 'email'
|
21
21
|
@user.password = @password
|
22
22
|
@user.password_confirmation = @password
|
23
|
-
@user.confirm_success_url = @success_url
|
24
23
|
|
25
24
|
refute @user.save
|
26
25
|
assert @user.errors.messages[:email]
|
27
26
|
end
|
28
|
-
|
29
|
-
test 'model should not save if confirm_success_url is not provided' do
|
30
|
-
@user.provider = 'email'
|
31
|
-
@user.email = @email
|
32
|
-
@user.password = @password
|
33
|
-
@user.password_confirmation = @password
|
34
|
-
|
35
|
-
refute @user.save
|
36
|
-
assert @user.errors.messages[:confirm_success_url]
|
37
|
-
end
|
38
27
|
end
|
39
28
|
|
40
29
|
describe 'oauth2 authentication' do
|
@@ -42,7 +31,6 @@ class UserTest < ActiveSupport::TestCase
|
|
42
31
|
@user.provider = 'facebook'
|
43
32
|
@user.password = @password
|
44
33
|
@user.password_confirmation = @password
|
45
|
-
@user.confirm_success_url = @success_url
|
46
34
|
|
47
35
|
assert @user.save
|
48
36
|
refute @user.errors.messages[:email]
|
data/test/test_helper.rb
CHANGED
@@ -38,15 +38,6 @@ class ActiveSupport::TestCase
|
|
38
38
|
fixtures :all
|
39
39
|
|
40
40
|
# Add more helper methods to be used by all tests here...
|
41
|
-
end
|
42
|
-
|
43
|
-
class ActionController::TestCase
|
44
|
-
include Devise::TestHelpers
|
45
|
-
|
46
|
-
setup do
|
47
|
-
@routes = Dummy::Application.routes
|
48
|
-
@request.env['devise.mapping'] = Devise.mappings[:user]
|
49
|
-
end
|
50
41
|
|
51
42
|
def age_token(user, client_id)
|
52
43
|
user.tokens[client_id]['updated_at'] = Time.now - (DeviseTokenAuth.batch_request_buffer_throttle + 10.seconds)
|
@@ -58,3 +49,12 @@ class ActionController::TestCase
|
|
58
49
|
user.save
|
59
50
|
end
|
60
51
|
end
|
52
|
+
|
53
|
+
class ActionController::TestCase
|
54
|
+
include Devise::TestHelpers
|
55
|
+
|
56
|
+
setup do
|
57
|
+
@routes = Dummy::Application.routes
|
58
|
+
@request.env['devise.mapping'] = Devise.mappings[:user]
|
59
|
+
end
|
60
|
+
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: devise_token_auth
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.28.
|
4
|
+
version: 0.1.28.beta7
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Lynn Hurley
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-09-
|
11
|
+
date: 2014-09-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -108,6 +108,8 @@ files:
|
|
108
108
|
- config/locales/devise.en.yml
|
109
109
|
- config/routes.rb
|
110
110
|
- lib/devise_token_auth.rb
|
111
|
+
- lib/devise_token_auth/controllers/helpers.rb
|
112
|
+
- lib/devise_token_auth/controllers/url_helpers.rb
|
111
113
|
- lib/devise_token_auth/engine.rb
|
112
114
|
- lib/devise_token_auth/rails/routes.rb
|
113
115
|
- lib/devise_token_auth/version.rb
|
@@ -117,7 +119,9 @@ files:
|
|
117
119
|
- lib/generators/devise_token_auth/templates/devise_token_auth_create_users.rb.erb
|
118
120
|
- lib/generators/devise_token_auth/templates/user.rb
|
119
121
|
- lib/tasks/devise_token_auth_tasks.rake
|
120
|
-
- test/controllers/
|
122
|
+
- test/controllers/demo_group_controller_test.rb
|
123
|
+
- test/controllers/demo_mang_controller_test.rb
|
124
|
+
- test/controllers/demo_user_controller_test.rb
|
121
125
|
- test/controllers/devise_token_auth/auth_controller_test.rb
|
122
126
|
- test/controllers/devise_token_auth/confirmations_controller_test.rb
|
123
127
|
- test/controllers/devise_token_auth/passwords_controller_test.rb
|
@@ -130,7 +134,9 @@ files:
|
|
130
134
|
- test/dummy/app/assets/javascripts/application.js
|
131
135
|
- test/dummy/app/assets/stylesheets/application.css
|
132
136
|
- test/dummy/app/controllers/application_controller.rb
|
133
|
-
- test/dummy/app/controllers/
|
137
|
+
- test/dummy/app/controllers/demo_group_controller.rb
|
138
|
+
- test/dummy/app/controllers/demo_mang_controller.rb
|
139
|
+
- test/dummy/app/controllers/demo_user_controller.rb
|
134
140
|
- test/dummy/app/helpers/application_helper.rb
|
135
141
|
- test/dummy/app/models/mang.rb
|
136
142
|
- test/dummy/app/models/user.rb
|
@@ -167,6 +173,7 @@ files:
|
|
167
173
|
- test/dummy/db/migrate/20140715061447_devise_token_auth_create_users.rb
|
168
174
|
- test/dummy/db/migrate/20140715061805_devise_token_auth_create_mangs.rb
|
169
175
|
- test/dummy/db/migrate/20140829044006_add_operating_thetan_to_user.rb
|
176
|
+
- test/dummy/db/migrate/20140916224624_add_favorite_color_to_mangs.rb
|
170
177
|
- test/dummy/db/schema.rb
|
171
178
|
- test/dummy/db/test.sqlite3
|
172
179
|
- test/dummy/log/development.log
|
@@ -175,9 +182,10 @@ files:
|
|
175
182
|
- test/dummy/public/422.html
|
176
183
|
- test/dummy/public/500.html
|
177
184
|
- test/dummy/public/favicon.ico
|
185
|
+
- test/dummy/tmp/generators/app/controllers/application_controller.rb
|
178
186
|
- test/dummy/tmp/generators/app/models/user.rb
|
179
187
|
- test/dummy/tmp/generators/config/initializers/devise_token_auth.rb
|
180
|
-
- test/dummy/tmp/generators/db/migrate/
|
188
|
+
- test/dummy/tmp/generators/db/migrate/20140922164332_devise_token_auth_create_users.rb
|
181
189
|
- test/dummy/tmp/restart.txt
|
182
190
|
- test/fixtures/mangs.yml
|
183
191
|
- test/fixtures/users.yml
|
@@ -210,7 +218,9 @@ signing_key:
|
|
210
218
|
specification_version: 4
|
211
219
|
summary: Token based authentication for rails. Uses Devise + OmniAuth.
|
212
220
|
test_files:
|
213
|
-
- test/controllers/
|
221
|
+
- test/controllers/demo_group_controller_test.rb
|
222
|
+
- test/controllers/demo_mang_controller_test.rb
|
223
|
+
- test/controllers/demo_user_controller_test.rb
|
214
224
|
- test/controllers/devise_token_auth/auth_controller_test.rb
|
215
225
|
- test/controllers/devise_token_auth/confirmations_controller_test.rb
|
216
226
|
- test/controllers/devise_token_auth/passwords_controller_test.rb
|
@@ -221,7 +231,9 @@ test_files:
|
|
221
231
|
- test/dummy/app/assets/javascripts/application.js
|
222
232
|
- test/dummy/app/assets/stylesheets/application.css
|
223
233
|
- test/dummy/app/controllers/application_controller.rb
|
224
|
-
- test/dummy/app/controllers/
|
234
|
+
- test/dummy/app/controllers/demo_group_controller.rb
|
235
|
+
- test/dummy/app/controllers/demo_mang_controller.rb
|
236
|
+
- test/dummy/app/controllers/demo_user_controller.rb
|
225
237
|
- test/dummy/app/helpers/application_helper.rb
|
226
238
|
- test/dummy/app/models/mang.rb
|
227
239
|
- test/dummy/app/models/user.rb
|
@@ -258,6 +270,7 @@ test_files:
|
|
258
270
|
- test/dummy/db/migrate/20140715061447_devise_token_auth_create_users.rb
|
259
271
|
- test/dummy/db/migrate/20140715061805_devise_token_auth_create_mangs.rb
|
260
272
|
- test/dummy/db/migrate/20140829044006_add_operating_thetan_to_user.rb
|
273
|
+
- test/dummy/db/migrate/20140916224624_add_favorite_color_to_mangs.rb
|
261
274
|
- test/dummy/db/schema.rb
|
262
275
|
- test/dummy/db/test.sqlite3
|
263
276
|
- test/dummy/log/development.log
|
@@ -268,9 +281,10 @@ test_files:
|
|
268
281
|
- test/dummy/public/favicon.ico
|
269
282
|
- test/dummy/Rakefile
|
270
283
|
- test/dummy/README.rdoc
|
284
|
+
- test/dummy/tmp/generators/app/controllers/application_controller.rb
|
271
285
|
- test/dummy/tmp/generators/app/models/user.rb
|
272
286
|
- test/dummy/tmp/generators/config/initializers/devise_token_auth.rb
|
273
|
-
- test/dummy/tmp/generators/db/migrate/
|
287
|
+
- test/dummy/tmp/generators/db/migrate/20140922164332_devise_token_auth_create_users.rb
|
274
288
|
- test/dummy/tmp/restart.txt
|
275
289
|
- test/fixtures/mangs.yml
|
276
290
|
- test/fixtures/users.yml
|
@@ -1,16 +0,0 @@
|
|
1
|
-
class DemoController < ApplicationController
|
2
|
-
def members_only
|
3
|
-
if @user
|
4
|
-
render json: {
|
5
|
-
data: {
|
6
|
-
message: "Welcome #{@user.name}",
|
7
|
-
user: @user
|
8
|
-
}
|
9
|
-
}, status: 200
|
10
|
-
else
|
11
|
-
render json: {
|
12
|
-
errors: ["Authorized users only."]
|
13
|
-
}, status: 401
|
14
|
-
end
|
15
|
-
end
|
16
|
-
end
|