devise 3.5.1 → 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.
Files changed (257) hide show
  1. checksums.yaml +5 -5
  2. data/CHANGELOG.md +281 -1066
  3. data/MIT-LICENSE +2 -1
  4. data/README.md +292 -97
  5. data/app/controllers/devise/confirmations_controller.rb +3 -1
  6. data/app/controllers/devise/omniauth_callbacks_controller.rb +8 -6
  7. data/app/controllers/devise/passwords_controller.rb +10 -7
  8. data/app/controllers/devise/registrations_controller.rb +39 -18
  9. data/app/controllers/devise/sessions_controller.rb +9 -7
  10. data/app/controllers/devise/unlocks_controller.rb +4 -2
  11. data/app/controllers/devise_controller.rb +25 -12
  12. data/app/helpers/devise_helper.rb +23 -18
  13. data/app/mailers/devise/mailer.rb +13 -3
  14. data/app/views/devise/confirmations/new.html.erb +2 -2
  15. data/app/views/devise/mailer/email_changed.html.erb +7 -0
  16. data/app/views/devise/mailer/password_change.html.erb +3 -0
  17. data/app/views/devise/passwords/edit.html.erb +5 -5
  18. data/app/views/devise/passwords/new.html.erb +2 -2
  19. data/app/views/devise/registrations/edit.html.erb +9 -5
  20. data/app/views/devise/registrations/new.html.erb +4 -4
  21. data/app/views/devise/sessions/new.html.erb +4 -4
  22. data/app/views/devise/shared/_error_messages.html.erb +15 -0
  23. data/app/views/devise/shared/_links.html.erb +8 -8
  24. data/app/views/devise/unlocks/new.html.erb +2 -2
  25. data/config/locales/en.yml +7 -2
  26. data/lib/devise/controllers/helpers.rb +42 -33
  27. data/lib/devise/controllers/rememberable.rb +11 -2
  28. data/lib/devise/controllers/scoped_views.rb +2 -0
  29. data/lib/devise/controllers/sign_in_out.rb +40 -21
  30. data/lib/devise/controllers/store_location.rb +25 -7
  31. data/lib/devise/controllers/url_helpers.rb +3 -1
  32. data/lib/devise/delegator.rb +2 -0
  33. data/lib/devise/encryptor.rb +6 -4
  34. data/lib/devise/failure_app.rb +84 -28
  35. data/lib/devise/hooks/activatable.rb +2 -0
  36. data/lib/devise/hooks/csrf_cleaner.rb +2 -0
  37. data/lib/devise/hooks/forgetable.rb +2 -0
  38. data/lib/devise/hooks/lockable.rb +4 -2
  39. data/lib/devise/hooks/proxy.rb +3 -1
  40. data/lib/devise/hooks/rememberable.rb +2 -0
  41. data/lib/devise/hooks/timeoutable.rb +7 -7
  42. data/lib/devise/hooks/trackable.rb +2 -0
  43. data/lib/devise/mailers/helpers.rb +7 -4
  44. data/lib/devise/mapping.rb +3 -1
  45. data/lib/devise/models/authenticatable.rb +63 -33
  46. data/lib/devise/models/confirmable.rb +108 -35
  47. data/lib/devise/models/database_authenticatable.rb +102 -22
  48. data/lib/devise/models/lockable.rb +24 -6
  49. data/lib/devise/models/omniauthable.rb +2 -0
  50. data/lib/devise/models/recoverable.rb +34 -26
  51. data/lib/devise/models/registerable.rb +4 -0
  52. data/lib/devise/models/rememberable.rb +42 -26
  53. data/lib/devise/models/timeoutable.rb +2 -6
  54. data/lib/devise/models/trackable.rb +15 -1
  55. data/lib/devise/models/validatable.rb +10 -3
  56. data/lib/devise/models.rb +3 -1
  57. data/lib/devise/modules.rb +2 -0
  58. data/lib/devise/omniauth/config.rb +2 -0
  59. data/lib/devise/omniauth/url_helpers.rb +14 -5
  60. data/lib/devise/omniauth.rb +4 -5
  61. data/lib/devise/orm/active_record.rb +5 -1
  62. data/lib/devise/orm/mongoid.rb +6 -2
  63. data/lib/devise/parameter_filter.rb +4 -0
  64. data/lib/devise/parameter_sanitizer.rb +139 -65
  65. data/lib/devise/rails/deprecated_constant_accessor.rb +39 -0
  66. data/lib/devise/rails/routes.rb +71 -51
  67. data/lib/devise/rails/warden_compat.rb +3 -10
  68. data/lib/devise/rails.rb +7 -16
  69. data/lib/devise/secret_key_finder.rb +27 -0
  70. data/lib/devise/strategies/authenticatable.rb +5 -3
  71. data/lib/devise/strategies/base.rb +2 -0
  72. data/lib/devise/strategies/database_authenticatable.rb +11 -4
  73. data/lib/devise/strategies/rememberable.rb +5 -6
  74. data/lib/devise/test/controller_helpers.rb +167 -0
  75. data/lib/devise/test/integration_helpers.rb +63 -0
  76. data/lib/devise/test_helpers.rb +7 -124
  77. data/lib/devise/time_inflector.rb +2 -0
  78. data/lib/devise/token_generator.rb +3 -41
  79. data/lib/devise/version.rb +3 -1
  80. data/lib/devise.rb +69 -46
  81. data/lib/generators/active_record/devise_generator.rb +46 -12
  82. data/lib/generators/active_record/templates/migration.rb +4 -2
  83. data/lib/generators/active_record/templates/migration_existing.rb +4 -2
  84. data/lib/generators/devise/controllers_generator.rb +3 -1
  85. data/lib/generators/devise/devise_generator.rb +5 -3
  86. data/lib/generators/devise/install_generator.rb +18 -5
  87. data/lib/generators/devise/orm_helpers.rb +10 -21
  88. data/lib/generators/devise/views_generator.rb +21 -11
  89. data/lib/generators/mongoid/devise_generator.rb +7 -5
  90. data/lib/generators/templates/README +9 -8
  91. data/lib/generators/templates/controllers/README +1 -1
  92. data/lib/generators/templates/controllers/confirmations_controller.rb +2 -0
  93. data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +3 -1
  94. data/lib/generators/templates/controllers/passwords_controller.rb +2 -0
  95. data/lib/generators/templates/controllers/registrations_controller.rb +6 -4
  96. data/lib/generators/templates/controllers/sessions_controller.rb +4 -2
  97. data/lib/generators/templates/controllers/unlocks_controller.rb +2 -0
  98. data/lib/generators/templates/devise.rb +65 -23
  99. data/lib/generators/templates/markerb/confirmation_instructions.markerb +1 -1
  100. data/lib/generators/templates/markerb/email_changed.markerb +7 -0
  101. data/lib/generators/templates/markerb/password_change.markerb +3 -0
  102. data/lib/generators/templates/markerb/reset_password_instructions.markerb +1 -1
  103. data/lib/generators/templates/markerb/unlock_instructions.markerb +1 -1
  104. data/lib/generators/templates/simple_form_for/confirmations/new.html.erb +5 -1
  105. data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +10 -2
  106. data/lib/generators/templates/simple_form_for/passwords/new.html.erb +4 -1
  107. data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +11 -3
  108. data/lib/generators/templates/simple_form_for/registrations/new.html.erb +11 -3
  109. data/lib/generators/templates/simple_form_for/sessions/new.html.erb +7 -2
  110. data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +4 -1
  111. metadata +21 -306
  112. data/.gitignore +0 -10
  113. data/.travis.yml +0 -45
  114. data/.yardopts +0 -9
  115. data/CONTRIBUTING.md +0 -14
  116. data/Gemfile +0 -29
  117. data/Gemfile.lock +0 -191
  118. data/Rakefile +0 -36
  119. data/devise.gemspec +0 -29
  120. data/devise.png +0 -0
  121. data/gemfiles/Gemfile.rails-3.2-stable +0 -29
  122. data/gemfiles/Gemfile.rails-3.2-stable.lock +0 -169
  123. data/gemfiles/Gemfile.rails-4.0-stable +0 -29
  124. data/gemfiles/Gemfile.rails-4.0-stable.lock +0 -163
  125. data/gemfiles/Gemfile.rails-4.1-stable +0 -29
  126. data/gemfiles/Gemfile.rails-4.1-stable.lock +0 -169
  127. data/gemfiles/Gemfile.rails-4.2-stable +0 -29
  128. data/gemfiles/Gemfile.rails-4.2-stable.lock +0 -191
  129. data/script/cached-bundle +0 -49
  130. data/script/s3-put +0 -71
  131. data/test/controllers/custom_registrations_controller_test.rb +0 -40
  132. data/test/controllers/custom_strategy_test.rb +0 -62
  133. data/test/controllers/helpers_test.rb +0 -316
  134. data/test/controllers/inherited_controller_i18n_messages_test.rb +0 -51
  135. data/test/controllers/internal_helpers_test.rb +0 -129
  136. data/test/controllers/load_hooks_controller_test.rb +0 -19
  137. data/test/controllers/passwords_controller_test.rb +0 -31
  138. data/test/controllers/sessions_controller_test.rb +0 -103
  139. data/test/controllers/url_helpers_test.rb +0 -65
  140. data/test/delegator_test.rb +0 -19
  141. data/test/devise_test.rb +0 -107
  142. data/test/failure_app_test.rb +0 -298
  143. data/test/generators/active_record_generator_test.rb +0 -109
  144. data/test/generators/controllers_generator_test.rb +0 -48
  145. data/test/generators/devise_generator_test.rb +0 -39
  146. data/test/generators/install_generator_test.rb +0 -13
  147. data/test/generators/mongoid_generator_test.rb +0 -23
  148. data/test/generators/views_generator_test.rb +0 -96
  149. data/test/helpers/devise_helper_test.rb +0 -49
  150. data/test/integration/authenticatable_test.rb +0 -729
  151. data/test/integration/confirmable_test.rb +0 -324
  152. data/test/integration/database_authenticatable_test.rb +0 -95
  153. data/test/integration/http_authenticatable_test.rb +0 -105
  154. data/test/integration/lockable_test.rb +0 -239
  155. data/test/integration/omniauthable_test.rb +0 -133
  156. data/test/integration/recoverable_test.rb +0 -347
  157. data/test/integration/registerable_test.rb +0 -359
  158. data/test/integration/rememberable_test.rb +0 -176
  159. data/test/integration/timeoutable_test.rb +0 -189
  160. data/test/integration/trackable_test.rb +0 -92
  161. data/test/mailers/confirmation_instructions_test.rb +0 -115
  162. data/test/mailers/reset_password_instructions_test.rb +0 -96
  163. data/test/mailers/unlock_instructions_test.rb +0 -91
  164. data/test/mapping_test.rb +0 -134
  165. data/test/models/authenticatable_test.rb +0 -23
  166. data/test/models/confirmable_test.rb +0 -468
  167. data/test/models/database_authenticatable_test.rb +0 -249
  168. data/test/models/lockable_test.rb +0 -328
  169. data/test/models/omniauthable_test.rb +0 -7
  170. data/test/models/recoverable_test.rb +0 -228
  171. data/test/models/registerable_test.rb +0 -7
  172. data/test/models/rememberable_test.rb +0 -204
  173. data/test/models/serializable_test.rb +0 -49
  174. data/test/models/timeoutable_test.rb +0 -51
  175. data/test/models/trackable_test.rb +0 -41
  176. data/test/models/validatable_test.rb +0 -127
  177. data/test/models_test.rb +0 -144
  178. data/test/omniauth/config_test.rb +0 -57
  179. data/test/omniauth/url_helpers_test.rb +0 -54
  180. data/test/orm/active_record.rb +0 -10
  181. data/test/orm/mongoid.rb +0 -13
  182. data/test/parameter_sanitizer_test.rb +0 -81
  183. data/test/rails_app/Rakefile +0 -6
  184. data/test/rails_app/app/active_record/admin.rb +0 -6
  185. data/test/rails_app/app/active_record/shim.rb +0 -2
  186. data/test/rails_app/app/active_record/user.rb +0 -6
  187. data/test/rails_app/app/active_record/user_on_engine.rb +0 -7
  188. data/test/rails_app/app/active_record/user_on_main_app.rb +0 -7
  189. data/test/rails_app/app/controllers/admins/sessions_controller.rb +0 -6
  190. data/test/rails_app/app/controllers/admins_controller.rb +0 -11
  191. data/test/rails_app/app/controllers/application_controller.rb +0 -12
  192. data/test/rails_app/app/controllers/application_with_fake_engine.rb +0 -30
  193. data/test/rails_app/app/controllers/custom/registrations_controller.rb +0 -31
  194. data/test/rails_app/app/controllers/home_controller.rb +0 -25
  195. data/test/rails_app/app/controllers/publisher/registrations_controller.rb +0 -2
  196. data/test/rails_app/app/controllers/publisher/sessions_controller.rb +0 -2
  197. data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb +0 -14
  198. data/test/rails_app/app/controllers/users_controller.rb +0 -31
  199. data/test/rails_app/app/helpers/application_helper.rb +0 -3
  200. data/test/rails_app/app/mailers/users/from_proc_mailer.rb +0 -3
  201. data/test/rails_app/app/mailers/users/mailer.rb +0 -3
  202. data/test/rails_app/app/mailers/users/reply_to_mailer.rb +0 -4
  203. data/test/rails_app/app/mongoid/admin.rb +0 -29
  204. data/test/rails_app/app/mongoid/shim.rb +0 -23
  205. data/test/rails_app/app/mongoid/user.rb +0 -39
  206. data/test/rails_app/app/mongoid/user_on_engine.rb +0 -39
  207. data/test/rails_app/app/mongoid/user_on_main_app.rb +0 -39
  208. data/test/rails_app/app/views/admins/index.html.erb +0 -1
  209. data/test/rails_app/app/views/admins/sessions/new.html.erb +0 -2
  210. data/test/rails_app/app/views/home/admin_dashboard.html.erb +0 -1
  211. data/test/rails_app/app/views/home/index.html.erb +0 -1
  212. data/test/rails_app/app/views/home/join.html.erb +0 -1
  213. data/test/rails_app/app/views/home/private.html.erb +0 -1
  214. data/test/rails_app/app/views/home/user_dashboard.html.erb +0 -1
  215. data/test/rails_app/app/views/layouts/application.html.erb +0 -24
  216. data/test/rails_app/app/views/users/edit_form.html.erb +0 -1
  217. data/test/rails_app/app/views/users/index.html.erb +0 -1
  218. data/test/rails_app/app/views/users/mailer/confirmation_instructions.erb +0 -1
  219. data/test/rails_app/app/views/users/sessions/new.html.erb +0 -1
  220. data/test/rails_app/bin/bundle +0 -3
  221. data/test/rails_app/bin/rails +0 -4
  222. data/test/rails_app/bin/rake +0 -4
  223. data/test/rails_app/config/application.rb +0 -40
  224. data/test/rails_app/config/boot.rb +0 -14
  225. data/test/rails_app/config/database.yml +0 -18
  226. data/test/rails_app/config/environment.rb +0 -5
  227. data/test/rails_app/config/environments/development.rb +0 -30
  228. data/test/rails_app/config/environments/production.rb +0 -84
  229. data/test/rails_app/config/environments/test.rb +0 -41
  230. data/test/rails_app/config/initializers/backtrace_silencers.rb +0 -7
  231. data/test/rails_app/config/initializers/devise.rb +0 -180
  232. data/test/rails_app/config/initializers/inflections.rb +0 -2
  233. data/test/rails_app/config/initializers/secret_token.rb +0 -8
  234. data/test/rails_app/config/initializers/session_store.rb +0 -1
  235. data/test/rails_app/config/routes.rb +0 -122
  236. data/test/rails_app/config.ru +0 -4
  237. data/test/rails_app/db/migrate/20100401102949_create_tables.rb +0 -71
  238. data/test/rails_app/db/schema.rb +0 -55
  239. data/test/rails_app/lib/shared_admin.rb +0 -17
  240. data/test/rails_app/lib/shared_user.rb +0 -29
  241. data/test/rails_app/lib/shared_user_without_omniauth.rb +0 -13
  242. data/test/rails_app/public/404.html +0 -26
  243. data/test/rails_app/public/422.html +0 -26
  244. data/test/rails_app/public/500.html +0 -26
  245. data/test/rails_app/public/favicon.ico +0 -0
  246. data/test/rails_test.rb +0 -9
  247. data/test/routes_test.rb +0 -264
  248. data/test/support/action_controller/record_identifier.rb +0 -10
  249. data/test/support/assertions.rb +0 -39
  250. data/test/support/helpers.rb +0 -73
  251. data/test/support/integration.rb +0 -92
  252. data/test/support/locale/en.yml +0 -8
  253. data/test/support/mongoid.yml +0 -6
  254. data/test/support/webrat/integrations/rails.rb +0 -24
  255. data/test/test_helper.rb +0 -34
  256. data/test/test_helpers_test.rb +0 -178
  257. data/test/test_models.rb +0 -33
@@ -1,13 +0,0 @@
1
- require "test_helper"
2
-
3
- class InstallGeneratorTest < Rails::Generators::TestCase
4
- tests Devise::Generators::InstallGenerator
5
- destination File.expand_path("../../tmp", __FILE__)
6
- setup :prepare_destination
7
-
8
- test "Assert all files are properly created" do
9
- run_generator
10
- assert_file "config/initializers/devise.rb"
11
- assert_file "config/locales/devise.en.yml"
12
- end
13
- end
@@ -1,23 +0,0 @@
1
- require "test_helper"
2
-
3
- if DEVISE_ORM == :mongoid
4
- require "generators/mongoid/devise_generator"
5
-
6
- class MongoidGeneratorTest < Rails::Generators::TestCase
7
- tests Mongoid::Generators::DeviseGenerator
8
- destination File.expand_path("../../tmp", __FILE__)
9
- setup :prepare_destination
10
-
11
- test "all files are properly created" do
12
- run_generator %w(monster)
13
- assert_file "app/models/monster.rb", /devise/
14
- end
15
-
16
- test "all files are properly deleted" do
17
- run_generator %w(monster)
18
- run_generator %w(monster), behavior: :revoke
19
- assert_no_file "app/models/monster.rb"
20
- end
21
- end
22
- end
23
-
@@ -1,96 +0,0 @@
1
- require "test_helper"
2
-
3
- class ViewsGeneratorTest < Rails::Generators::TestCase
4
- tests Devise::Generators::ViewsGenerator
5
- destination File.expand_path("../../tmp", __FILE__)
6
- setup :prepare_destination
7
-
8
- test "Assert all views are properly created with no params" do
9
- run_generator
10
- assert_files
11
- assert_shared_links
12
- end
13
-
14
- test "Assert all views are properly created with scope param" do
15
- run_generator %w(users)
16
- assert_files "users"
17
- assert_shared_links "users"
18
-
19
- run_generator %w(admins)
20
- assert_files "admins"
21
- assert_shared_links "admins"
22
- end
23
-
24
- test "Assert views with simple form" do
25
- run_generator %w(-b simple_form_for)
26
- assert_files
27
- assert_file "app/views/devise/confirmations/new.html.erb", /simple_form_for/
28
-
29
- run_generator %w(users -b simple_form_for)
30
- assert_files "users"
31
- assert_file "app/views/users/confirmations/new.html.erb", /simple_form_for/
32
- end
33
-
34
- test "Assert views with markerb" do
35
- run_generator %w(--markerb)
36
- assert_files nil, mail_template_engine: "markerb"
37
- end
38
-
39
-
40
- test "Assert only views within specified directories" do
41
- run_generator %w(-v sessions registrations)
42
- assert_file "app/views/devise/sessions/new.html.erb"
43
- assert_file "app/views/devise/registrations/new.html.erb"
44
- assert_file "app/views/devise/registrations/edit.html.erb"
45
- assert_no_file "app/views/devise/confirmations/new.html.erb"
46
- assert_no_file "app/views/devise/mailer/confirmation_instructions.html.erb"
47
- end
48
-
49
- test "Assert specified directories with scope" do
50
- run_generator %w(users -v sessions)
51
- assert_file "app/views/users/sessions/new.html.erb"
52
- assert_no_file "app/views/users/confirmations/new.html.erb"
53
- end
54
-
55
- test "Assert specified directories with simple form" do
56
- run_generator %w(-v registrations -b simple_form_for)
57
- assert_file "app/views/devise/registrations/new.html.erb", /simple_form_for/
58
- assert_no_file "app/views/devise/confirmations/new.html.erb"
59
- end
60
-
61
- test "Assert specified directories with markerb" do
62
- run_generator %w(--markerb -v passwords mailer)
63
- assert_file "app/views/devise/passwords/new.html.erb"
64
- assert_no_file "app/views/devise/confirmations/new.html.erb"
65
- assert_file "app/views/devise/mailer/reset_password_instructions.markerb"
66
- end
67
-
68
- def assert_files(scope = nil, options={})
69
- scope = "devise" if scope.nil?
70
- mail_template_engine = options[:mail_template_engine] || "html.erb"
71
-
72
- assert_file "app/views/#{scope}/confirmations/new.html.erb"
73
- assert_file "app/views/#{scope}/mailer/confirmation_instructions.#{mail_template_engine}"
74
- assert_file "app/views/#{scope}/mailer/reset_password_instructions.#{mail_template_engine}"
75
- assert_file "app/views/#{scope}/mailer/unlock_instructions.#{mail_template_engine}"
76
- assert_file "app/views/#{scope}/passwords/edit.html.erb"
77
- assert_file "app/views/#{scope}/passwords/new.html.erb"
78
- assert_file "app/views/#{scope}/registrations/new.html.erb"
79
- assert_file "app/views/#{scope}/registrations/edit.html.erb"
80
- assert_file "app/views/#{scope}/sessions/new.html.erb"
81
- assert_file "app/views/#{scope}/shared/_links.html.erb"
82
- assert_file "app/views/#{scope}/unlocks/new.html.erb"
83
- end
84
-
85
- def assert_shared_links(scope = nil)
86
- scope = "devise" if scope.nil?
87
- link = /<%= render \"#{scope}\/shared\/links\" %>/
88
-
89
- assert_file "app/views/#{scope}/passwords/edit.html.erb", link
90
- assert_file "app/views/#{scope}/passwords/new.html.erb", link
91
- assert_file "app/views/#{scope}/confirmations/new.html.erb", link
92
- assert_file "app/views/#{scope}/registrations/new.html.erb", link
93
- assert_file "app/views/#{scope}/sessions/new.html.erb", link
94
- assert_file "app/views/#{scope}/unlocks/new.html.erb", link
95
- end
96
- end
@@ -1,49 +0,0 @@
1
- require 'test_helper'
2
-
3
- class DeviseHelperTest < ActionDispatch::IntegrationTest
4
- setup do
5
- model_labels = { models: { user: "the user" } }
6
- translations = {
7
- errors: { messages: { not_saved: {
8
- one: "Can't save %{resource} because of 1 error",
9
- other: "Can't save %{resource} because of %{count} errors",
10
- } } },
11
- activerecord: model_labels,
12
- mongoid: model_labels
13
- }
14
-
15
- I18n.available_locales
16
- I18n.backend.store_translations(:en, translations)
17
- end
18
-
19
- teardown do
20
- I18n.reload!
21
- end
22
-
23
- test 'test errors.messages.not_saved with single error from i18n' do
24
- get new_user_registration_path
25
-
26
- fill_in 'password', with: 'new_user123'
27
- fill_in 'password confirmation', with: 'new_user123'
28
- click_button 'Sign up'
29
-
30
- assert_have_selector '#error_explanation'
31
- assert_contain "Can't save the user because of 1 error"
32
- end
33
-
34
- test 'test errors.messages.not_saved with multiple errors from i18n' do
35
- # Dirty tracking behavior prevents email validations from being applied:
36
- # https://github.com/mongoid/mongoid/issues/756
37
- (pending "Fails on Mongoid < 2.1"; break) if defined?(Mongoid) && Mongoid::VERSION.to_f < 2.1
38
-
39
- get new_user_registration_path
40
-
41
- fill_in 'email', with: 'invalid_email'
42
- fill_in 'password', with: 'new_user123'
43
- fill_in 'password confirmation', with: 'new_user321'
44
- click_button 'Sign up'
45
-
46
- assert_have_selector '#error_explanation'
47
- assert_contain "Can't save the user because of 2 errors"
48
- end
49
- end