devise 3.0.0 → 4.8.0
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 +7 -0
- data/CHANGELOG.md +351 -0
- data/MIT-LICENSE +2 -1
- data/README.md +422 -130
- data/app/controllers/devise/confirmations_controller.rb +17 -6
- data/app/controllers/devise/omniauth_callbacks_controller.rb +12 -6
- data/app/controllers/devise/passwords_controller.rb +23 -8
- data/app/controllers/devise/registrations_controller.rb +70 -28
- data/app/controllers/devise/sessions_controller.rb +49 -17
- data/app/controllers/devise/unlocks_controller.rb +11 -4
- data/app/controllers/devise_controller.rb +74 -34
- data/app/helpers/devise_helper.rb +23 -18
- data/app/mailers/devise/mailer.rb +25 -10
- data/app/views/devise/confirmations/new.html.erb +9 -5
- data/app/views/devise/mailer/confirmation_instructions.html.erb +1 -1
- 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/mailer/reset_password_instructions.html.erb +1 -1
- data/app/views/devise/mailer/unlock_instructions.html.erb +1 -1
- data/app/views/devise/passwords/edit.html.erb +16 -7
- data/app/views/devise/passwords/new.html.erb +9 -5
- data/app/views/devise/registrations/edit.html.erb +29 -15
- data/app/views/devise/registrations/new.html.erb +20 -9
- data/app/views/devise/sessions/new.html.erb +19 -10
- data/app/views/devise/shared/_error_messages.html.erb +15 -0
- data/app/views/devise/shared/{_links.erb → _links.html.erb} +10 -10
- data/app/views/devise/unlocks/new.html.erb +9 -5
- data/config/locales/en.yml +26 -20
- data/lib/devise/controllers/helpers.rb +122 -125
- data/lib/devise/controllers/rememberable.rb +14 -14
- data/lib/devise/controllers/scoped_views.rb +3 -1
- data/lib/devise/controllers/sign_in_out.rb +121 -0
- data/lib/devise/controllers/store_location.rb +76 -0
- data/lib/devise/controllers/url_helpers.rb +10 -8
- data/lib/devise/delegator.rb +2 -0
- data/lib/devise/encryptor.rb +24 -0
- data/lib/devise/failure_app.rb +132 -42
- data/lib/devise/hooks/activatable.rb +7 -6
- data/lib/devise/hooks/csrf_cleaner.rb +9 -0
- data/lib/devise/hooks/forgetable.rb +3 -1
- data/lib/devise/hooks/lockable.rb +5 -3
- data/lib/devise/hooks/proxy.rb +23 -0
- data/lib/devise/hooks/rememberable.rb +7 -4
- data/lib/devise/hooks/timeoutable.rb +18 -8
- data/lib/devise/hooks/trackable.rb +3 -1
- data/lib/devise/mailers/helpers.rb +15 -18
- data/lib/devise/mapping.rb +9 -3
- data/lib/devise/models/authenticatable.rb +102 -80
- data/lib/devise/models/confirmable.rb +154 -72
- data/lib/devise/models/database_authenticatable.rb +125 -25
- data/lib/devise/models/lockable.rb +50 -29
- data/lib/devise/models/omniauthable.rb +3 -1
- data/lib/devise/models/recoverable.rb +72 -50
- data/lib/devise/models/registerable.rb +4 -0
- data/lib/devise/models/rememberable.rb +65 -32
- data/lib/devise/models/timeoutable.rb +4 -8
- data/lib/devise/models/trackable.rb +20 -4
- data/lib/devise/models/validatable.rb +16 -9
- data/lib/devise/models.rb +6 -13
- data/lib/devise/modules.rb +12 -11
- data/lib/devise/omniauth/config.rb +2 -0
- data/lib/devise/omniauth/url_helpers.rb +14 -5
- data/lib/devise/omniauth.rb +4 -5
- 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 +144 -34
- data/lib/devise/rails/deprecated_constant_accessor.rb +39 -0
- data/lib/devise/rails/routes.rb +191 -127
- data/lib/devise/rails/warden_compat.rb +2 -1
- data/lib/devise/rails.rb +13 -20
- data/lib/devise/secret_key_finder.rb +27 -0
- data/lib/devise/strategies/authenticatable.rb +21 -22
- data/lib/devise/strategies/base.rb +3 -1
- data/lib/devise/strategies/database_authenticatable.rb +15 -4
- data/lib/devise/strategies/rememberable.rb +15 -3
- data/lib/devise/test/controller_helpers.rb +167 -0
- data/lib/devise/test/integration_helpers.rb +63 -0
- data/lib/devise/test_helpers.rb +7 -123
- data/lib/devise/time_inflector.rb +4 -2
- data/lib/devise/token_generator.rb +32 -0
- data/lib/devise/version.rb +3 -1
- data/lib/devise.rb +124 -78
- data/lib/generators/active_record/devise_generator.rb +64 -15
- data/lib/generators/active_record/templates/migration.rb +9 -8
- data/lib/generators/active_record/templates/migration_existing.rb +9 -8
- data/lib/generators/devise/controllers_generator.rb +46 -0
- data/lib/generators/devise/devise_generator.rb +10 -6
- data/lib/generators/devise/install_generator.rb +19 -1
- data/lib/generators/devise/orm_helpers.rb +17 -9
- data/lib/generators/devise/views_generator.rb +51 -28
- data/lib/generators/mongoid/devise_generator.rb +24 -24
- data/lib/generators/templates/README +13 -12
- data/lib/generators/templates/controllers/README +14 -0
- data/lib/generators/templates/controllers/confirmations_controller.rb +30 -0
- data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +30 -0
- data/lib/generators/templates/controllers/passwords_controller.rb +34 -0
- data/lib/generators/templates/controllers/registrations_controller.rb +62 -0
- data/lib/generators/templates/controllers/sessions_controller.rb +27 -0
- data/lib/generators/templates/controllers/unlocks_controller.rb +30 -0
- data/lib/generators/templates/devise.rb +118 -53
- 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 +6 -2
- data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +12 -4
- data/lib/generators/templates/simple_form_for/passwords/new.html.erb +5 -2
- data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +14 -6
- data/lib/generators/templates/simple_form_for/registrations/new.html.erb +12 -4
- data/lib/generators/templates/simple_form_for/sessions/new.html.erb +11 -6
- data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +5 -2
- metadata +73 -294
- data/.gitignore +0 -10
- data/.travis.yml +0 -20
- data/.yardopts +0 -9
- data/CHANGELOG.rdoc +0 -941
- data/CONTRIBUTING.md +0 -14
- data/Gemfile +0 -31
- data/Gemfile.lock +0 -159
- data/Rakefile +0 -35
- data/app/views/devise/_links.erb +0 -3
- data/devise.gemspec +0 -26
- data/devise.png +0 -0
- data/gemfiles/Gemfile.rails-3.2.x +0 -31
- data/gemfiles/Gemfile.rails-3.2.x.lock +0 -156
- data/lib/devise/models/token_authenticatable.rb +0 -89
- data/lib/devise/strategies/token_authenticatable.rb +0 -91
- data/test/controllers/custom_strategy_test.rb +0 -62
- data/test/controllers/helpers_test.rb +0 -253
- data/test/controllers/internal_helpers_test.rb +0 -120
- data/test/controllers/passwords_controller_test.rb +0 -32
- data/test/controllers/sessions_controller_test.rb +0 -99
- data/test/controllers/url_helpers_test.rb +0 -59
- data/test/delegator_test.rb +0 -19
- data/test/devise_test.rb +0 -83
- data/test/failure_app_test.rb +0 -221
- data/test/generators/active_record_generator_test.rb +0 -73
- 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 -67
- data/test/helpers/devise_helper_test.rb +0 -51
- data/test/integration/authenticatable_test.rb +0 -699
- data/test/integration/confirmable_test.rb +0 -299
- data/test/integration/database_authenticatable_test.rb +0 -84
- data/test/integration/http_authenticatable_test.rb +0 -115
- data/test/integration/lockable_test.rb +0 -242
- data/test/integration/omniauthable_test.rb +0 -133
- data/test/integration/recoverable_test.rb +0 -335
- data/test/integration/registerable_test.rb +0 -349
- data/test/integration/rememberable_test.rb +0 -165
- data/test/integration/timeoutable_test.rb +0 -150
- data/test/integration/token_authenticatable_test.rb +0 -205
- data/test/integration/trackable_test.rb +0 -92
- data/test/mailers/confirmation_instructions_test.rb +0 -111
- data/test/mailers/reset_password_instructions_test.rb +0 -92
- data/test/mailers/unlock_instructions_test.rb +0 -87
- data/test/mapping_test.rb +0 -127
- data/test/models/authenticatable_test.rb +0 -13
- data/test/models/confirmable_test.rb +0 -452
- data/test/models/database_authenticatable_test.rb +0 -226
- data/test/models/lockable_test.rb +0 -282
- data/test/models/omniauthable_test.rb +0 -7
- data/test/models/recoverable_test.rb +0 -222
- data/test/models/registerable_test.rb +0 -7
- data/test/models/rememberable_test.rb +0 -175
- data/test/models/serializable_test.rb +0 -49
- data/test/models/timeoutable_test.rb +0 -46
- data/test/models/token_authenticatable_test.rb +0 -55
- data/test/models/trackable_test.rb +0 -13
- data/test/models/validatable_test.rb +0 -127
- data/test/models_test.rb +0 -163
- 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 -58
- 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/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 -9
- 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/mailer.rb +0 -12
- 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 -42
- 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 -8
- 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 -34
- data/test/rails_app/config/environments/production.rb +0 -84
- data/test/rails_app/config/environments/test.rb +0 -36
- data/test/rails_app/config/initializers/backtrace_silencers.rb +0 -7
- data/test/rails_app/config/initializers/devise.rb +0 -178
- 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 -104
- data/test/rails_app/config.ru +0 -4
- data/test/rails_app/db/migrate/20100401102949_create_tables.rb +0 -74
- data/test/rails_app/db/schema.rb +0 -52
- data/test/rails_app/lib/shared_admin.rb +0 -14
- data/test/rails_app/lib/shared_user.rb +0 -25
- 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/routes_test.rb +0 -250
- data/test/support/assertions.rb +0 -40
- data/test/support/helpers.rb +0 -91
- data/test/support/integration.rb +0 -92
- data/test/support/locale/en.yml +0 -4
- data/test/support/webrat/integrations/rails.rb +0 -24
- data/test/test_helper.rb +0 -34
- data/test/test_helpers_test.rb +0 -151
- data/test/test_models.rb +0 -26
data/test/test_helpers_test.rb
DELETED
|
@@ -1,151 +0,0 @@
|
|
|
1
|
-
require 'test_helper'
|
|
2
|
-
|
|
3
|
-
class TestHelpersTest < ActionController::TestCase
|
|
4
|
-
tests UsersController
|
|
5
|
-
include Devise::TestHelpers
|
|
6
|
-
|
|
7
|
-
class CustomFailureApp < Devise::FailureApp
|
|
8
|
-
def redirect
|
|
9
|
-
self.status = 306
|
|
10
|
-
end
|
|
11
|
-
end
|
|
12
|
-
|
|
13
|
-
test "redirects if attempting to access a page unauthenticated" do
|
|
14
|
-
get :index
|
|
15
|
-
assert_redirected_to new_user_session_path
|
|
16
|
-
assert_equal "You need to sign in or sign up before continuing.", flash[:alert]
|
|
17
|
-
end
|
|
18
|
-
|
|
19
|
-
test "redirects if attempting to access a page with an unconfirmed account" do
|
|
20
|
-
swap Devise, :allow_unconfirmed_access_for => 0 do
|
|
21
|
-
user = create_user
|
|
22
|
-
assert !user.active_for_authentication?
|
|
23
|
-
|
|
24
|
-
sign_in user
|
|
25
|
-
get :index
|
|
26
|
-
assert_redirected_to new_user_session_path
|
|
27
|
-
end
|
|
28
|
-
end
|
|
29
|
-
|
|
30
|
-
test "returns nil if accessing current_user with an unconfirmed account" do
|
|
31
|
-
swap Devise, :allow_unconfirmed_access_for => 0 do
|
|
32
|
-
user = create_user
|
|
33
|
-
assert !user.active_for_authentication?
|
|
34
|
-
|
|
35
|
-
sign_in user
|
|
36
|
-
get :accept, :id => user
|
|
37
|
-
assert_nil assigns(:current_user)
|
|
38
|
-
end
|
|
39
|
-
end
|
|
40
|
-
|
|
41
|
-
test "does not redirect with valid user" do
|
|
42
|
-
user = create_user
|
|
43
|
-
user.confirm!
|
|
44
|
-
|
|
45
|
-
sign_in user
|
|
46
|
-
get :index
|
|
47
|
-
assert_response :success
|
|
48
|
-
end
|
|
49
|
-
|
|
50
|
-
test "does not redirect with valid user after failed first attempt" do
|
|
51
|
-
get :index
|
|
52
|
-
assert_response :redirect
|
|
53
|
-
|
|
54
|
-
user = create_user
|
|
55
|
-
user.confirm!
|
|
56
|
-
|
|
57
|
-
sign_in user
|
|
58
|
-
get :index
|
|
59
|
-
assert_response :success
|
|
60
|
-
end
|
|
61
|
-
|
|
62
|
-
test "redirects if valid user signed out" do
|
|
63
|
-
user = create_user
|
|
64
|
-
user.confirm!
|
|
65
|
-
|
|
66
|
-
sign_in user
|
|
67
|
-
get :index
|
|
68
|
-
|
|
69
|
-
sign_out user
|
|
70
|
-
get :index
|
|
71
|
-
assert_redirected_to new_user_session_path
|
|
72
|
-
end
|
|
73
|
-
|
|
74
|
-
test "respects custom failure app" do
|
|
75
|
-
begin
|
|
76
|
-
Devise.warden_config.failure_app = CustomFailureApp
|
|
77
|
-
get :index
|
|
78
|
-
assert_response 306
|
|
79
|
-
ensure
|
|
80
|
-
Devise.warden_config.failure_app = Devise::FailureApp
|
|
81
|
-
end
|
|
82
|
-
end
|
|
83
|
-
|
|
84
|
-
test "returns the body of a failure app" do
|
|
85
|
-
get :index
|
|
86
|
-
assert_equal response.body, "<html><body>You are being <a href=\"http://test.host/users/sign_in\">redirected</a>.</body></html>"
|
|
87
|
-
end
|
|
88
|
-
|
|
89
|
-
test "defined Warden after_authentication callback should not be called when sign_in is called" do
|
|
90
|
-
begin
|
|
91
|
-
Warden::Manager.after_authentication do |user, auth, opts|
|
|
92
|
-
flunk "callback was called while it should not"
|
|
93
|
-
end
|
|
94
|
-
|
|
95
|
-
user = create_user
|
|
96
|
-
user.confirm!
|
|
97
|
-
sign_in user
|
|
98
|
-
ensure
|
|
99
|
-
Warden::Manager._after_set_user.pop
|
|
100
|
-
end
|
|
101
|
-
end
|
|
102
|
-
|
|
103
|
-
test "defined Warden before_logout callback should not be called when sign_out is called" do
|
|
104
|
-
begin
|
|
105
|
-
Warden::Manager.before_logout do |user, auth, opts|
|
|
106
|
-
flunk "callback was called while it should not"
|
|
107
|
-
end
|
|
108
|
-
user = create_user
|
|
109
|
-
user.confirm!
|
|
110
|
-
|
|
111
|
-
sign_in user
|
|
112
|
-
sign_out user
|
|
113
|
-
ensure
|
|
114
|
-
Warden::Manager._before_logout.pop
|
|
115
|
-
end
|
|
116
|
-
end
|
|
117
|
-
|
|
118
|
-
test "before_failure call should work" do
|
|
119
|
-
begin
|
|
120
|
-
executed = false
|
|
121
|
-
Warden::Manager.before_failure do |env,opts|
|
|
122
|
-
executed = true
|
|
123
|
-
end
|
|
124
|
-
|
|
125
|
-
user = create_user
|
|
126
|
-
sign_in user
|
|
127
|
-
|
|
128
|
-
get :index
|
|
129
|
-
assert executed
|
|
130
|
-
ensure
|
|
131
|
-
Warden::Manager._before_failure.pop
|
|
132
|
-
end
|
|
133
|
-
end
|
|
134
|
-
|
|
135
|
-
test "allows to sign in with different users" do
|
|
136
|
-
first_user = create_user
|
|
137
|
-
first_user.confirm!
|
|
138
|
-
|
|
139
|
-
sign_in first_user
|
|
140
|
-
get :index
|
|
141
|
-
assert_match /User ##{first_user.id}/, @response.body
|
|
142
|
-
sign_out first_user
|
|
143
|
-
|
|
144
|
-
second_user = create_user
|
|
145
|
-
second_user.confirm!
|
|
146
|
-
|
|
147
|
-
sign_in second_user
|
|
148
|
-
get :index
|
|
149
|
-
assert_match /User ##{second_user.id}/, @response.body
|
|
150
|
-
end
|
|
151
|
-
end
|
data/test/test_models.rb
DELETED
|
@@ -1,26 +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 UserWithVirtualAttributes < User
|
|
16
|
-
devise :case_insensitive_keys => [ :email, :email_confirmation ]
|
|
17
|
-
validates :email, :presence => true, :confirmation => {:on => :create}
|
|
18
|
-
end
|
|
19
|
-
|
|
20
|
-
class Several < Admin
|
|
21
|
-
devise :validatable
|
|
22
|
-
devise :lockable
|
|
23
|
-
end
|
|
24
|
-
|
|
25
|
-
class Inheritable < Admin
|
|
26
|
-
end
|