devise 3.5.1 → 4.7.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 +5 -5
- data/CHANGELOG.md +259 -1076
- data/MIT-LICENSE +1 -1
- data/README.md +256 -68
- data/app/controllers/devise/confirmations_controller.rb +3 -1
- data/app/controllers/devise/omniauth_callbacks_controller.rb +8 -6
- data/app/controllers/devise/passwords_controller.rb +10 -7
- data/app/controllers/devise/registrations_controller.rb +39 -18
- data/app/controllers/devise/sessions_controller.rb +9 -7
- data/app/controllers/devise/unlocks_controller.rb +4 -2
- data/app/controllers/devise_controller.rb +23 -10
- data/app/helpers/devise_helper.rb +12 -19
- data/app/mailers/devise/mailer.rb +10 -0
- data/app/views/devise/confirmations/new.html.erb +2 -2
- data/app/views/devise/mailer/email_changed.html.erb +7 -0
- data/app/views/devise/mailer/password_change.html.erb +3 -0
- data/app/views/devise/passwords/edit.html.erb +5 -5
- data/app/views/devise/passwords/new.html.erb +2 -2
- data/app/views/devise/registrations/edit.html.erb +9 -5
- data/app/views/devise/registrations/new.html.erb +4 -4
- data/app/views/devise/sessions/new.html.erb +4 -4
- data/app/views/devise/shared/_error_messages.html.erb +15 -0
- data/app/views/devise/shared/_links.html.erb +8 -8
- data/app/views/devise/unlocks/new.html.erb +2 -2
- data/config/locales/en.yml +6 -1
- data/lib/devise/controllers/helpers.rb +35 -26
- data/lib/devise/controllers/rememberable.rb +11 -2
- data/lib/devise/controllers/scoped_views.rb +2 -0
- data/lib/devise/controllers/sign_in_out.rb +35 -18
- data/lib/devise/controllers/store_location.rb +25 -7
- data/lib/devise/controllers/url_helpers.rb +2 -0
- data/lib/devise/delegator.rb +2 -0
- data/lib/devise/encryptor.rb +6 -4
- data/lib/devise/failure_app.rb +84 -27
- data/lib/devise/hooks/activatable.rb +2 -0
- data/lib/devise/hooks/csrf_cleaner.rb +2 -0
- data/lib/devise/hooks/forgetable.rb +2 -0
- data/lib/devise/hooks/lockable.rb +6 -1
- data/lib/devise/hooks/proxy.rb +3 -1
- data/lib/devise/hooks/rememberable.rb +2 -0
- data/lib/devise/hooks/timeoutable.rb +7 -7
- data/lib/devise/hooks/trackable.rb +2 -0
- data/lib/devise/mailers/helpers.rb +7 -4
- data/lib/devise/mapping.rb +2 -0
- data/lib/devise/models/authenticatable.rb +51 -26
- data/lib/devise/models/confirmable.rb +106 -33
- data/lib/devise/models/database_authenticatable.rb +97 -21
- data/lib/devise/models/lockable.rb +15 -5
- data/lib/devise/models/omniauthable.rb +2 -0
- data/lib/devise/models/recoverable.rb +32 -24
- data/lib/devise/models/registerable.rb +4 -0
- data/lib/devise/models/rememberable.rb +42 -26
- data/lib/devise/models/timeoutable.rb +2 -6
- data/lib/devise/models/trackable.rb +15 -1
- data/lib/devise/models/validatable.rb +10 -3
- data/lib/devise/models.rb +3 -1
- data/lib/devise/modules.rb +2 -0
- data/lib/devise/omniauth/config.rb +2 -0
- data/lib/devise/omniauth/url_helpers.rb +14 -5
- data/lib/devise/omniauth.rb +2 -0
- data/lib/devise/orm/active_record.rb +5 -1
- data/lib/devise/orm/mongoid.rb +6 -2
- data/lib/devise/parameter_filter.rb +4 -0
- data/lib/devise/parameter_sanitizer.rb +139 -65
- data/lib/devise/rails/routes.rb +67 -47
- data/lib/devise/rails/warden_compat.rb +3 -10
- data/lib/devise/rails.rb +7 -16
- data/lib/devise/secret_key_finder.rb +27 -0
- data/lib/devise/strategies/authenticatable.rb +5 -3
- data/lib/devise/strategies/base.rb +2 -0
- data/lib/devise/strategies/database_authenticatable.rb +11 -4
- data/lib/devise/strategies/rememberable.rb +5 -6
- data/lib/devise/test/controller_helpers.rb +165 -0
- data/lib/devise/test/integration_helpers.rb +63 -0
- data/lib/devise/test_helpers.rb +7 -124
- data/lib/devise/time_inflector.rb +2 -0
- data/lib/devise/token_generator.rb +3 -41
- data/lib/devise/version.rb +3 -1
- data/lib/devise.rb +73 -46
- data/lib/generators/active_record/devise_generator.rb +29 -10
- data/lib/generators/active_record/templates/migration.rb +4 -2
- data/lib/generators/active_record/templates/migration_existing.rb +4 -2
- data/lib/generators/devise/controllers_generator.rb +3 -1
- data/lib/generators/devise/devise_generator.rb +4 -2
- data/lib/generators/devise/install_generator.rb +17 -0
- data/lib/generators/devise/orm_helpers.rb +10 -21
- data/lib/generators/devise/views_generator.rb +21 -11
- data/lib/generators/mongoid/devise_generator.rb +7 -5
- data/lib/generators/templates/README +1 -8
- data/lib/generators/templates/controllers/README +1 -1
- data/lib/generators/templates/controllers/confirmations_controller.rb +2 -0
- data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +2 -0
- data/lib/generators/templates/controllers/passwords_controller.rb +2 -0
- data/lib/generators/templates/controllers/registrations_controller.rb +6 -4
- data/lib/generators/templates/controllers/sessions_controller.rb +4 -2
- data/lib/generators/templates/controllers/unlocks_controller.rb +2 -0
- data/lib/generators/templates/devise.rb +52 -22
- data/lib/generators/templates/markerb/confirmation_instructions.markerb +1 -1
- data/lib/generators/templates/markerb/email_changed.markerb +7 -0
- data/lib/generators/templates/markerb/password_change.markerb +3 -0
- data/lib/generators/templates/markerb/reset_password_instructions.markerb +1 -1
- data/lib/generators/templates/markerb/unlock_instructions.markerb +1 -1
- data/lib/generators/templates/simple_form_for/confirmations/new.html.erb +5 -1
- data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +10 -2
- data/lib/generators/templates/simple_form_for/passwords/new.html.erb +4 -1
- data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +11 -3
- data/lib/generators/templates/simple_form_for/registrations/new.html.erb +11 -3
- data/lib/generators/templates/simple_form_for/sessions/new.html.erb +7 -2
- data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +4 -1
- metadata +15 -301
- data/.gitignore +0 -10
- data/.travis.yml +0 -45
- data/.yardopts +0 -9
- data/CONTRIBUTING.md +0 -14
- data/Gemfile +0 -29
- data/Gemfile.lock +0 -191
- data/Rakefile +0 -36
- data/devise.gemspec +0 -29
- data/devise.png +0 -0
- data/gemfiles/Gemfile.rails-3.2-stable +0 -29
- data/gemfiles/Gemfile.rails-3.2-stable.lock +0 -169
- data/gemfiles/Gemfile.rails-4.0-stable +0 -29
- data/gemfiles/Gemfile.rails-4.0-stable.lock +0 -163
- data/gemfiles/Gemfile.rails-4.1-stable +0 -29
- data/gemfiles/Gemfile.rails-4.1-stable.lock +0 -169
- data/gemfiles/Gemfile.rails-4.2-stable +0 -29
- data/gemfiles/Gemfile.rails-4.2-stable.lock +0 -191
- data/script/cached-bundle +0 -49
- data/script/s3-put +0 -71
- data/test/controllers/custom_registrations_controller_test.rb +0 -40
- data/test/controllers/custom_strategy_test.rb +0 -62
- data/test/controllers/helpers_test.rb +0 -316
- data/test/controllers/inherited_controller_i18n_messages_test.rb +0 -51
- data/test/controllers/internal_helpers_test.rb +0 -129
- data/test/controllers/load_hooks_controller_test.rb +0 -19
- data/test/controllers/passwords_controller_test.rb +0 -31
- data/test/controllers/sessions_controller_test.rb +0 -103
- data/test/controllers/url_helpers_test.rb +0 -65
- data/test/delegator_test.rb +0 -19
- data/test/devise_test.rb +0 -107
- data/test/failure_app_test.rb +0 -298
- data/test/generators/active_record_generator_test.rb +0 -109
- data/test/generators/controllers_generator_test.rb +0 -48
- data/test/generators/devise_generator_test.rb +0 -39
- data/test/generators/install_generator_test.rb +0 -13
- data/test/generators/mongoid_generator_test.rb +0 -23
- data/test/generators/views_generator_test.rb +0 -96
- data/test/helpers/devise_helper_test.rb +0 -49
- data/test/integration/authenticatable_test.rb +0 -729
- data/test/integration/confirmable_test.rb +0 -324
- data/test/integration/database_authenticatable_test.rb +0 -95
- data/test/integration/http_authenticatable_test.rb +0 -105
- data/test/integration/lockable_test.rb +0 -239
- data/test/integration/omniauthable_test.rb +0 -133
- data/test/integration/recoverable_test.rb +0 -347
- data/test/integration/registerable_test.rb +0 -359
- data/test/integration/rememberable_test.rb +0 -176
- data/test/integration/timeoutable_test.rb +0 -189
- data/test/integration/trackable_test.rb +0 -92
- data/test/mailers/confirmation_instructions_test.rb +0 -115
- data/test/mailers/reset_password_instructions_test.rb +0 -96
- data/test/mailers/unlock_instructions_test.rb +0 -91
- data/test/mapping_test.rb +0 -134
- data/test/models/authenticatable_test.rb +0 -23
- data/test/models/confirmable_test.rb +0 -468
- data/test/models/database_authenticatable_test.rb +0 -249
- data/test/models/lockable_test.rb +0 -328
- data/test/models/omniauthable_test.rb +0 -7
- data/test/models/recoverable_test.rb +0 -228
- data/test/models/registerable_test.rb +0 -7
- data/test/models/rememberable_test.rb +0 -204
- data/test/models/serializable_test.rb +0 -49
- data/test/models/timeoutable_test.rb +0 -51
- data/test/models/trackable_test.rb +0 -41
- data/test/models/validatable_test.rb +0 -127
- data/test/models_test.rb +0 -144
- data/test/omniauth/config_test.rb +0 -57
- data/test/omniauth/url_helpers_test.rb +0 -54
- data/test/orm/active_record.rb +0 -10
- data/test/orm/mongoid.rb +0 -13
- data/test/parameter_sanitizer_test.rb +0 -81
- data/test/rails_app/Rakefile +0 -6
- data/test/rails_app/app/active_record/admin.rb +0 -6
- data/test/rails_app/app/active_record/shim.rb +0 -2
- data/test/rails_app/app/active_record/user.rb +0 -6
- data/test/rails_app/app/active_record/user_on_engine.rb +0 -7
- data/test/rails_app/app/active_record/user_on_main_app.rb +0 -7
- data/test/rails_app/app/controllers/admins/sessions_controller.rb +0 -6
- data/test/rails_app/app/controllers/admins_controller.rb +0 -11
- data/test/rails_app/app/controllers/application_controller.rb +0 -12
- data/test/rails_app/app/controllers/application_with_fake_engine.rb +0 -30
- data/test/rails_app/app/controllers/custom/registrations_controller.rb +0 -31
- data/test/rails_app/app/controllers/home_controller.rb +0 -25
- data/test/rails_app/app/controllers/publisher/registrations_controller.rb +0 -2
- data/test/rails_app/app/controllers/publisher/sessions_controller.rb +0 -2
- data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb +0 -14
- data/test/rails_app/app/controllers/users_controller.rb +0 -31
- data/test/rails_app/app/helpers/application_helper.rb +0 -3
- data/test/rails_app/app/mailers/users/from_proc_mailer.rb +0 -3
- data/test/rails_app/app/mailers/users/mailer.rb +0 -3
- data/test/rails_app/app/mailers/users/reply_to_mailer.rb +0 -4
- data/test/rails_app/app/mongoid/admin.rb +0 -29
- data/test/rails_app/app/mongoid/shim.rb +0 -23
- data/test/rails_app/app/mongoid/user.rb +0 -39
- data/test/rails_app/app/mongoid/user_on_engine.rb +0 -39
- data/test/rails_app/app/mongoid/user_on_main_app.rb +0 -39
- data/test/rails_app/app/views/admins/index.html.erb +0 -1
- data/test/rails_app/app/views/admins/sessions/new.html.erb +0 -2
- data/test/rails_app/app/views/home/admin_dashboard.html.erb +0 -1
- data/test/rails_app/app/views/home/index.html.erb +0 -1
- data/test/rails_app/app/views/home/join.html.erb +0 -1
- data/test/rails_app/app/views/home/private.html.erb +0 -1
- data/test/rails_app/app/views/home/user_dashboard.html.erb +0 -1
- data/test/rails_app/app/views/layouts/application.html.erb +0 -24
- data/test/rails_app/app/views/users/edit_form.html.erb +0 -1
- data/test/rails_app/app/views/users/index.html.erb +0 -1
- data/test/rails_app/app/views/users/mailer/confirmation_instructions.erb +0 -1
- data/test/rails_app/app/views/users/sessions/new.html.erb +0 -1
- data/test/rails_app/bin/bundle +0 -3
- data/test/rails_app/bin/rails +0 -4
- data/test/rails_app/bin/rake +0 -4
- data/test/rails_app/config/application.rb +0 -40
- data/test/rails_app/config/boot.rb +0 -14
- data/test/rails_app/config/database.yml +0 -18
- data/test/rails_app/config/environment.rb +0 -5
- data/test/rails_app/config/environments/development.rb +0 -30
- data/test/rails_app/config/environments/production.rb +0 -84
- data/test/rails_app/config/environments/test.rb +0 -41
- data/test/rails_app/config/initializers/backtrace_silencers.rb +0 -7
- data/test/rails_app/config/initializers/devise.rb +0 -180
- data/test/rails_app/config/initializers/inflections.rb +0 -2
- data/test/rails_app/config/initializers/secret_token.rb +0 -8
- data/test/rails_app/config/initializers/session_store.rb +0 -1
- data/test/rails_app/config/routes.rb +0 -122
- data/test/rails_app/config.ru +0 -4
- data/test/rails_app/db/migrate/20100401102949_create_tables.rb +0 -71
- data/test/rails_app/db/schema.rb +0 -55
- data/test/rails_app/lib/shared_admin.rb +0 -17
- data/test/rails_app/lib/shared_user.rb +0 -29
- data/test/rails_app/lib/shared_user_without_omniauth.rb +0 -13
- data/test/rails_app/public/404.html +0 -26
- data/test/rails_app/public/422.html +0 -26
- data/test/rails_app/public/500.html +0 -26
- data/test/rails_app/public/favicon.ico +0 -0
- data/test/rails_test.rb +0 -9
- data/test/routes_test.rb +0 -264
- data/test/support/action_controller/record_identifier.rb +0 -10
- data/test/support/assertions.rb +0 -39
- data/test/support/helpers.rb +0 -73
- data/test/support/integration.rb +0 -92
- data/test/support/locale/en.yml +0 -8
- data/test/support/mongoid.yml +0 -6
- data/test/support/webrat/integrations/rails.rb +0 -24
- data/test/test_helper.rb +0 -34
- data/test/test_helpers_test.rb +0 -178
- data/test/test_models.rb +0 -33
data/test/test_helpers_test.rb
DELETED
@@ -1,178 +0,0 @@
|
|
1
|
-
require 'test_helper'
|
2
|
-
|
3
|
-
class TestHelpersTest < ActionController::TestCase
|
4
|
-
tests UsersController
|
5
|
-
include Devise::TestHelpers
|
6
|
-
|
7
|
-
test "redirects if attempting to access a page unauthenticated" do
|
8
|
-
get :index
|
9
|
-
assert_redirected_to new_user_session_path
|
10
|
-
assert_equal "You need to sign in or sign up before continuing.", flash[:alert]
|
11
|
-
end
|
12
|
-
|
13
|
-
test "redirects if attempting to access a page with an unconfirmed account" do
|
14
|
-
swap Devise, allow_unconfirmed_access_for: 0.days do
|
15
|
-
user = create_user
|
16
|
-
assert !user.active_for_authentication?
|
17
|
-
|
18
|
-
sign_in user
|
19
|
-
get :index
|
20
|
-
assert_redirected_to new_user_session_path
|
21
|
-
end
|
22
|
-
end
|
23
|
-
|
24
|
-
test "returns nil if accessing current_user with an unconfirmed account" do
|
25
|
-
swap Devise, allow_unconfirmed_access_for: 0.days do
|
26
|
-
user = create_user
|
27
|
-
assert !user.active_for_authentication?
|
28
|
-
|
29
|
-
sign_in user
|
30
|
-
get :accept, id: user
|
31
|
-
assert_nil assigns(:current_user)
|
32
|
-
end
|
33
|
-
end
|
34
|
-
|
35
|
-
test "does not redirect with valid user" do
|
36
|
-
user = create_user
|
37
|
-
user.confirm
|
38
|
-
|
39
|
-
sign_in user
|
40
|
-
get :index
|
41
|
-
assert_response :success
|
42
|
-
end
|
43
|
-
|
44
|
-
test "does not redirect with valid user after failed first attempt" do
|
45
|
-
get :index
|
46
|
-
assert_response :redirect
|
47
|
-
|
48
|
-
user = create_user
|
49
|
-
user.confirm
|
50
|
-
|
51
|
-
sign_in user
|
52
|
-
get :index
|
53
|
-
assert_response :success
|
54
|
-
end
|
55
|
-
|
56
|
-
test "redirects if valid user signed out" do
|
57
|
-
user = create_user
|
58
|
-
user.confirm
|
59
|
-
|
60
|
-
sign_in user
|
61
|
-
get :index
|
62
|
-
|
63
|
-
sign_out user
|
64
|
-
get :index
|
65
|
-
assert_redirected_to new_user_session_path
|
66
|
-
end
|
67
|
-
|
68
|
-
test "respects custom failure app" do
|
69
|
-
custom_failure_app = Class.new(Devise::FailureApp) do
|
70
|
-
def redirect
|
71
|
-
self.status = 306
|
72
|
-
end
|
73
|
-
end
|
74
|
-
|
75
|
-
swap Devise.warden_config, failure_app: custom_failure_app do
|
76
|
-
get :index
|
77
|
-
assert_response 306
|
78
|
-
end
|
79
|
-
end
|
80
|
-
|
81
|
-
test "passes given headers from the failure app to the response" do
|
82
|
-
custom_failure_app = Class.new(Devise::FailureApp) do
|
83
|
-
def respond
|
84
|
-
self.status = 401
|
85
|
-
self.response.headers["CUSTOMHEADER"] = 1
|
86
|
-
end
|
87
|
-
end
|
88
|
-
|
89
|
-
swap Devise.warden_config, failure_app: custom_failure_app do
|
90
|
-
sign_in create_user
|
91
|
-
get :index
|
92
|
-
assert_equal 1, @response.headers["CUSTOMHEADER"]
|
93
|
-
end
|
94
|
-
end
|
95
|
-
|
96
|
-
test "returns the body of a failure app" do
|
97
|
-
get :index
|
98
|
-
assert_equal response.body, "<html><body>You are being <a href=\"http://test.host/users/sign_in\">redirected</a>.</body></html>"
|
99
|
-
end
|
100
|
-
|
101
|
-
test "defined Warden after_authentication callback should not be called when sign_in is called" do
|
102
|
-
begin
|
103
|
-
Warden::Manager.after_authentication do |user, auth, opts|
|
104
|
-
flunk "callback was called while it should not"
|
105
|
-
end
|
106
|
-
|
107
|
-
user = create_user
|
108
|
-
user.confirm
|
109
|
-
sign_in user
|
110
|
-
ensure
|
111
|
-
Warden::Manager._after_set_user.pop
|
112
|
-
end
|
113
|
-
end
|
114
|
-
|
115
|
-
test "defined Warden before_logout callback should not be called when sign_out is called" do
|
116
|
-
begin
|
117
|
-
Warden::Manager.before_logout do |user, auth, opts|
|
118
|
-
flunk "callback was called while it should not"
|
119
|
-
end
|
120
|
-
user = create_user
|
121
|
-
user.confirm
|
122
|
-
|
123
|
-
sign_in user
|
124
|
-
sign_out user
|
125
|
-
ensure
|
126
|
-
Warden::Manager._before_logout.pop
|
127
|
-
end
|
128
|
-
end
|
129
|
-
|
130
|
-
test "before_failure call should work" do
|
131
|
-
begin
|
132
|
-
executed = false
|
133
|
-
Warden::Manager.before_failure do |env,opts|
|
134
|
-
executed = true
|
135
|
-
end
|
136
|
-
|
137
|
-
user = create_user
|
138
|
-
sign_in user
|
139
|
-
|
140
|
-
get :index
|
141
|
-
assert executed
|
142
|
-
ensure
|
143
|
-
Warden::Manager._before_failure.pop
|
144
|
-
end
|
145
|
-
end
|
146
|
-
|
147
|
-
test "allows to sign in with different users" do
|
148
|
-
first_user = create_user
|
149
|
-
first_user.confirm
|
150
|
-
|
151
|
-
sign_in first_user
|
152
|
-
get :index
|
153
|
-
assert_match /User ##{first_user.id}/, @response.body
|
154
|
-
sign_out first_user
|
155
|
-
|
156
|
-
second_user = create_user
|
157
|
-
second_user.confirm
|
158
|
-
|
159
|
-
sign_in second_user
|
160
|
-
get :index
|
161
|
-
assert_match /User ##{second_user.id}/, @response.body
|
162
|
-
end
|
163
|
-
|
164
|
-
test "creates a new warden proxy if the request object has changed" do
|
165
|
-
old_warden_proxy = warden
|
166
|
-
@request = ActionController::TestRequest.new
|
167
|
-
new_warden_proxy = warden
|
168
|
-
|
169
|
-
assert_not_equal old_warden_proxy, new_warden_proxy
|
170
|
-
end
|
171
|
-
|
172
|
-
test "doesn't create a new warden proxy if the request object hasn't changed" do
|
173
|
-
old_warden_proxy = warden
|
174
|
-
new_warden_proxy = warden
|
175
|
-
|
176
|
-
assert_equal old_warden_proxy, new_warden_proxy
|
177
|
-
end
|
178
|
-
end
|
data/test/test_models.rb
DELETED
@@ -1,33 +0,0 @@
|
|
1
|
-
class Configurable < User
|
2
|
-
devise :database_authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
|
3
|
-
stretches: 15, pepper: 'abcdef', allow_unconfirmed_access_for: 5.days,
|
4
|
-
remember_for: 7.days, timeout_in: 15.minutes, unlock_in: 10.days
|
5
|
-
end
|
6
|
-
|
7
|
-
class WithValidation < Admin
|
8
|
-
devise :database_authenticatable, :validatable, password_length: 2..6
|
9
|
-
end
|
10
|
-
|
11
|
-
class UserWithValidation < User
|
12
|
-
validates_presence_of :username
|
13
|
-
end
|
14
|
-
|
15
|
-
class UserWithCustomEncryption < User
|
16
|
-
protected
|
17
|
-
def password_digest(password)
|
18
|
-
password.reverse
|
19
|
-
end
|
20
|
-
end
|
21
|
-
|
22
|
-
class UserWithVirtualAttributes < User
|
23
|
-
devise case_insensitive_keys: [:email, :email_confirmation]
|
24
|
-
validates :email, presence: true, confirmation: { on: :create }
|
25
|
-
end
|
26
|
-
|
27
|
-
class Several < Admin
|
28
|
-
devise :validatable
|
29
|
-
devise :lockable
|
30
|
-
end
|
31
|
-
|
32
|
-
class Inheritable < Admin
|
33
|
-
end
|