devise-tokens 1.0.3 → 1.0.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (167) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE +13 -0
  3. data/README.md +99 -0
  4. data/Rakefile +42 -0
  5. data/app/controllers/{devise_tokens → devise_token_auth}/application_controller.rb +8 -6
  6. data/app/controllers/{devise_tokens → devise_token_auth}/concerns/resource_finder.rb +4 -2
  7. data/app/controllers/{devise_tokens → devise_token_auth}/concerns/set_user_by_token.rb +24 -23
  8. data/app/controllers/{devise_tokens → devise_token_auth}/confirmations_controller.rb +9 -7
  9. data/app/controllers/{devise_tokens → devise_token_auth}/omniauth_callbacks_controller.rb +11 -9
  10. data/app/controllers/{devise_tokens → devise_token_auth}/passwords_controller.rb +16 -14
  11. data/app/controllers/{devise_tokens → devise_token_auth}/registrations_controller.rb +13 -11
  12. data/app/controllers/{devise_tokens → devise_token_auth}/sessions_controller.rb +9 -6
  13. data/app/controllers/{devise_tokens → devise_token_auth}/token_validations_controller.rb +5 -3
  14. data/app/controllers/{devise_tokens → devise_token_auth}/unlocks_controller.rb +7 -5
  15. data/app/models/{devise_tokens → devise_token_auth}/concerns/active_record_support.rb +2 -2
  16. data/app/models/{devise_tokens → devise_token_auth}/concerns/mongoid_support.rb +1 -1
  17. data/app/models/{devise_tokens → devise_token_auth}/concerns/tokens_serialization.rb +1 -1
  18. data/app/models/{devise_tokens → devise_token_auth}/concerns/user.rb +21 -17
  19. data/app/models/{devise_tokens → devise_token_auth}/concerns/user_omniauth_callbacks.rb +3 -3
  20. data/app/validators/devise_token_auth_email_validator.rb +2 -2
  21. data/config/locales/da-DK.yml +1 -1
  22. data/config/locales/de.yml +1 -1
  23. data/config/locales/en.yml +1 -1
  24. data/config/locales/es.yml +1 -1
  25. data/config/locales/fr.yml +1 -1
  26. data/config/locales/he.yml +1 -1
  27. data/config/locales/it.yml +1 -1
  28. data/config/locales/ja.yml +1 -1
  29. data/config/locales/nl.yml +1 -1
  30. data/config/locales/pl.yml +1 -1
  31. data/config/locales/pt-BR.yml +1 -1
  32. data/config/locales/pt.yml +1 -1
  33. data/config/locales/ro.yml +1 -1
  34. data/config/locales/ru.yml +1 -1
  35. data/config/locales/sq.yml +1 -1
  36. data/config/locales/sv.yml +1 -1
  37. data/config/locales/uk.yml +1 -1
  38. data/config/locales/vi.yml +1 -1
  39. data/config/locales/zh-CN.yml +1 -1
  40. data/config/locales/zh-HK.yml +1 -1
  41. data/config/locales/zh-TW.yml +1 -1
  42. data/lib/devise_token_auth.rb +14 -0
  43. data/lib/{devise_tokens → devise_token_auth}/blacklist.rb +0 -0
  44. data/lib/{devise_tokens → devise_token_auth}/controllers/helpers.rb +3 -3
  45. data/lib/{devise_tokens → devise_token_auth}/controllers/url_helpers.rb +2 -2
  46. data/lib/{devise_tokens → devise_token_auth}/engine.rb +7 -5
  47. data/lib/{devise_tokens → devise_token_auth}/errors.rb +3 -1
  48. data/lib/{devise_tokens → devise_token_auth}/rails/routes.rb +15 -15
  49. data/lib/{devise_tokens → devise_token_auth}/token_factory.rb +19 -19
  50. data/lib/{devise_tokens → devise_token_auth}/url.rb +4 -2
  51. data/lib/devise_token_auth/version.rb +5 -0
  52. data/lib/generators/{devise_tokens → devise_token_auth}/USAGE +9 -9
  53. data/lib/generators/{devise_tokens → devise_token_auth}/install_generator.rb +9 -9
  54. data/lib/generators/{devise_tokens → devise_token_auth}/install_generator_helpers.rb +9 -9
  55. data/lib/generators/{devise_tokens → devise_token_auth}/install_mongoid_generator.rb +5 -5
  56. data/lib/generators/{devise_tokens → devise_token_auth}/install_views_generator.rb +2 -2
  57. data/lib/generators/{devise_tokens/templates/devise_tokens.rb → devise_token_auth/templates/devise_token_auth.rb} +2 -2
  58. data/lib/generators/{devise_tokens/templates/devise_tokens_create_users.rb.erb → devise_token_auth/templates/devise_token_auth_create_users.rb.erb} +1 -1
  59. data/lib/generators/{devise_tokens → devise_token_auth}/templates/user.rb.erb +2 -2
  60. data/lib/generators/{devise_tokens → devise_token_auth}/templates/user_mongoid.rb.erb +2 -2
  61. data/lib/tasks/{devise_tokens_tasks.rake → devise_token_auth_tasks.rake} +2 -2
  62. data/test/controllers/custom/custom_confirmations_controller_test.rb +25 -0
  63. data/test/controllers/custom/custom_omniauth_callbacks_controller_test.rb +33 -0
  64. data/test/controllers/custom/custom_passwords_controller_test.rb +79 -0
  65. data/test/controllers/custom/custom_registrations_controller_test.rb +63 -0
  66. data/test/controllers/custom/custom_sessions_controller_test.rb +39 -0
  67. data/test/controllers/custom/custom_token_validations_controller_test.rb +42 -0
  68. data/test/controllers/demo_group_controller_test.rb +151 -0
  69. data/test/controllers/demo_mang_controller_test.rb +284 -0
  70. data/test/controllers/demo_user_controller_test.rb +629 -0
  71. data/test/controllers/devise_token_auth/confirmations_controller_test.rb +187 -0
  72. data/test/controllers/devise_token_auth/omniauth_callbacks_controller_test.rb +441 -0
  73. data/test/controllers/devise_token_auth/passwords_controller_test.rb +780 -0
  74. data/test/controllers/devise_token_auth/registrations_controller_test.rb +907 -0
  75. data/test/controllers/devise_token_auth/sessions_controller_test.rb +503 -0
  76. data/test/controllers/devise_token_auth/token_validations_controller_test.rb +102 -0
  77. data/test/controllers/devise_token_auth/unlocks_controller_test.rb +196 -0
  78. data/test/controllers/overrides/confirmations_controller_test.rb +47 -0
  79. data/test/controllers/overrides/omniauth_callbacks_controller_test.rb +53 -0
  80. data/test/controllers/overrides/passwords_controller_test.rb +64 -0
  81. data/test/controllers/overrides/registrations_controller_test.rb +46 -0
  82. data/test/controllers/overrides/sessions_controller_test.rb +35 -0
  83. data/test/controllers/overrides/token_validations_controller_test.rb +43 -0
  84. data/test/dummy/README.rdoc +28 -0
  85. data/test/dummy/app/active_record/lockable_user.rb +7 -0
  86. data/test/dummy/app/active_record/mang.rb +5 -0
  87. data/test/dummy/app/active_record/only_email_user.rb +7 -0
  88. data/test/dummy/app/active_record/scoped_user.rb +9 -0
  89. data/test/dummy/app/active_record/unconfirmable_user.rb +9 -0
  90. data/test/dummy/app/active_record/unregisterable_user.rb +9 -0
  91. data/test/dummy/app/active_record/user.rb +6 -0
  92. data/test/dummy/app/controllers/application_controller.rb +18 -0
  93. data/test/dummy/app/controllers/auth_origin_controller.rb +7 -0
  94. data/test/dummy/app/controllers/custom/confirmations_controller.rb +13 -0
  95. data/test/dummy/app/controllers/custom/omniauth_callbacks_controller.rb +13 -0
  96. data/test/dummy/app/controllers/custom/passwords_controller.rb +39 -0
  97. data/test/dummy/app/controllers/custom/registrations_controller.rb +39 -0
  98. data/test/dummy/app/controllers/custom/sessions_controller.rb +29 -0
  99. data/test/dummy/app/controllers/custom/token_validations_controller.rb +19 -0
  100. data/test/dummy/app/controllers/demo_group_controller.rb +15 -0
  101. data/test/dummy/app/controllers/demo_mang_controller.rb +14 -0
  102. data/test/dummy/app/controllers/demo_user_controller.rb +27 -0
  103. data/test/dummy/app/controllers/overrides/confirmations_controller.rb +28 -0
  104. data/test/dummy/app/controllers/overrides/omniauth_callbacks_controller.rb +16 -0
  105. data/test/dummy/app/controllers/overrides/passwords_controller.rb +35 -0
  106. data/test/dummy/app/controllers/overrides/registrations_controller.rb +29 -0
  107. data/test/dummy/app/controllers/overrides/sessions_controller.rb +36 -0
  108. data/test/dummy/app/controllers/overrides/token_validations_controller.rb +23 -0
  109. data/test/dummy/app/helpers/application_helper.rb +1058 -0
  110. data/test/dummy/app/models/concerns/favorite_color.rb +19 -0
  111. data/test/dummy/app/mongoid/lockable_user.rb +38 -0
  112. data/test/dummy/app/mongoid/mang.rb +46 -0
  113. data/test/dummy/app/mongoid/only_email_user.rb +33 -0
  114. data/test/dummy/app/mongoid/scoped_user.rb +50 -0
  115. data/test/dummy/app/mongoid/unconfirmable_user.rb +44 -0
  116. data/test/dummy/app/mongoid/unregisterable_user.rb +47 -0
  117. data/test/dummy/app/mongoid/user.rb +49 -0
  118. data/test/dummy/app/views/layouts/application.html.erb +14 -0
  119. data/test/dummy/config.ru +18 -0
  120. data/test/dummy/config/application.rb +48 -0
  121. data/test/dummy/config/application.yml.bk +0 -0
  122. data/test/dummy/config/boot.rb +11 -0
  123. data/test/dummy/config/environment.rb +7 -0
  124. data/test/dummy/config/environments/development.rb +46 -0
  125. data/test/dummy/config/environments/production.rb +84 -0
  126. data/test/dummy/config/environments/test.rb +50 -0
  127. data/test/dummy/config/initializers/assets.rb +10 -0
  128. data/test/dummy/config/initializers/backtrace_silencers.rb +9 -0
  129. data/test/dummy/config/initializers/cookies_serializer.rb +5 -0
  130. data/test/dummy/config/initializers/devise.rb +290 -0
  131. data/test/dummy/config/initializers/devise_token_auth.rb +55 -0
  132. data/test/dummy/config/initializers/figaro.rb +3 -0
  133. data/test/dummy/config/initializers/filter_parameter_logging.rb +6 -0
  134. data/test/dummy/config/initializers/inflections.rb +18 -0
  135. data/test/dummy/config/initializers/mime_types.rb +6 -0
  136. data/test/dummy/config/initializers/omniauth.rb +10 -0
  137. data/test/dummy/config/initializers/session_store.rb +5 -0
  138. data/test/dummy/config/initializers/wrap_parameters.rb +16 -0
  139. data/test/dummy/config/routes.rb +55 -0
  140. data/test/dummy/config/spring.rb +3 -0
  141. data/test/dummy/db/migrate/20140715061447_devise_token_auth_create_users.rb +58 -0
  142. data/test/dummy/db/migrate/20140715061805_devise_token_auth_create_mangs.rb +57 -0
  143. data/test/dummy/db/migrate/20140829044006_add_operating_thetan_to_user.rb +8 -0
  144. data/test/dummy/db/migrate/20140916224624_add_favorite_color_to_mangs.rb +7 -0
  145. data/test/dummy/db/migrate/20141222035835_devise_token_auth_create_only_email_users.rb +55 -0
  146. data/test/dummy/db/migrate/20141222053502_devise_token_auth_create_unregisterable_users.rb +56 -0
  147. data/test/dummy/db/migrate/20150708104536_devise_token_auth_create_unconfirmable_users.rb +56 -0
  148. data/test/dummy/db/migrate/20160103235141_devise_token_auth_create_scoped_users.rb +56 -0
  149. data/test/dummy/db/migrate/20160629184441_devise_token_auth_create_lockable_users.rb +56 -0
  150. data/test/dummy/db/schema.rb +173 -0
  151. data/test/dummy/lib/migration_database_helper.rb +43 -0
  152. data/test/factories/users.rb +40 -0
  153. data/test/lib/devise_token_auth/blacklist_test.rb +11 -0
  154. data/test/lib/devise_token_auth/token_factory_test.rb +191 -0
  155. data/test/lib/devise_token_auth/url_test.rb +26 -0
  156. data/test/lib/generators/devise_token_auth/install_generator_test.rb +217 -0
  157. data/test/lib/generators/devise_token_auth/install_generator_with_namespace_test.rb +222 -0
  158. data/test/lib/generators/devise_token_auth/install_views_generator_test.rb +25 -0
  159. data/test/models/concerns/mongoid_support_test.rb +31 -0
  160. data/test/models/concerns/tokens_serialization_test.rb +70 -0
  161. data/test/models/only_email_user_test.rb +29 -0
  162. data/test/models/user_test.rb +108 -0
  163. data/test/support/controllers/routes.rb +43 -0
  164. data/test/test_helper.rb +103 -0
  165. metadata +246 -37
  166. data/lib/devise_tokens.rb +0 -14
  167. data/lib/devise_tokens/version.rb +0 -3
@@ -1,5 +1,5 @@
1
1
  ro:
2
- devise_tokens:
2
+ devise_token_auth:
3
3
  sessions:
4
4
  not_confirmed: "Un email de confirmare a fost trimis către contul tău la '%{email}'. Pentru a-ți activa contul este necesar să urmezi instrucțiunile din acesta."
5
5
  bad_credentials: "Datele introduse sunt incorecte. Te rugăm să incerci din nou."
@@ -1,5 +1,5 @@
1
1
  ru:
2
- devise_tokens:
2
+ devise_token_auth:
3
3
  sessions:
4
4
  not_confirmed: "Письмо с подтверждением Вашей учетной записи '%{email}' отправлено на электронную почту. Вы должны следовать инструкциям, приведенным в письме, прежде чем Ваша учетная запись сможет быть активирована"
5
5
  bad_credentials: "Неверные логин или пароль. Пожалуйста, попробуйте еще раз."
@@ -1,5 +1,5 @@
1
1
  sq:
2
- devise_tokens:
2
+ devise_token_auth:
3
3
  sessions:
4
4
  not_confirmed: "Një email konfirmues është dërguar tek llogaria juaj '%{email}'. Ju duhet të ndiqni udhëzimet në email përpara se të bëhet aktivizimi i llogarisë tuaj."
5
5
  bad_credentials: "Kredencialet e qasjes nuk janë në rregull. Ju lutemi, provoni përsëri."
@@ -1,5 +1,5 @@
1
1
  sv:
2
- devise_tokens:
2
+ devise_token_auth:
3
3
  sessions:
4
4
  not_confirmed: "Ett bekräftelse-email har skickats till '%{email}'. Följ instruktionerna i emailet så kan ditt konto aktiveras"
5
5
  bad_credentials: "Ogiltig login-information. Vänligen försök igen."
@@ -1,5 +1,5 @@
1
1
  uk:
2
- devise_tokens:
2
+ devise_token_auth:
3
3
  sessions:
4
4
  not_confirmed: "Будь ласка підтвердіть реєстрацію згідно інструкціям як ми вислали на Вашу пошту %{email}"
5
5
  bad_credentials: "Логін або пароль введені невірно. Будь ласка, спробуйте ще"
@@ -1,5 +1,5 @@
1
1
  vi:
2
- devise_tokens:
2
+ devise_token_auth:
3
3
  sessions:
4
4
  not_confirmed: "Mail xác nhận tài khoản đã được gửi tới tài khoản của bạn tại '%{email}'. Bận cần phải làm theo những hướng dẫn trong email để tài khoản có thể xác nhận"
5
5
  bad_credentials: "Thông tin đăng nhập không hợp lệ. Xin thử lại."
@@ -1,5 +1,5 @@
1
1
  zh-CN:
2
- devise_tokens:
2
+ devise_token_auth:
3
3
  sessions:
4
4
  not_confirmed: "您将在几分钟后收到一封电子邮件'%{email}',内有验证账号的步骤说明"
5
5
  bad_credentials: "不正确的登录信息,请重试"
@@ -1,7 +1,7 @@
1
1
  # Additional translations at https://github.com/plataformatec/devise/wiki/I18n
2
2
 
3
3
  zh-TW:
4
- devise_tokens:
4
+ devise_token_auth:
5
5
  sessions:
6
6
  not_confirmed: "您將在幾分鐘後收到一封電子郵件'%{email}',內有驗證帳號的步驟說明。"
7
7
  bad_credentials: "不正確的登入資料。請重試。"
@@ -1,7 +1,7 @@
1
1
  # Additional translations at https://github.com/plataformatec/devise/wiki/I18n
2
2
 
3
3
  zh-TW:
4
- devise_tokens:
4
+ devise_token_auth:
5
5
  sessions:
6
6
  not_confirmed: "您將在幾分鐘後收到一封電子郵件'%{email}',內有驗證帳號的步驟說明。"
7
7
  bad_credentials: "不正確的登入資料。請重試。"
@@ -0,0 +1,14 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'devise'
4
+
5
+ module DeviseTokenAuth
6
+ end
7
+
8
+ require 'devise_token_auth/engine'
9
+ require 'devise_token_auth/controllers/helpers'
10
+ require 'devise_token_auth/controllers/url_helpers'
11
+ require 'devise_token_auth/url'
12
+ require 'devise_token_auth/errors'
13
+ require 'devise_token_auth/blacklist'
14
+ require 'devise_token_auth/token_factory'
@@ -1,6 +1,6 @@
1
+ # frozen_string_literal: true
1
2
 
2
-
3
- module DeviseTokens
3
+ module DeviseTokenAuth
4
4
  module Controllers
5
5
  module Helpers
6
6
  extend ActiveSupport::Concern
@@ -28,7 +28,7 @@ module DeviseTokens
28
28
  # before_action ->{ authenticate_blogger! :admin } # Redirects to the admin login page
29
29
  # current_blogger :user # Preferably returns a User if one is signed in
30
30
  #
31
- def devise_tokens_group(group_name, opts = {})
31
+ def devise_token_auth_group(group_name, opts = {})
32
32
  mappings = "[#{opts[:contains].map { |m| ":#{m}" }.join(',')}]"
33
33
 
34
34
  class_eval <<-METHODS, __FILE__, __LINE__ + 1
@@ -1,6 +1,6 @@
1
+ # frozen_string_literal: true
1
2
 
2
-
3
- module DeviseTokens
3
+ module DeviseTokenAuth
4
4
  module Controllers
5
5
  module UrlHelpers
6
6
  def self.define_helpers(mapping)
@@ -1,11 +1,13 @@
1
- require 'devise_tokens/rails/routes'
1
+ # frozen_string_literal: true
2
2
 
3
- module DeviseTokens
3
+ require 'devise_token_auth/rails/routes'
4
+
5
+ module DeviseTokenAuth
4
6
  class Engine < ::Rails::Engine
5
- isolate_namespace DeviseTokens
7
+ isolate_namespace DeviseTokenAuth
6
8
 
7
- initializer 'devise_tokens.url_helpers' do
8
- Devise.helpers << DeviseTokens::Controllers::Helpers
9
+ initializer 'devise_token_auth.url_helpers' do
10
+ Devise.helpers << DeviseTokenAuth::Controllers::Helpers
9
11
  end
10
12
  end
11
13
 
@@ -1,4 +1,6 @@
1
- module DeviseTokens
1
+ # frozen_string_literal: true
2
+
3
+ module DeviseTokenAuth
2
4
  module Errors
3
5
  class NoResourceDefinedError < StandardError; end
4
6
  class InvalidModel < StandardError; end
@@ -1,20 +1,20 @@
1
-
1
+ # frozen_string_literal: true
2
2
 
3
3
  module ActionDispatch::Routing
4
4
  class Mapper
5
- def mount_devise_tokens_for(resource, opts)
5
+ def mount_devise_token_auth_for(resource, opts)
6
6
  # ensure objects exist to simplify attr checks
7
7
  opts[:controllers] ||= {}
8
8
  opts[:skip] ||= []
9
9
 
10
10
  # check for ctrl overrides, fall back to defaults
11
- sessions_ctrl = opts[:controllers][:sessions] || 'devise_tokens/sessions'
12
- registrations_ctrl = opts[:controllers][:registrations] || 'devise_tokens/registrations'
13
- passwords_ctrl = opts[:controllers][:passwords] || 'devise_tokens/passwords'
14
- confirmations_ctrl = opts[:controllers][:confirmations] || 'devise_tokens/confirmations'
15
- token_validations_ctrl = opts[:controllers][:token_validations] || 'devise_tokens/token_validations'
16
- omniauth_ctrl = opts[:controllers][:omniauth_callbacks] || 'devise_tokens/omniauth_callbacks'
17
- unlocks_ctrl = opts[:controllers][:unlocks] || 'devise_tokens/unlocks'
11
+ sessions_ctrl = opts[:controllers][:sessions] || 'devise_token_auth/sessions'
12
+ registrations_ctrl = opts[:controllers][:registrations] || 'devise_token_auth/registrations'
13
+ passwords_ctrl = opts[:controllers][:passwords] || 'devise_token_auth/passwords'
14
+ confirmations_ctrl = opts[:controllers][:confirmations] || 'devise_token_auth/confirmations'
15
+ token_validations_ctrl = opts[:controllers][:token_validations] || 'devise_token_auth/token_validations'
16
+ omniauth_ctrl = opts[:controllers][:omniauth_callbacks] || 'devise_token_auth/omniauth_callbacks'
17
+ unlocks_ctrl = opts[:controllers][:unlocks] || 'devise_token_auth/unlocks'
18
18
 
19
19
  # define devise controller mappings
20
20
  controllers = { sessions: sessions_ctrl,
@@ -63,8 +63,8 @@ module ActionDispatch::Routing
63
63
  match "#{full_path}/failure", controller: omniauth_ctrl, action: 'omniauth_failure', via: [:get]
64
64
  match "#{full_path}/:provider/callback", controller: omniauth_ctrl, action: 'omniauth_success', via: [:get]
65
65
 
66
- match "#{DeviseTokens.omniauth_prefix}/:provider/callback", controller: omniauth_ctrl, action: 'redirect_callbacks', via: [:get, :post]
67
- match "#{DeviseTokens.omniauth_prefix}/failure", controller: omniauth_ctrl, action: 'omniauth_failure', via: [:get, :post]
66
+ match "#{DeviseTokenAuth.omniauth_prefix}/:provider/callback", controller: omniauth_ctrl, action: 'redirect_callbacks', via: [:get, :post]
67
+ match "#{DeviseTokenAuth.omniauth_prefix}/failure", controller: omniauth_ctrl, action: 'omniauth_failure', via: [:get, :post]
68
68
 
69
69
  # preserve the resource class thru oauth authentication by setting name of
70
70
  # resource as "resource_class" param
@@ -76,15 +76,15 @@ module ActionDispatch::Routing
76
76
  qs['resource_class'] = [resource]
77
77
  qs['namespace_name'] = [namespace_name] if namespace_name
78
78
 
79
- set_omniauth_path_prefix!(DeviseTokens.omniauth_prefix)
79
+ set_omniauth_path_prefix!(DeviseTokenAuth.omniauth_prefix)
80
80
 
81
81
  redirect_params = {}.tap { |hash| qs.each{ |k, v| hash[k] = v.first } }
82
82
 
83
- if DeviseTokens.redirect_whitelist
83
+ if DeviseTokenAuth.redirect_whitelist
84
84
  redirect_url = request.params['auth_origin_url']
85
- unless DeviseTokens::Url.whitelisted?(redirect_url)
85
+ unless DeviseTokenAuth::Url.whitelisted?(redirect_url)
86
86
  message = I18n.t(
87
- 'devise_tokens.registrations.redirect_url_not_allowed',
87
+ 'devise_token_auth.registrations.redirect_url_not_allowed',
88
88
  redirect_url: redirect_url
89
89
  )
90
90
  redirect_params['message'] = message
@@ -1,6 +1,6 @@
1
1
  require 'bcrypt'
2
2
 
3
- module DeviseTokens
3
+ module DeviseTokenAuth
4
4
  # A token management factory which allow generate token objects and check them.
5
5
  module TokenFactory
6
6
  # For BCrypt::Password class see:
@@ -8,11 +8,11 @@ module DeviseTokens
8
8
 
9
9
  # Creates a token instance. Takes an optional client, lifespan and cost options.
10
10
  # Example:
11
- # DeviseTokens::TokenFactory.create
12
- # => #<struct DeviseTokens::TokenFactory::Token client="tElcgkdZ7f9XEa0unZhrYQ", token="rAMcWOs0-mGHFMnIgJD2cA", token_hash="$2a$10$wrsdlHVRGlYW11wfImxU..jr0Ux3bHo/qbXcSfgp8zmvVUNHosita", expiry=1518982690>
11
+ # DeviseTokenAuth::TokenFactory.create
12
+ # => #<struct DeviseTokenAuth::TokenFactory::Token client="tElcgkdZ7f9XEa0unZhrYQ", token="rAMcWOs0-mGHFMnIgJD2cA", token_hash="$2a$10$wrsdlHVRGlYW11wfImxU..jr0Ux3bHo/qbXcSfgp8zmvVUNHosita", expiry=1518982690>
13
13
  #
14
- # DeviseTokens::TokenFactory.create(lifespan: 10, cost: 4)
15
- # => #<struct DeviseTokens::TokenFactory::Token client="5qleT7_t9JPVcX9xmxkVYA", token="RBXX43u4xXNSO-fr2N_4pA", token_hash="$2a$04$9gpCaoFbu2dUKxU3qiTgluHX7jj9UzS.jq1QW0EkQmoaxARo1WxTy", expiry=1517773268>
14
+ # DeviseTokenAuth::TokenFactory.create(lifespan: 10, cost: 4)
15
+ # => #<struct DeviseTokenAuth::TokenFactory::Token client="5qleT7_t9JPVcX9xmxkVYA", token="RBXX43u4xXNSO-fr2N_4pA", token_hash="$2a$04$9gpCaoFbu2dUKxU3qiTgluHX7jj9UzS.jq1QW0EkQmoaxARo1WxTy", expiry=1517773268>
16
16
  def self.create(client: nil, lifespan: nil, cost: nil)
17
17
  # obj_client = client.nil? ? client() : client
18
18
  obj_client = client || client()
@@ -25,7 +25,7 @@ module DeviseTokens
25
25
 
26
26
  # Generates a random URL-safe client.
27
27
  # Example:
28
- # DeviseTokens::TokenFactory.client
28
+ # DeviseTokenAuth::TokenFactory.client
29
29
  # => "zNf0pNP5iGfuBItZJGCseQ"
30
30
  def self.client
31
31
  secure_string
@@ -33,7 +33,7 @@ module DeviseTokens
33
33
 
34
34
  # Generates a random URL-safe token.
35
35
  # Example:
36
- # DeviseTokens::TokenFactory.token
36
+ # DeviseTokenAuth::TokenFactory.token
37
37
  # => "6Bqs4K9x8ChLmZogvruF3A"
38
38
  def self.token
39
39
  secure_string
@@ -43,30 +43,30 @@ module DeviseTokens
43
43
  # the default value is used. The possible cost value is within range from 4 to 31.
44
44
  # It is recommended to not use a value more than 10.
45
45
  # Example:
46
- # DeviseTokens::TokenFactory.token_hash("_qxAxmc-biQLiYRHsmwd5Q")
46
+ # DeviseTokenAuth::TokenFactory.token_hash("_qxAxmc-biQLiYRHsmwd5Q")
47
47
  # => "$2a$10$6/cTAtQ3CBLfpkeHW7dlt.PD2aVCbFRN5vDDJUUhGsZ6pzYFlh4Me"
48
48
  #
49
- # DeviseTokens::TokenFactory.token_hash("_qxAxmc-biQLiYRHsmwd5Q", 4)
49
+ # DeviseTokenAuth::TokenFactory.token_hash("_qxAxmc-biQLiYRHsmwd5Q", 4)
50
50
  # => "$2a$04$RkIrosbdRtuet2eUk3si8eS4ufeNpiPc/rSSsfpniRK8ogM5YFOWS"
51
51
  def self.token_hash(token, cost = nil)
52
- cost ||= DeviseTokens.token_cost
52
+ cost ||= DeviseTokenAuth.token_cost
53
53
  BCrypt::Password.create(token, cost: cost)
54
54
  end
55
55
 
56
56
  # Returns the value of time as an integer number of seconds. Takes one argument.
57
57
  # Example:
58
- # DeviseTokens::TokenFactory.expiry
58
+ # DeviseTokenAuth::TokenFactory.expiry
59
59
  # => 1518983359
60
- # DeviseTokens::TokenFactory.expiry(10)
60
+ # DeviseTokenAuth::TokenFactory.expiry(10)
61
61
  # => 1517773781
62
62
  def self.expiry(lifespan = nil)
63
- lifespan ||= DeviseTokens.token_lifespan
63
+ lifespan ||= DeviseTokenAuth.token_lifespan
64
64
  (Time.zone.now + lifespan).to_i
65
65
  end
66
66
 
67
67
  # Generates a random URL-safe string.
68
68
  # Example:
69
- # DeviseTokens::TokenFactory.secure_string
69
+ # DeviseTokenAuth::TokenFactory.secure_string
70
70
  # => "ADBoIaqXsEDnxIpOuumrTA"
71
71
  def self.secure_string
72
72
  # https://ruby-doc.org/stdlib-2.5.0/libdoc/securerandom/rdoc/Random/Formatter.html#method-i-urlsafe_base64
@@ -76,7 +76,7 @@ module DeviseTokens
76
76
  # Returns true if token hash is a valid token hash.
77
77
  # Example:
78
78
  # token_hash = "$2a$10$ArjX0tskRIa5Z/Tmapy59OCiAXLStfhrCiaDz.8fCb6hnX1gJ0p/2"
79
- # DeviseTokens::TokenFactory.valid_token_hash?(token_hash)
79
+ # DeviseTokenAuth::TokenFactory.valid_token_hash?(token_hash)
80
80
  # => true
81
81
  def self.valid_token_hash?(token_hash)
82
82
  !!BCrypt::Password.valid_hash?(token_hash)
@@ -86,7 +86,7 @@ module DeviseTokens
86
86
  # Example:
87
87
  # token = "4wZ9gcc900rMQD1McpcSNA"
88
88
  # token_hash = "$2a$10$ArjX0tskRIa5Z/Tmapy59OCiAXLStfhrCiaDz.8fCb6hnX1gJ0p/2"
89
- # DeviseTokens::TokenFactory.token_hash_is_token?(token_hash, token)
89
+ # DeviseTokenAuth::TokenFactory.token_hash_is_token?(token_hash, token)
90
90
  # => true
91
91
  def self.token_hash_is_token?(token_hash, token)
92
92
  BCrypt::Password.new(token_hash).is_password?(token)
@@ -96,8 +96,8 @@ module DeviseTokens
96
96
 
97
97
  # Creates a token instance with instance variables equal nil.
98
98
  # Example:
99
- # DeviseTokens::TokenFactory.new
100
- # => #<struct DeviseTokens::TokenFactory::Token client=nil, token=nil, token_hash=nil, expiry=nil>
99
+ # DeviseTokenAuth::TokenFactory.new
100
+ # => #<struct DeviseTokenAuth::TokenFactory::Token client=nil, token=nil, token_hash=nil, expiry=nil>
101
101
  def self.new
102
102
  Token.new
103
103
  end
@@ -108,7 +108,7 @@ module DeviseTokens
108
108
  # token.clear!
109
109
  # => true
110
110
  # token
111
- # => #<struct DeviseTokens::TokenFactory::Token client=nil, token=nil, token_hash=nil, expiry=nil>
111
+ # => #<struct DeviseTokenAuth::TokenFactory::Token client=nil, token=nil, token_hash=nil, expiry=nil>
112
112
  def clear!
113
113
  size.times { |i| self[i] = nil }
114
114
  true
@@ -1,4 +1,6 @@
1
- module DeviseTokens::Url
1
+ # frozen_string_literal: true
2
+
3
+ module DeviseTokenAuth::Url
2
4
 
3
5
  def self.generate(url, params = {})
4
6
  uri = URI(url)
@@ -15,7 +17,7 @@ module DeviseTokens::Url
15
17
 
16
18
  def self.whitelisted?(url)
17
19
  url.nil? || \
18
- !!DeviseTokens.redirect_whitelist.find do |pattern|
20
+ !!DeviseTokenAuth.redirect_whitelist.find do |pattern|
19
21
  !!Wildcat.new(pattern).match(url)
20
22
  end
21
23
  end
@@ -0,0 +1,5 @@
1
+ # frozen_string_literal: true
2
+
3
+ module DeviseTokenAuth
4
+ VERSION = '1.1.3'.freeze
5
+ end
@@ -1,31 +1,31 @@
1
1
  Description:
2
2
  This generator will install all the necessary configuration and migration
3
- files for the devise_tokens gem. See
4
- https://github.com/lynndylanhurley/devise_tokens for more information.
3
+ files for the devise_token_auth gem. See
4
+ https://github.com/lynndylanhurley/devise_token_auth for more information.
5
5
 
6
6
  Arguments:
7
7
  USER_CLASS # The name of the class to use for user authentication. Default is
8
8
  # 'User'
9
9
  MOUNT_PATH # The path at which to mount the authentication routes. Default is
10
10
  # 'auth'. More detail documentation is here:
11
- # https://github.com/lynndylanhurley/devise_tokens#usage-tldr
11
+ # https://github.com/lynndylanhurley/devise_token_auth#usage-tldr
12
12
 
13
13
  Example:
14
- rails generate devise_tokens:install User auth
14
+ rails generate devise_token_auth:install User auth
15
15
 
16
16
  This will create:
17
- config/initializers/devise_tokens.rb
18
- db/migrate/<%= Time.zone.now.utc.strftime("%Y%m%d%H%M%S") %>_create_devise_tokens_create_users.rb
17
+ config/initializers/devise_token_auth.rb
18
+ db/migrate/<%= Time.zone.now.utc.strftime("%Y%m%d%H%M%S") %>_create_devise_token_auth_create_users.rb
19
19
  app/models/user.rb
20
20
 
21
21
  If 'app/models/user.rb' already exists, the following line will be inserted
22
22
  after the class definition:
23
- include DeviseTokens::Concerns::User
23
+ include DeviseTokenAuth::Concerns::User
24
24
 
25
25
  The following line will be inserted into your application controller at
26
26
  app/controllers/application_controller.rb:
27
- include DeviseTokens::Concerns::SetUserByToken
27
+ include DeviseTokenAuth::Concerns::SetUserByToken
28
28
 
29
29
  The following line will be inserted at the top of 'config/routes.rb' if it
30
30
  does not already exist:
31
- mount_devise_tokens_for "User", at: 'auth'
31
+ mount_devise_token_auth_for "User", at: 'auth'
@@ -1,21 +1,21 @@
1
-
1
+ # frozen_string_literal: true
2
2
 
3
3
  require_relative 'install_generator_helpers'
4
4
 
5
- module DeviseTokens
5
+ module DeviseTokenAuth
6
6
  class InstallGenerator < Rails::Generators::Base
7
7
  include Rails::Generators::Migration
8
- include DeviseTokens::InstallGeneratorHelpers
8
+ include DeviseTokenAuth::InstallGeneratorHelpers
9
9
 
10
10
  class_option :primary_key_type, type: :string, desc: 'The type for primary key'
11
11
 
12
12
  def copy_migrations
13
- if self.class.migration_exists?('db/migrate', "devise_tokens_create_#{user_class.pluralize.gsub('::','').underscore}")
14
- say_status('skipped', "Migration 'devise_tokens_create_#{user_class.pluralize.gsub('::','').underscore}' already exists")
13
+ if self.class.migration_exists?('db/migrate', "devise_token_auth_create_#{user_class.pluralize.gsub('::','').underscore}")
14
+ say_status('skipped', "Migration 'devise_token_auth_create_#{user_class.pluralize.gsub('::','').underscore}' already exists")
15
15
  else
16
16
  migration_template(
17
- 'devise_tokens_create_users.rb.erb',
18
- "db/migrate/devise_tokens_create_#{user_class.pluralize.gsub('::','').underscore}.rb"
17
+ 'devise_token_auth_create_users.rb.erb',
18
+ "db/migrate/devise_token_auth_create_#{user_class.pluralize.gsub('::','').underscore}.rb"
19
19
  )
20
20
  end
21
21
  end
@@ -23,7 +23,7 @@ module DeviseTokens
23
23
  def create_user_model
24
24
  fname = "app/models/#{user_class.underscore}.rb"
25
25
  if File.exist?(File.join(destination_root, fname))
26
- inclusion = 'include DeviseTokens::Concerns::User'
26
+ inclusion = 'include DeviseTokenAuth::Concerns::User'
27
27
  unless parse_file_for_line(fname, inclusion)
28
28
 
29
29
  active_record_needle = (Rails::VERSION::MAJOR == 5) ? 'ApplicationRecord' : 'ActiveRecord::Base'
@@ -32,7 +32,7 @@ module DeviseTokens
32
32
  devise :database_authenticatable, :registerable,
33
33
  :recoverable, :rememberable, :trackable, :validatable,
34
34
  :confirmable, :omniauthable
35
- include DeviseTokens::Concerns::User
35
+ include DeviseTokenAuth::Concerns::User
36
36
  RUBY
37
37
  end
38
38
  end
@@ -1,4 +1,4 @@
1
- module DeviseTokens
1
+ module DeviseTokenAuth
2
2
  module InstallGeneratorHelpers
3
3
  class << self
4
4
  def included(mod)
@@ -9,38 +9,38 @@ module DeviseTokens
9
9
  argument :mount_path, type: :string, default: 'auth'
10
10
 
11
11
  def create_initializer_file
12
- copy_file('devise_tokens.rb', 'config/initializers/devise_tokens.rb')
12
+ copy_file('devise_token_auth.rb', 'config/initializers/devise_token_auth.rb')
13
13
  end
14
14
 
15
15
  def include_controller_concerns
16
16
  fname = 'app/controllers/application_controller.rb'
17
- line = 'include DeviseTokens::Concerns::SetUserByToken'
17
+ line = 'include DeviseTokenAuth::Concerns::SetUserByToken'
18
18
 
19
19
  if File.exist?(File.join(destination_root, fname))
20
20
  if parse_file_for_line(fname, line)
21
21
  say_status('skipped', 'Concern is already included in the application controller.')
22
22
  elsif is_rails_api?
23
23
  inject_into_file fname, after: "class ApplicationController < ActionController::API\n" do <<-'RUBY'
24
- include DeviseTokens::Concerns::SetUserByToken
24
+ include DeviseTokenAuth::Concerns::SetUserByToken
25
25
  RUBY
26
26
  end
27
27
  else
28
28
  inject_into_file fname, after: "class ApplicationController < ActionController::Base\n" do <<-'RUBY'
29
- include DeviseTokens::Concerns::SetUserByToken
29
+ include DeviseTokenAuth::Concerns::SetUserByToken
30
30
  RUBY
31
31
  end
32
32
  end
33
33
  else
34
- say_status('skipped', "app/controllers/application_controller.rb not found. Add 'include DeviseTokens::Concerns::SetUserByToken' to any controllers that require authentication.")
34
+ say_status('skipped', "app/controllers/application_controller.rb not found. Add 'include DeviseTokenAuth::Concerns::SetUserByToken' to any controllers that require authentication.")
35
35
  end
36
36
  end
37
37
 
38
38
  def add_route_mount
39
39
  f = 'config/routes.rb'
40
- str = "mount_devise_tokens_for '#{user_class}', at: '#{mount_path}'"
40
+ str = "mount_devise_token_auth_for '#{user_class}', at: '#{mount_path}'"
41
41
 
42
42
  if File.exist?(File.join(destination_root, f))
43
- line = parse_file_for_line(f, 'mount_devise_tokens_for')
43
+ line = parse_file_for_line(f, 'mount_devise_token_auth_for')
44
44
 
45
45
  if line
46
46
  existing_user_class = true
@@ -63,7 +63,7 @@ module DeviseTokens
63
63
  end
64
64
  end
65
65
  else
66
- say_status('skipped', "config/routes.rb not found. Add \"mount_devise_tokens_for '#{user_class}', at: '#{mount_path}'\" to your routes file.")
66
+ say_status('skipped', "config/routes.rb not found. Add \"mount_devise_token_auth_for '#{user_class}', at: '#{mount_path}'\" to your routes file.")
67
67
  end
68
68
  end
69
69