devise 3.5.10 → 4.8.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (258) hide show
  1. checksums.yaml +5 -5
  2. data/CHANGELOG.md +279 -1126
  3. data/MIT-LICENSE +2 -1
  4. data/README.md +291 -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 +7 -4
  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 +10 -4
  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/passwords/edit.html.erb +3 -3
  17. data/app/views/devise/passwords/new.html.erb +2 -2
  18. data/app/views/devise/registrations/edit.html.erb +9 -5
  19. data/app/views/devise/registrations/new.html.erb +4 -4
  20. data/app/views/devise/sessions/new.html.erb +4 -4
  21. data/app/views/devise/shared/_error_messages.html.erb +15 -0
  22. data/app/views/devise/shared/_links.html.erb +8 -8
  23. data/app/views/devise/unlocks/new.html.erb +2 -2
  24. data/config/locales/en.yml +5 -2
  25. data/lib/devise.rb +57 -40
  26. data/lib/devise/controllers/helpers.rb +30 -27
  27. data/lib/devise/controllers/rememberable.rb +3 -1
  28. data/lib/devise/controllers/scoped_views.rb +2 -0
  29. data/lib/devise/controllers/sign_in_out.rb +39 -14
  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 +75 -38
  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 +4 -2
  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.rb +3 -1
  46. data/lib/devise/models/authenticatable.rb +63 -33
  47. data/lib/devise/models/confirmable.rb +90 -29
  48. data/lib/devise/models/database_authenticatable.rb +93 -22
  49. data/lib/devise/models/lockable.rb +19 -5
  50. data/lib/devise/models/omniauthable.rb +2 -0
  51. data/lib/devise/models/recoverable.rb +33 -21
  52. data/lib/devise/models/registerable.rb +4 -0
  53. data/lib/devise/models/rememberable.rb +6 -11
  54. data/lib/devise/models/timeoutable.rb +2 -0
  55. data/lib/devise/models/trackable.rb +15 -1
  56. data/lib/devise/models/validatable.rb +10 -3
  57. data/lib/devise/modules.rb +2 -0
  58. data/lib/devise/omniauth.rb +4 -5
  59. data/lib/devise/omniauth/config.rb +2 -0
  60. data/lib/devise/omniauth/url_helpers.rb +14 -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.rb +7 -16
  66. data/lib/devise/rails/deprecated_constant_accessor.rb +39 -0
  67. data/lib/devise/rails/routes.rb +48 -37
  68. data/lib/devise/rails/warden_compat.rb +3 -10
  69. data/lib/devise/secret_key_finder.rb +27 -0
  70. data/lib/devise/strategies/authenticatable.rb +3 -1
  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 +2 -0
  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/generators/active_record/devise_generator.rb +46 -12
  81. data/lib/generators/active_record/templates/migration.rb +4 -2
  82. data/lib/generators/active_record/templates/migration_existing.rb +4 -2
  83. data/lib/generators/devise/controllers_generator.rb +3 -1
  84. data/lib/generators/devise/devise_generator.rb +5 -3
  85. data/lib/generators/devise/install_generator.rb +18 -5
  86. data/lib/generators/devise/orm_helpers.rb +10 -21
  87. data/lib/generators/devise/views_generator.rb +8 -9
  88. data/lib/generators/mongoid/devise_generator.rb +7 -5
  89. data/lib/generators/templates/README +9 -8
  90. data/lib/generators/templates/controllers/confirmations_controller.rb +2 -0
  91. data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +3 -1
  92. data/lib/generators/templates/controllers/passwords_controller.rb +2 -0
  93. data/lib/generators/templates/controllers/registrations_controller.rb +6 -4
  94. data/lib/generators/templates/controllers/sessions_controller.rb +4 -2
  95. data/lib/generators/templates/controllers/unlocks_controller.rb +2 -0
  96. data/lib/generators/templates/devise.rb +63 -21
  97. data/lib/generators/templates/markerb/email_changed.markerb +7 -0
  98. data/lib/generators/templates/markerb/password_change.markerb +2 -2
  99. data/lib/generators/templates/simple_form_for/confirmations/new.html.erb +5 -1
  100. data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +10 -2
  101. data/lib/generators/templates/simple_form_for/passwords/new.html.erb +4 -1
  102. data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +11 -3
  103. data/lib/generators/templates/simple_form_for/registrations/new.html.erb +11 -3
  104. data/lib/generators/templates/simple_form_for/sessions/new.html.erb +7 -2
  105. data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +4 -1
  106. metadata +19 -317
  107. data/.gitignore +0 -10
  108. data/.travis.yml +0 -44
  109. data/.yardopts +0 -9
  110. data/CODE_OF_CONDUCT.md +0 -22
  111. data/CONTRIBUTING.md +0 -16
  112. data/Gemfile +0 -30
  113. data/Gemfile.lock +0 -187
  114. data/Rakefile +0 -36
  115. data/devise.gemspec +0 -27
  116. data/devise.png +0 -0
  117. data/gemfiles/Gemfile.rails-3.2-stable +0 -29
  118. data/gemfiles/Gemfile.rails-3.2-stable.lock +0 -172
  119. data/gemfiles/Gemfile.rails-4.0-stable +0 -30
  120. data/gemfiles/Gemfile.rails-4.0-stable.lock +0 -166
  121. data/gemfiles/Gemfile.rails-4.1-stable +0 -30
  122. data/gemfiles/Gemfile.rails-4.1-stable.lock +0 -171
  123. data/gemfiles/Gemfile.rails-4.2-stable +0 -30
  124. data/gemfiles/Gemfile.rails-4.2-stable.lock +0 -193
  125. data/script/cached-bundle +0 -49
  126. data/script/s3-put +0 -71
  127. data/test/controllers/custom_registrations_controller_test.rb +0 -40
  128. data/test/controllers/custom_strategy_test.rb +0 -62
  129. data/test/controllers/helper_methods_test.rb +0 -21
  130. data/test/controllers/helpers_test.rb +0 -316
  131. data/test/controllers/inherited_controller_i18n_messages_test.rb +0 -51
  132. data/test/controllers/internal_helpers_test.rb +0 -129
  133. data/test/controllers/load_hooks_controller_test.rb +0 -19
  134. data/test/controllers/passwords_controller_test.rb +0 -31
  135. data/test/controllers/sessions_controller_test.rb +0 -103
  136. data/test/controllers/url_helpers_test.rb +0 -65
  137. data/test/delegator_test.rb +0 -19
  138. data/test/devise_test.rb +0 -107
  139. data/test/failure_app_test.rb +0 -315
  140. data/test/generators/active_record_generator_test.rb +0 -109
  141. data/test/generators/controllers_generator_test.rb +0 -48
  142. data/test/generators/devise_generator_test.rb +0 -39
  143. data/test/generators/install_generator_test.rb +0 -13
  144. data/test/generators/mongoid_generator_test.rb +0 -23
  145. data/test/generators/views_generator_test.rb +0 -103
  146. data/test/helpers/devise_helper_test.rb +0 -49
  147. data/test/integration/authenticatable_test.rb +0 -729
  148. data/test/integration/confirmable_test.rb +0 -324
  149. data/test/integration/database_authenticatable_test.rb +0 -95
  150. data/test/integration/http_authenticatable_test.rb +0 -105
  151. data/test/integration/lockable_test.rb +0 -239
  152. data/test/integration/omniauthable_test.rb +0 -135
  153. data/test/integration/recoverable_test.rb +0 -347
  154. data/test/integration/registerable_test.rb +0 -359
  155. data/test/integration/rememberable_test.rb +0 -214
  156. data/test/integration/timeoutable_test.rb +0 -184
  157. data/test/integration/trackable_test.rb +0 -92
  158. data/test/mailers/confirmation_instructions_test.rb +0 -115
  159. data/test/mailers/reset_password_instructions_test.rb +0 -96
  160. data/test/mailers/unlock_instructions_test.rb +0 -91
  161. data/test/mapping_test.rb +0 -134
  162. data/test/models/authenticatable_test.rb +0 -23
  163. data/test/models/confirmable_test.rb +0 -511
  164. data/test/models/database_authenticatable_test.rb +0 -269
  165. data/test/models/lockable_test.rb +0 -350
  166. data/test/models/omniauthable_test.rb +0 -7
  167. data/test/models/recoverable_test.rb +0 -251
  168. data/test/models/registerable_test.rb +0 -7
  169. data/test/models/rememberable_test.rb +0 -169
  170. data/test/models/serializable_test.rb +0 -49
  171. data/test/models/timeoutable_test.rb +0 -51
  172. data/test/models/trackable_test.rb +0 -41
  173. data/test/models/validatable_test.rb +0 -127
  174. data/test/models_test.rb +0 -153
  175. data/test/omniauth/config_test.rb +0 -57
  176. data/test/omniauth/url_helpers_test.rb +0 -54
  177. data/test/orm/active_record.rb +0 -10
  178. data/test/orm/mongoid.rb +0 -13
  179. data/test/parameter_sanitizer_test.rb +0 -81
  180. data/test/rails_app/Rakefile +0 -6
  181. data/test/rails_app/app/active_record/admin.rb +0 -6
  182. data/test/rails_app/app/active_record/shim.rb +0 -2
  183. data/test/rails_app/app/active_record/user.rb +0 -6
  184. data/test/rails_app/app/active_record/user_on_engine.rb +0 -7
  185. data/test/rails_app/app/active_record/user_on_main_app.rb +0 -7
  186. data/test/rails_app/app/active_record/user_without_email.rb +0 -8
  187. data/test/rails_app/app/controllers/admins/sessions_controller.rb +0 -6
  188. data/test/rails_app/app/controllers/admins_controller.rb +0 -6
  189. data/test/rails_app/app/controllers/application_controller.rb +0 -12
  190. data/test/rails_app/app/controllers/application_with_fake_engine.rb +0 -30
  191. data/test/rails_app/app/controllers/custom/registrations_controller.rb +0 -31
  192. data/test/rails_app/app/controllers/home_controller.rb +0 -25
  193. data/test/rails_app/app/controllers/publisher/registrations_controller.rb +0 -2
  194. data/test/rails_app/app/controllers/publisher/sessions_controller.rb +0 -2
  195. data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb +0 -14
  196. data/test/rails_app/app/controllers/users_controller.rb +0 -31
  197. data/test/rails_app/app/helpers/application_helper.rb +0 -3
  198. data/test/rails_app/app/mailers/users/from_proc_mailer.rb +0 -3
  199. data/test/rails_app/app/mailers/users/mailer.rb +0 -3
  200. data/test/rails_app/app/mailers/users/reply_to_mailer.rb +0 -4
  201. data/test/rails_app/app/mongoid/admin.rb +0 -29
  202. data/test/rails_app/app/mongoid/shim.rb +0 -23
  203. data/test/rails_app/app/mongoid/user.rb +0 -39
  204. data/test/rails_app/app/mongoid/user_on_engine.rb +0 -39
  205. data/test/rails_app/app/mongoid/user_on_main_app.rb +0 -39
  206. data/test/rails_app/app/mongoid/user_without_email.rb +0 -33
  207. data/test/rails_app/app/views/admins/index.html.erb +0 -1
  208. data/test/rails_app/app/views/admins/sessions/new.html.erb +0 -2
  209. data/test/rails_app/app/views/home/admin_dashboard.html.erb +0 -1
  210. data/test/rails_app/app/views/home/index.html.erb +0 -1
  211. data/test/rails_app/app/views/home/join.html.erb +0 -1
  212. data/test/rails_app/app/views/home/private.html.erb +0 -1
  213. data/test/rails_app/app/views/home/user_dashboard.html.erb +0 -1
  214. data/test/rails_app/app/views/layouts/application.html.erb +0 -24
  215. data/test/rails_app/app/views/users/edit_form.html.erb +0 -1
  216. data/test/rails_app/app/views/users/index.html.erb +0 -1
  217. data/test/rails_app/app/views/users/mailer/confirmation_instructions.erb +0 -1
  218. data/test/rails_app/app/views/users/sessions/new.html.erb +0 -1
  219. data/test/rails_app/bin/bundle +0 -3
  220. data/test/rails_app/bin/rails +0 -4
  221. data/test/rails_app/bin/rake +0 -4
  222. data/test/rails_app/config.ru +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 -125
  236. data/test/rails_app/db/migrate/20100401102949_create_tables.rb +0 -71
  237. data/test/rails_app/db/schema.rb +0 -55
  238. data/test/rails_app/lib/shared_admin.rb +0 -17
  239. data/test/rails_app/lib/shared_user.rb +0 -29
  240. data/test/rails_app/lib/shared_user_without_email.rb +0 -26
  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 -77
  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
  258. data/test/time_helpers.rb +0 -137
data/script/cached-bundle DELETED
@@ -1,49 +0,0 @@
1
- #!/usr/bin/env bash
2
- # Usage: cached-bundle install --deployment
3
- #
4
- # After running `bundle`, caches the `vendor/bundle` directory to S3.
5
- # On the next run, restores the cached directory before running `bundle`.
6
- # When `Gemfile.lock` changes, the cache gets rebuilt.
7
- #
8
- # Requirements:
9
- # - Gemfile.lock
10
- # - TRAVIS_REPO_SLUG
11
- # - TRAVIS_RUBY_VERSION
12
- # - AMAZON_S3_BUCKET
13
- # - script/s3-put
14
- # - bundle
15
- # - curl
16
- #
17
- # Author: Mislav Marohnić
18
-
19
- set -e
20
-
21
- compute_md5() {
22
- local output="$(openssl md5)"
23
- echo "${output##* }"
24
- }
25
-
26
- download() {
27
- curl --tcp-nodelay -qsfL "$1" -o "$2"
28
- }
29
-
30
-
31
- gemfile="${BUNDLE_GEMFILE:-Gemfile}"
32
- bundle_fullpath="$(dirname $gemfile)/vendor/bundle"
33
- bundle_path=${bundle_fullpath#$PWD/}
34
- gemfile_hash="$(compute_md5 <"${gemfile}.lock")"
35
- cache_name="${TRAVIS_RUBY_VERSION}-${gemfile_hash}.tgz"
36
- fetch_url="http://${AMAZON_S3_BUCKET}.s3.amazonaws.com/${TRAVIS_REPO_SLUG}/${cache_name}"
37
-
38
- if download "$fetch_url" "$cache_name"; then
39
- echo "Reusing cached bundle ${cache_name}"
40
- tar xzf "$cache_name"
41
- fi
42
-
43
- bundle "$@"
44
-
45
- if [ ! -f "$cache_name" ] && [ -n "$AMAZON_SECRET_ACCESS_KEY" ]; then
46
- echo "Caching \`${bundle_path}' to S3"
47
- tar czf "$cache_name" "$bundle_path"
48
- script/s3-put "$cache_name" "${AMAZON_S3_BUCKET}:${TRAVIS_REPO_SLUG}/${cache_name}"
49
- fi
data/script/s3-put DELETED
@@ -1,71 +0,0 @@
1
- #!/usr/bin/env bash
2
- # Usage: s3-put <FILE> <S3_BUCKET>[:<PATH>] [<CONTENT_TYPE>]
3
- #
4
- # Uploads a file to the Amazon S3 service.
5
- # Outputs the URL for the newly uploaded file.
6
- #
7
- # Requirements:
8
- # - AMAZON_ACCESS_KEY_ID
9
- # - AMAZON_SECRET_ACCESS_KEY
10
- # - openssl
11
- # - curl
12
- #
13
- # Author: Mislav Marohnić
14
-
15
- set -e
16
-
17
- authorization() {
18
- local signature="$(string_to_sign | hmac_sha1 | base64)"
19
- echo "AWS ${AMAZON_ACCESS_KEY_ID?}:${signature}"
20
- }
21
-
22
- hmac_sha1() {
23
- openssl dgst -binary -sha1 -hmac "${AMAZON_SECRET_ACCESS_KEY?}"
24
- }
25
-
26
- base64() {
27
- openssl enc -base64
28
- }
29
-
30
- bin_md5() {
31
- openssl dgst -binary -md5
32
- }
33
-
34
- string_to_sign() {
35
- echo "$http_method"
36
- echo "$content_md5"
37
- echo "$content_type"
38
- echo "$date"
39
- echo "x-amz-acl:$acl"
40
- printf "/$bucket/$remote_path"
41
- }
42
-
43
- date_string() {
44
- LC_TIME=C date "+%a, %d %h %Y %T %z"
45
- }
46
-
47
- file="$1"
48
- bucket="${2%%:*}"
49
- remote_path="${2#*:}"
50
- content_type="$3"
51
-
52
- if [ -z "$remote_path" ] || [ "$remote_path" = "$bucket" ]; then
53
- remote_path="${file##*/}"
54
- fi
55
-
56
- http_method=PUT
57
- acl="public-read"
58
- content_md5="$(bin_md5 < "$file" | base64)"
59
- date="$(date_string)"
60
-
61
- url="https://$bucket.s3.amazonaws.com/$remote_path"
62
-
63
- curl -qsSf -T "$file" \
64
- -H "Authorization: $(authorization)" \
65
- -H "x-amz-acl: $acl" \
66
- -H "Date: $date" \
67
- -H "Content-MD5: $content_md5" \
68
- -H "Content-Type: $content_type" \
69
- "$url"
70
-
71
- echo "$url"
@@ -1,40 +0,0 @@
1
- require 'test_helper'
2
-
3
- class CustomRegistrationsControllerTest < ActionController::TestCase
4
- tests Custom::RegistrationsController
5
-
6
- include Devise::TestHelpers
7
-
8
- setup do
9
- request.env["devise.mapping"] = Devise.mappings[:user]
10
- @password = 'password'
11
- @user = create_user(password: @password, password_confirmation: @password).tap(&:confirm)
12
- end
13
-
14
- test "yield resource to block on create success" do
15
- post :create, { user: { email: "user@example.org", password: "password", password_confirmation: "password" } }
16
- assert @controller.create_block_called?, "create failed to yield resource to provided block"
17
- end
18
-
19
- test "yield resource to block on create failure" do
20
- post :create, { user: { } }
21
- assert @controller.create_block_called?, "create failed to yield resource to provided block"
22
- end
23
-
24
- test "yield resource to block on update success" do
25
- sign_in @user
26
- put :update, { user: { current_password: @password } }
27
- assert @controller.update_block_called?, "update failed to yield resource to provided block"
28
- end
29
-
30
- test "yield resource to block on update failure" do
31
- sign_in @user
32
- put :update, { user: { } }
33
- assert @controller.update_block_called?, "update failed to yield resource to provided block"
34
- end
35
-
36
- test "yield resource to block on new" do
37
- get :new
38
- assert @controller.new_block_called?, "new failed to yield resource to provided block"
39
- end
40
- end
@@ -1,62 +0,0 @@
1
- require 'test_helper'
2
- require 'ostruct'
3
- require 'warden/strategies/base'
4
- require 'devise/test_helpers'
5
-
6
- class CustomStrategyController < ActionController::Base
7
- def new
8
- warden.authenticate!(:custom_strategy)
9
- end
10
- end
11
-
12
- # These tests are to prove that a warden strategy can successfully
13
- # return a custom response, including a specific status code and
14
- # custom http response headers. This does work in production,
15
- # however, at the time of writing this, the Devise test helpers do
16
- # not recognise the custom response and proceed to calling the
17
- # Failure App. This makes it impossible to write tests for a
18
- # strategy that return a custom response with Devise.
19
- class CustomStrategy < Warden::Strategies::Base
20
- def authenticate!
21
- custom_headers = { "X-FOO" => "BAR" }
22
- response = Rack::Response.new("BAD REQUEST", 400, custom_headers)
23
- custom! response.finish
24
- end
25
- end
26
-
27
- class CustomStrategyTest < ActionController::TestCase
28
- tests CustomStrategyController
29
-
30
- include Devise::TestHelpers
31
-
32
- setup do
33
- Warden::Strategies.add(:custom_strategy, CustomStrategy)
34
- end
35
-
36
- teardown do
37
- Warden::Strategies._strategies.delete(:custom_strategy)
38
- end
39
-
40
- test "custom strategy can return its own status code" do
41
- ret = get :new
42
-
43
- # check the returned rack array
44
- assert ret.is_a?(Array)
45
- assert_equal 400, ret.first
46
-
47
- # check the saved response as well. This is purely so that the response is available to the testing framework
48
- # for verification. In production, the above array would be delivered directly to Rack.
49
- assert_response 400
50
- end
51
-
52
- test "custom strategy can return custom headers" do
53
- ret = get :new
54
-
55
- # check the returned rack array
56
- assert ret.is_a?(Array)
57
- assert_equal ret.third['X-FOO'], 'BAR'
58
-
59
- # check the saved response headers as well.
60
- assert_equal response.headers['X-FOO'], 'BAR'
61
- end
62
- end
@@ -1,21 +0,0 @@
1
- require 'test_helper'
2
-
3
- class ApiController < ActionController::Metal
4
- include Devise::Controllers::Helpers
5
- end
6
-
7
- class HelperMethodsTest < ActionController::TestCase
8
- tests ApiController
9
-
10
- test 'includes Devise::Controllers::Helpers' do
11
- assert_includes @controller.class.ancestors, Devise::Controllers::Helpers
12
- end
13
-
14
- test 'does not respond_to helper_method' do
15
- refute_respond_to @controller.class, :helper_method
16
- end
17
-
18
- test 'defines methods like current_user' do
19
- assert_respond_to @controller, :current_user
20
- end
21
- end
@@ -1,316 +0,0 @@
1
- require 'test_helper'
2
- require 'ostruct'
3
-
4
- class ControllerAuthenticatableTest < ActionController::TestCase
5
- tests ApplicationController
6
-
7
- def setup
8
- @mock_warden = OpenStruct.new
9
- @controller.request.env['warden'] = @mock_warden
10
- end
11
-
12
- test 'provide access to warden instance' do
13
- assert_equal @mock_warden, @controller.warden
14
- end
15
-
16
- test 'proxy signed_in?(scope) to authenticate?' do
17
- @mock_warden.expects(:authenticate?).with(scope: :my_scope)
18
- @controller.signed_in?(:my_scope)
19
- end
20
-
21
- test 'proxy signed_in?(nil) to authenticate?' do
22
- Devise.mappings.keys.each do |scope| # :user, :admin, :manager
23
- @mock_warden.expects(:authenticate?).with(scope: scope)
24
- end
25
- @controller.signed_in?
26
- end
27
-
28
- test 'proxy [group]_signed_in? to authenticate? with each scope' do
29
- [:user, :admin].each do |scope|
30
- @mock_warden.expects(:authenticate?).with(scope: scope).returns(false)
31
- end
32
- @controller.commenter_signed_in?
33
- end
34
-
35
- test 'proxy current_user to authenticate with user scope' do
36
- @mock_warden.expects(:authenticate).with(scope: :user)
37
- @controller.current_user
38
- end
39
-
40
- test 'proxy current_admin to authenticate with admin scope' do
41
- @mock_warden.expects(:authenticate).with(scope: :admin)
42
- @controller.current_admin
43
- end
44
-
45
- test 'proxy current_[group] to authenticate with each scope' do
46
- [:user, :admin].each do |scope|
47
- @mock_warden.expects(:authenticate).with(scope: scope).returns(nil)
48
- end
49
- @controller.current_commenter
50
- end
51
-
52
- test 'proxy current_[plural_group] to authenticate with each scope' do
53
- [:user, :admin].each do |scope|
54
- @mock_warden.expects(:authenticate).with(scope: scope)
55
- end
56
- @controller.current_commenters
57
- end
58
-
59
- test 'proxy current_publisher_account to authenticate with namespaced publisher account scope' do
60
- @mock_warden.expects(:authenticate).with(scope: :publisher_account)
61
- @controller.current_publisher_account
62
- end
63
-
64
- test 'proxy authenticate_user! to authenticate with user scope' do
65
- @mock_warden.expects(:authenticate!).with(scope: :user)
66
- @controller.authenticate_user!
67
- end
68
-
69
- test 'proxy authenticate_user! options to authenticate with user scope' do
70
- @mock_warden.expects(:authenticate!).with(scope: :user, recall: "foo")
71
- @controller.authenticate_user!(recall: "foo")
72
- end
73
-
74
- test 'proxy authenticate_admin! to authenticate with admin scope' do
75
- @mock_warden.expects(:authenticate!).with(scope: :admin)
76
- @controller.authenticate_admin!
77
- end
78
-
79
- test 'proxy authenticate_[group]! to authenticate!? with each scope' do
80
- [:user, :admin].each do |scope|
81
- @mock_warden.expects(:authenticate!).with(scope: scope)
82
- @mock_warden.expects(:authenticate?).with(scope: scope).returns(false)
83
- end
84
- @controller.authenticate_commenter!
85
- end
86
-
87
- test 'proxy authenticate_publisher_account! to authenticate with namespaced publisher account scope' do
88
- @mock_warden.expects(:authenticate!).with(scope: :publisher_account)
89
- @controller.authenticate_publisher_account!
90
- end
91
-
92
- test 'proxy user_signed_in? to authenticate with user scope' do
93
- @mock_warden.expects(:authenticate).with(scope: :user).returns("user")
94
- assert @controller.user_signed_in?
95
- end
96
-
97
- test 'proxy admin_signed_in? to authenticatewith admin scope' do
98
- @mock_warden.expects(:authenticate).with(scope: :admin)
99
- assert_not @controller.admin_signed_in?
100
- end
101
-
102
- test 'proxy publisher_account_signed_in? to authenticate with namespaced publisher account scope' do
103
- @mock_warden.expects(:authenticate).with(scope: :publisher_account)
104
- @controller.publisher_account_signed_in?
105
- end
106
-
107
- test 'proxy user_session to session scope in warden' do
108
- @mock_warden.expects(:authenticate).with(scope: :user).returns(true)
109
- @mock_warden.expects(:session).with(:user).returns({})
110
- @controller.user_session
111
- end
112
-
113
- test 'proxy admin_session to session scope in warden' do
114
- @mock_warden.expects(:authenticate).with(scope: :admin).returns(true)
115
- @mock_warden.expects(:session).with(:admin).returns({})
116
- @controller.admin_session
117
- end
118
-
119
- test 'proxy publisher_account_session from namespaced scope to session scope in warden' do
120
- @mock_warden.expects(:authenticate).with(scope: :publisher_account).returns(true)
121
- @mock_warden.expects(:session).with(:publisher_account).returns({})
122
- @controller.publisher_account_session
123
- end
124
-
125
- test 'sign in proxy to set_user on warden' do
126
- user = User.new
127
- @mock_warden.expects(:user).returns(nil)
128
- @mock_warden.expects(:set_user).with(user, scope: :user).returns(true)
129
- @controller.sign_in(:user, user)
130
- end
131
-
132
- test 'sign in accepts a resource as argument' do
133
- user = User.new
134
- @mock_warden.expects(:user).returns(nil)
135
- @mock_warden.expects(:set_user).with(user, scope: :user).returns(true)
136
- @controller.sign_in(user)
137
- end
138
-
139
- test 'does not sign in again if the user is already in' do
140
- user = User.new
141
- @mock_warden.expects(:user).returns(user)
142
- @mock_warden.expects(:set_user).never
143
- assert @controller.sign_in(user)
144
- end
145
-
146
- test 'sign in again when the user is already in only if force is given' do
147
- user = User.new
148
- @mock_warden.expects(:user).returns(user)
149
- @mock_warden.expects(:set_user).with(user, scope: :user).returns(true)
150
- @controller.sign_in(user, force: true)
151
- end
152
-
153
- test 'sign in accepts bypass as option' do
154
- user = User.new
155
- @mock_warden.expects(:session_serializer).returns(serializer = mock())
156
- serializer.expects(:store).with(user, :user)
157
- @controller.sign_in(user, bypass: true)
158
- end
159
-
160
- test 'sign out clears up any signed in user from all scopes' do
161
- user = User.new
162
- @mock_warden.expects(:user).times(Devise.mappings.size)
163
- @mock_warden.expects(:logout).with().returns(true)
164
- @controller.instance_variable_set(:@current_user, user)
165
- @controller.instance_variable_set(:@current_admin, user)
166
- @controller.sign_out
167
- assert_equal nil, @controller.instance_variable_get(:@current_user)
168
- assert_equal nil, @controller.instance_variable_get(:@current_admin)
169
- end
170
-
171
- test 'sign out logs out and clears up any signed in user by scope' do
172
- user = User.new
173
- @mock_warden.expects(:user).with(scope: :user, run_callbacks: false).returns(user)
174
- @mock_warden.expects(:logout).with(:user).returns(true)
175
- @mock_warden.expects(:clear_strategies_cache!).with(scope: :user).returns(true)
176
- @controller.instance_variable_set(:@current_user, user)
177
- @controller.sign_out(:user)
178
- assert_equal nil, @controller.instance_variable_get(:@current_user)
179
- end
180
-
181
- test 'sign out accepts a resource as argument' do
182
- @mock_warden.expects(:user).with(scope: :user, run_callbacks: false).returns(true)
183
- @mock_warden.expects(:logout).with(:user).returns(true)
184
- @mock_warden.expects(:clear_strategies_cache!).with(scope: :user).returns(true)
185
- @controller.sign_out(User.new)
186
- end
187
-
188
- test 'sign out without args proxy to sign out all scopes' do
189
- @mock_warden.expects(:user).times(Devise.mappings.size)
190
- @mock_warden.expects(:logout).with().returns(true)
191
- @mock_warden.expects(:clear_strategies_cache!).with().returns(true)
192
- @controller.sign_out
193
- end
194
-
195
- test 'sign out everybody proxy to logout on warden' do
196
- @mock_warden.expects(:user).times(Devise.mappings.size)
197
- @mock_warden.expects(:logout).with().returns(true)
198
- @controller.sign_out_all_scopes
199
- end
200
-
201
- test 'stored location for returns the location for a given scope' do
202
- assert_nil @controller.stored_location_for(:user)
203
- @controller.session[:"user_return_to"] = "/foo.bar"
204
- assert_equal "/foo.bar", @controller.stored_location_for(:user)
205
- end
206
-
207
- test 'stored location for accepts a resource as argument' do
208
- assert_nil @controller.stored_location_for(:user)
209
- @controller.session[:"user_return_to"] = "/foo.bar"
210
- assert_equal "/foo.bar", @controller.stored_location_for(User.new)
211
- end
212
-
213
- test 'stored location cleans information after reading' do
214
- @controller.session[:"user_return_to"] = "/foo.bar"
215
- assert_equal "/foo.bar", @controller.stored_location_for(:user)
216
- assert_nil @controller.session[:"user_return_to"]
217
- end
218
-
219
- test 'store location for stores a location to redirect back to' do
220
- assert_nil @controller.stored_location_for(:user)
221
- @controller.store_location_for(:user, "/foo.bar")
222
- assert_equal "/foo.bar", @controller.stored_location_for(:user)
223
- end
224
-
225
- test 'store bad location for stores a location to redirect back to' do
226
- assert_nil @controller.stored_location_for(:user)
227
- @controller.store_location_for(:user, "/foo.bar\">Carry")
228
- assert_nil @controller.stored_location_for(:user)
229
- end
230
-
231
- test 'store location for accepts a resource as argument' do
232
- @controller.store_location_for(User.new, "/foo.bar")
233
- assert_equal "/foo.bar", @controller.stored_location_for(User.new)
234
- end
235
-
236
- test 'store location for stores paths' do
237
- @controller.store_location_for(:user, "//host/foo.bar")
238
- assert_equal "/foo.bar", @controller.stored_location_for(:user)
239
- @controller.store_location_for(:user, "///foo.bar")
240
- assert_equal "/foo.bar", @controller.stored_location_for(:user)
241
- end
242
-
243
- test 'store location for stores query string' do
244
- @controller.store_location_for(:user, "/foo?bar=baz")
245
- assert_equal "/foo?bar=baz", @controller.stored_location_for(:user)
246
- end
247
-
248
- test 'store location for stores fragments' do
249
- @controller.store_location_for(:user, "/foo#bar")
250
- assert_equal "/foo#bar", @controller.stored_location_for(:user)
251
- end
252
-
253
- test 'after sign in path defaults to root path if none by was specified for the given scope' do
254
- assert_equal root_path, @controller.after_sign_in_path_for(:user)
255
- end
256
-
257
- test 'after sign in path defaults to the scoped root path' do
258
- assert_equal admin_root_path, @controller.after_sign_in_path_for(:admin)
259
- end
260
-
261
- test 'after sign out path defaults to the root path' do
262
- assert_equal root_path, @controller.after_sign_out_path_for(:admin)
263
- assert_equal root_path, @controller.after_sign_out_path_for(:user)
264
- end
265
-
266
- test 'sign in and redirect uses the stored location' do
267
- user = User.new
268
- @controller.session[:user_return_to] = "/foo.bar"
269
- @mock_warden.expects(:user).with(:user).returns(nil)
270
- @mock_warden.expects(:set_user).with(user, scope: :user).returns(true)
271
- @controller.expects(:redirect_to).with("/foo.bar")
272
- @controller.sign_in_and_redirect(user)
273
- end
274
-
275
- test 'sign in and redirect uses the configured after sign in path' do
276
- admin = Admin.new
277
- @mock_warden.expects(:user).with(:admin).returns(nil)
278
- @mock_warden.expects(:set_user).with(admin, scope: :admin).returns(true)
279
- @controller.expects(:redirect_to).with(admin_root_path)
280
- @controller.sign_in_and_redirect(admin)
281
- end
282
-
283
- test 'sign in and redirect does not sign in again if user is already signed' do
284
- admin = Admin.new
285
- @mock_warden.expects(:user).with(:admin).returns(admin)
286
- @mock_warden.expects(:set_user).never
287
- @controller.expects(:redirect_to).with(admin_root_path)
288
- @controller.sign_in_and_redirect(admin)
289
- end
290
-
291
- test 'sign out and redirect uses the configured after sign out path when signing out only the current scope' do
292
- swap Devise, sign_out_all_scopes: false do
293
- @mock_warden.expects(:user).with(scope: :admin, run_callbacks: false).returns(true)
294
- @mock_warden.expects(:logout).with(:admin).returns(true)
295
- @mock_warden.expects(:clear_strategies_cache!).with(scope: :admin).returns(true)
296
- @controller.expects(:redirect_to).with(admin_root_path)
297
- @controller.instance_eval "def after_sign_out_path_for(resource); admin_root_path; end"
298
- @controller.sign_out_and_redirect(:admin)
299
- end
300
- end
301
-
302
- test 'sign out and redirect uses the configured after sign out path when signing out all scopes' do
303
- swap Devise, sign_out_all_scopes: true do
304
- @mock_warden.expects(:user).times(Devise.mappings.size)
305
- @mock_warden.expects(:logout).with().returns(true)
306
- @mock_warden.expects(:clear_strategies_cache!).with().returns(true)
307
- @controller.expects(:redirect_to).with(admin_root_path)
308
- @controller.instance_eval "def after_sign_out_path_for(resource); admin_root_path; end"
309
- @controller.sign_out_and_redirect(:admin)
310
- end
311
- end
312
-
313
- test 'is not a devise controller' do
314
- assert_not @controller.devise_controller?
315
- end
316
- end