Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: lynndylanhurley/devise_token_auth
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.1.0
Choose a base ref
...
head repository: lynndylanhurley/devise_token_auth
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.1.5
Choose a head ref
Loading
Showing with 2,815 additions and 526 deletions.
  1. +4 −2 .github_changelog_generator
  2. +57 −45 .travis.yml
  3. +2 −1 Appraisals
  4. +759 −4 CHANGELOG.md
  5. +7 −6 Gemfile
  6. +2 −0 README.md
  7. +3 −2 SUMMARY.md
  8. +2 −2 app/controllers/devise_token_auth/application_controller.rb
  9. +28 −31 app/controllers/devise_token_auth/concerns/set_user_by_token.rb
  10. +55 −7 app/controllers/devise_token_auth/confirmations_controller.rb
  11. +34 −11 app/controllers/devise_token_auth/omniauth_callbacks_controller.rb
  12. +32 −14 app/controllers/devise_token_auth/passwords_controller.rb
  13. +6 −5 app/controllers/devise_token_auth/registrations_controller.rb
  14. +5 −5 app/controllers/devise_token_auth/sessions_controller.rb
  15. +3 −3 app/controllers/devise_token_auth/unlocks_controller.rb
  16. +1 −21 app/models/devise_token_auth/concerns/active_record_support.rb
  17. +28 −0 app/models/devise_token_auth/concerns/confirmable_support.rb
  18. +31 −0 app/models/devise_token_auth/concerns/tokens_serialization.rb
  19. +43 −48 app/models/devise_token_auth/concerns/user.rb
  20. +5 −2 app/models/devise_token_auth/concerns/user_omniauth_callbacks.rb
  21. +2 −2 app/validators/{devise_token_auth/email_validator.rb → devise_token_auth_email_validator.rb}
  22. +2 −0 config/locales/da-DK.yml
  23. +2 −0 config/locales/de.yml
  24. +7 −0 config/locales/en.yml
  25. +2 −0 config/locales/es.yml
  26. +2 −0 config/locales/fr.yml
  27. +2 −0 config/locales/he.yml
  28. +2 −0 config/locales/it.yml
  29. +3 −1 config/locales/ja.yml
  30. +51 −0 config/locales/ko.yml
  31. +2 −0 config/locales/nl.yml
  32. +6 −3 config/locales/pl.yml
  33. +2 −0 config/locales/pt-BR.yml
  34. +6 −3 config/locales/pt.yml
  35. +2 −0 config/locales/ro.yml
  36. +2 −0 config/locales/ru.yml
  37. +2 −0 config/locales/sq.yml
  38. +2 −0 config/locales/sv.yml
  39. +2 −0 config/locales/uk.yml
  40. +2 −0 config/locales/vi.yml
  41. +2 −0 config/locales/zh-CN.yml
  42. +2 −0 config/locales/zh-HK.yml
  43. +2 −0 config/locales/zh-TW.yml
  44. +4 −3 devise_token_auth.gemspec
  45. +1 −1 docs/conceptual.md
  46. +15 −13 docs/config/initialization.md
  47. +4 −2 docs/config/omniauth.md
  48. +9 −35 docs/faq.md
  49. +1 −0 docs/usage/README.md
  50. +1 −0 docs/usage/controller_methods.md
  51. +12 −13 docs/usage/model_concerns.md
  52. +7 −0 docs/usage/overrides.md
  53. +49 −0 docs/usage/reset_password.md
  54. +11 −15 docs/usage/testing.md
  55. +3 −2 gemfiles/rails_4_2.gemfile
  56. +4 −2 gemfiles/rails_4_2_mongoid_5.gemfile
  57. +3 −2 gemfiles/rails_5_0.gemfile
  58. +7 −2 gemfiles/rails_5_1.gemfile
  59. +4 −2 gemfiles/rails_5_1_mongoid_6.gemfile
  60. +6 −1 gemfiles/rails_5_1_mongoid_7.gemfile
  61. +3 −2 gemfiles/rails_5_2.gemfile
  62. +2 −1 gemfiles/rails_5_2_mongoid_6.gemfile
  63. +2 −1 gemfiles/rails_5_2_mongoid_7.gemfile
  64. +45 −0 gemfiles/rails_6_0.gemfile
  65. +44 −0 gemfiles/rails_6_0_mongoid_7.gemfile
  66. +1 −0 lib/devise_token_auth.rb
  67. +5 −9 lib/devise_token_auth/controllers/helpers.rb
  68. +7 −1 lib/devise_token_auth/engine.rb
  69. +16 −11 lib/devise_token_auth/rails/routes.rb
  70. +126 −0 lib/devise_token_auth/token_factory.rb
  71. +3 −0 lib/devise_token_auth/url.rb
  72. +1 −1 lib/devise_token_auth/version.rb
  73. +1 −1 lib/generators/devise_token_auth/USAGE
  74. +4 −4 lib/generators/devise_token_auth/install_generator.rb
  75. +2 −2 lib/generators/devise_token_auth/install_mongoid_generator.rb
  76. +10 −0 lib/generators/devise_token_auth/templates/devise_token_auth.rb
  77. +1 −1 lib/generators/devise_token_auth/templates/devise_token_auth_create_users.rb.erb
  78. +2 −2 lib/generators/devise_token_auth/templates/user.rb.erb
  79. +2 −2 lib/generators/devise_token_auth/templates/user_mongoid.rb.erb
  80. +2 −2 test/controllers/demo_user_controller_test.rb
  81. +43 −0 test/controllers/devise_token_auth/confirmations_controller_test.rb
  82. +107 −42 test/controllers/devise_token_auth/omniauth_callbacks_controller_test.rb
  83. +112 −8 test/controllers/devise_token_auth/passwords_controller_test.rb
  84. +3 −3 test/controllers/devise_token_auth/registrations_controller_test.rb
  85. +11 −0 test/dummy/app/active_record/confirmable_user.rb
  86. +0 −13 test/dummy/app/assets/javascripts/application.js
  87. +0 −15 test/dummy/app/assets/stylesheets/application.css
  88. +3 −3 test/dummy/app/controllers/overrides/confirmations_controller.rb
  89. +3 −3 test/dummy/app/controllers/overrides/passwords_controller.rb
  90. +1 −1 test/dummy/app/controllers/overrides/registrations_controller.rb
  91. +1 −1 test/dummy/app/controllers/overrides/sessions_controller.rb
  92. +52 −0 test/dummy/app/mongoid/confirmable_user.rb
  93. +0 −2 test/dummy/app/views/layouts/application.html.erb
  94. +0 −1 test/dummy/config/application.rb
  95. +0 −10 test/dummy/config/environments/development.rb
  96. +0 −16 test/dummy/config/environments/production.rb
  97. +0 −10 test/dummy/config/initializers/assets.rb
  98. +275 −2 test/dummy/config/initializers/devise.rb
  99. +35 −4 test/dummy/config/initializers/devise_token_auth.rb
  100. +1 −1 test/dummy/config/initializers/figaro.rb
  101. +1 −0 test/dummy/config/initializers/omniauth.rb
  102. +2 −0 test/dummy/config/routes.rb
  103. +49 −0 test/dummy/db/migrate/20190924101113_devise_token_auth_create_confirmable_users.rb
  104. +26 −1 test/dummy/db/schema.rb
  105. +3 −2 test/factories/users.rb
  106. +29 −0 test/lib/devise_token_auth/rails/custom_routes_test.rb
  107. +87 −0 test/lib/devise_token_auth/rails/routes_test.rb
  108. +191 −0 test/lib/devise_token_auth/token_factory_test.rb
  109. +2 −2 test/lib/devise_token_auth/url_test.rb
  110. +1 −1 test/lib/generators/devise_token_auth/install_generator_test.rb
  111. +1 −1 test/lib/generators/devise_token_auth/install_generator_with_namespace_test.rb
  112. +104 −0 test/models/concerns/tokens_serialization_test.rb
  113. +35 −0 test/models/confirmable_user_test.rb
  114. +0 −32 test/models/user_test.rb
  115. +1 −1 test/test_helper.rb
6 changes: 4 additions & 2 deletions .github_changelog_generator
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
bug-labels=bug,Bug,fix,Fix
enhancement-labels=enhancement,Enhancement,feat,Feat
since-tag=v0.1.42
unreleased-label=v0.1.43
since-tag=v1.1.3
unreleased-label=Unreleased
user=lynndylanhurley
project=devise_token_auth
base=CHANGELOG.md
102 changes: 57 additions & 45 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
language: ruby
cache: bundler
sudo: false
services:
- mongodb
- mysql
- postgresql
bundler_args: --without development

rvm:
- 2.3.8
- 2.4.5
- 2.5.5
- 2.6.2
- 2.4.7
- 2.5.6
- 2.6.4
- 2.7.0

gemfile:
- gemfiles/rails_4_2.gemfile
- gemfiles/rails_5_0.gemfile
- gemfiles/rails_5_1.gemfile
- gemfiles/rails_5_2.gemfile
- gemfiles/rails_6_0.gemfile

env:
global:
@@ -27,51 +30,60 @@ env:

matrix:
include:
- rvm: 2.3.8
gemfile: gemfiles/rails_4_2_mongoid_5.gemfile
env: DEVISE_TOKEN_AUTH_ORM=mongoid
- rvm: 2.3.8
gemfile: gemfiles/rails_5_1_mongoid_6.gemfile
env: DEVISE_TOKEN_AUTH_ORM=mongoid
- rvm: 2.4.5
gemfile: gemfiles/rails_5_1_mongoid_7.gemfile
env: DEVISE_TOKEN_AUTH_ORM=mongoid
- rvm: 2.5.5
gemfile: gemfiles/rails_5_2_mongoid_6.gemfile
env: DEVISE_TOKEN_AUTH_ORM=mongoid
- rvm: 2.5.5
gemfile: gemfiles/rails_5_2_mongoid_7.gemfile
env: DEVISE_TOKEN_AUTH_ORM=mongoid
- rvm: 2.6.2
gemfile: gemfiles/rails_5_2_mongoid_7.gemfile
env: DEVISE_TOKEN_AUTH_ORM=mongoid
- name: Code Climate Test Coverage
rmv: 2.5.5
env:
- CC_TEST_REPORTER_ID=44d7688de8e1b567b4af25ec5083c2cc0a355ab911192a7cbefd1ea25b2ffd3d
- GEMFILE_AR=gemfiles/rails_5_1.gemfile
- GEMFILE_MONGOID=gemfiles/rails_5_1_mongoid_7.gemfile
script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
- ./cc-test-reporter before-build
# with ActiveRecord
- bundle install --jobs=3 --retry=3 --gemfile $GEMFILE_AR
- BUNDLE_GEMFILE=$GEMFILE_AR bundle exec rake --trace db:migrate
- BUNDLE_GEMFILE=$GEMFILE_AR bundle exec rake
- ./cc-test-reporter format-coverage -t simplecov -o coverage/codeclimate.active_record.json coverage/.resultset.json
# with Mongoid
- bundle install --jobs=3 --retry=3 --gemfile $GEMFILE_MONGOID
- BUNDLE_GEMFILE=$GEMFILE_MONGOID DEVISE_TOKEN_AUTH_ORM=mongoid bundle exec rake
- ./cc-test-reporter format-coverage -t simplecov -o coverage/codeclimate.mongoid.json coverage/.resultset.json
# merge test results
- if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then
- rvm: 2.3.8
gemfile: gemfiles/rails_4_2_mongoid_5.gemfile
env: DEVISE_TOKEN_AUTH_ORM=mongoid
- rvm: 2.3.8
gemfile: gemfiles/rails_5_1_mongoid_6.gemfile
env: DEVISE_TOKEN_AUTH_ORM=mongoid
- rvm: 2.4.7
gemfile: gemfiles/rails_5_1_mongoid_7.gemfile
env: DEVISE_TOKEN_AUTH_ORM=mongoid
- rvm: 2.5.6
gemfile: gemfiles/rails_5_2_mongoid_6.gemfile
env: DEVISE_TOKEN_AUTH_ORM=mongoid
- rvm: 2.5.6
gemfile: gemfiles/rails_5_2_mongoid_7.gemfile
env: DEVISE_TOKEN_AUTH_ORM=mongoid
- rvm: 2.6.4
gemfile: gemfiles/rails_5_2_mongoid_7.gemfile
env: DEVISE_TOKEN_AUTH_ORM=mongoid
- rvm: 2.7.0
gemfile: gemfiles/rails_6_0_mongoid_7.gemfile
env: DEVISE_TOKEN_AUTH_ORM=mongoid
- name: Code Climate Test Coverage
rvm: 2.5.6
env:
- CC_TEST_REPORTER_ID=44d7688de8e1b567b4af25ec5083c2cc0a355ab911192a7cbefd1ea25b2ffd3d
- GEMFILE_AR=gemfiles/rails_5_1.gemfile
- GEMFILE_MONGOID=gemfiles/rails_5_1_mongoid_7.gemfile
script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
- ./cc-test-reporter before-build
# with ActiveRecord
- bundle install --jobs=3 --retry=3 --gemfile $GEMFILE_AR
- BUNDLE_GEMFILE=$GEMFILE_AR bundle exec rake --trace db:migrate
- BUNDLE_GEMFILE=$GEMFILE_AR bundle exec rake
- ./cc-test-reporter format-coverage coverage/.resultset.json -t simplecov -o coverage/codeclimate.active_record.json
# with Mongoid
- bundle install --jobs=3 --retry=3 --gemfile $GEMFILE_MONGOID
- BUNDLE_GEMFILE=$GEMFILE_MONGOID DEVISE_TOKEN_AUTH_ORM=mongoid bundle exec rake
- ./cc-test-reporter format-coverage coverage/.resultset.json -t simplecov -o coverage/codeclimate.mongoid.json
# merge test results
- if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then
./cc-test-reporter sum-coverage coverage/codeclimate.active_record.json coverage/codeclimate.mongoid.json;
./cc-test-reporter upload-coverage;
fi
fi
exclude:
- rvm: 2.6.2
- rvm: 2.6.4
gemfile: gemfiles/rails_4_2.gemfile
- rvm: 2.7.0
gemfile: gemfiles/rails_4_2.gemfile
- rvm: 2.3.8
gemfile: gemfiles/rails_6_0.gemfile
- rvm: 2.4.7
gemfile: gemfiles/rails_6_0.gemfile
fast_finish: true

before_install:
3 changes: 2 additions & 1 deletion Appraisals
Original file line number Diff line number Diff line change
@@ -32,7 +32,8 @@ end
{ name: '5-1', ruby: '2.4.5', rails: '5.1', mongoid: '7.0' },
{ name: '5-2', ruby: '2.5.5', rails: '5.2', mongoid: '6.4' },
{ name: '5-2', ruby: '2.5.5', rails: '5.2', mongoid: '7.0' },
{ name: '5-2', ruby: '2.6.2', rails: '5.2', mongoid: '7.0' }
{ name: '5-2', ruby: '2.6.2', rails: '5.2', mongoid: '7.0' },
{ name: '6-0', ruby: '2.7.0', rails: '6.0', mongoid: '7.0' }
].each do |set|
appraise "rails-#{set[:name]}-mongoid-#{set[:mongoid][0]}" do
gem 'rails', "~> #{set[:rails]}"
Loading