sorcery 0.9.1 → 0.16.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (199) hide show
  1. checksums.yaml +5 -5
  2. data/.github/FUNDING.yml +1 -0
  3. data/.github/ISSUE_TEMPLATE.md +24 -0
  4. data/.github/PULL_REQUEST_TEMPLATE.md +7 -0
  5. data/.github/workflows/ruby.yml +70 -0
  6. data/.gitignore +3 -0
  7. data/.rubocop.yml +55 -0
  8. data/.rubocop_todo.yml +163 -0
  9. data/CHANGELOG.md +132 -34
  10. data/CODE_OF_CONDUCT.md +14 -0
  11. data/Gemfile +3 -17
  12. data/{LICENSE.txt → LICENSE.md} +1 -1
  13. data/MAINTAINING.md +64 -0
  14. data/README.md +146 -269
  15. data/Rakefile +4 -2
  16. data/SECURITY.md +19 -0
  17. data/gemfiles/rails_52.gemfile +7 -0
  18. data/gemfiles/rails_60.gemfile +7 -0
  19. data/gemfiles/rails_61.gemfile +7 -0
  20. data/gemfiles/rails_70.gemfile +7 -0
  21. data/lib/generators/sorcery/USAGE +1 -1
  22. data/lib/generators/sorcery/helpers.rb +8 -4
  23. data/lib/generators/sorcery/install_generator.rb +41 -35
  24. data/lib/generators/sorcery/templates/initializer.rb +216 -112
  25. data/lib/generators/sorcery/templates/migration/activity_logging.rb +7 -7
  26. data/lib/generators/sorcery/templates/migration/brute_force_protection.rb +5 -5
  27. data/lib/generators/sorcery/templates/migration/core.rb +5 -7
  28. data/lib/generators/sorcery/templates/migration/external.rb +4 -4
  29. data/lib/generators/sorcery/templates/migration/magic_login.rb +9 -0
  30. data/lib/generators/sorcery/templates/migration/remember_me.rb +5 -5
  31. data/lib/generators/sorcery/templates/migration/reset_password.rb +7 -6
  32. data/lib/generators/sorcery/templates/migration/user_activation.rb +6 -6
  33. data/lib/sorcery/adapters/active_record_adapter.rb +11 -21
  34. data/lib/sorcery/adapters/mongoid_adapter.rb +23 -11
  35. data/lib/sorcery/controller/config.rb +27 -23
  36. data/lib/sorcery/controller/submodules/activity_logging.rb +16 -18
  37. data/lib/sorcery/controller/submodules/brute_force_protection.rb +1 -2
  38. data/lib/sorcery/controller/submodules/external.rb +69 -44
  39. data/lib/sorcery/controller/submodules/http_basic_auth.rb +18 -19
  40. data/lib/sorcery/controller/submodules/remember_me.rb +16 -16
  41. data/lib/sorcery/controller/submodules/session_timeout.rb +33 -11
  42. data/lib/sorcery/controller.rb +50 -35
  43. data/lib/sorcery/crypto_providers/aes256.rb +17 -16
  44. data/lib/sorcery/crypto_providers/bcrypt.rb +26 -22
  45. data/lib/sorcery/crypto_providers/common.rb +1 -1
  46. data/lib/sorcery/crypto_providers/md5.rb +5 -5
  47. data/lib/sorcery/crypto_providers/sha1.rb +5 -5
  48. data/lib/sorcery/crypto_providers/sha256.rb +2 -2
  49. data/lib/sorcery/crypto_providers/sha512.rb +3 -3
  50. data/lib/sorcery/engine.rb +19 -11
  51. data/lib/sorcery/model/config.rb +73 -50
  52. data/lib/sorcery/model/submodules/activity_logging.rb +31 -12
  53. data/lib/sorcery/model/submodules/brute_force_protection.rb +38 -31
  54. data/lib/sorcery/model/submodules/external.rb +22 -10
  55. data/lib/sorcery/model/submodules/magic_login.rb +130 -0
  56. data/lib/sorcery/model/submodules/remember_me.rb +19 -7
  57. data/lib/sorcery/model/submodules/reset_password.rb +64 -42
  58. data/lib/sorcery/model/submodules/user_activation.rb +52 -54
  59. data/lib/sorcery/model/temporary_token.rb +30 -7
  60. data/lib/sorcery/model.rb +65 -40
  61. data/lib/sorcery/protocols/oauth.rb +4 -9
  62. data/lib/sorcery/protocols/oauth2.rb +0 -2
  63. data/lib/sorcery/providers/auth0.rb +46 -0
  64. data/lib/sorcery/providers/base.rb +4 -4
  65. data/lib/sorcery/providers/battlenet.rb +51 -0
  66. data/lib/sorcery/providers/discord.rb +52 -0
  67. data/lib/sorcery/providers/facebook.rb +8 -11
  68. data/lib/sorcery/providers/github.rb +5 -7
  69. data/lib/sorcery/providers/google.rb +3 -5
  70. data/lib/sorcery/providers/heroku.rb +7 -8
  71. data/lib/sorcery/providers/instagram.rb +73 -0
  72. data/lib/sorcery/providers/jira.rb +12 -17
  73. data/lib/sorcery/providers/line.rb +63 -0
  74. data/lib/sorcery/providers/linkedin.rb +44 -35
  75. data/lib/sorcery/providers/liveid.rb +4 -7
  76. data/lib/sorcery/providers/microsoft.rb +59 -0
  77. data/lib/sorcery/providers/paypal.rb +60 -0
  78. data/lib/sorcery/providers/salesforce.rb +3 -5
  79. data/lib/sorcery/providers/slack.rb +45 -0
  80. data/lib/sorcery/providers/twitter.rb +4 -6
  81. data/lib/sorcery/providers/vk.rb +8 -9
  82. data/lib/sorcery/providers/wechat.rb +81 -0
  83. data/lib/sorcery/providers/xing.rb +7 -10
  84. data/lib/sorcery/test_helpers/internal/rails.rb +25 -17
  85. data/lib/sorcery/test_helpers/internal.rb +15 -14
  86. data/lib/sorcery/test_helpers/rails/controller.rb +1 -1
  87. data/lib/sorcery/test_helpers/rails/integration.rb +5 -6
  88. data/lib/sorcery/test_helpers/rails/request.rb +20 -0
  89. data/lib/sorcery/version.rb +1 -1
  90. data/lib/sorcery.rb +4 -17
  91. data/sorcery.gemspec +43 -28
  92. data/spec/active_record/user_activation_spec.rb +4 -5
  93. data/spec/active_record/user_activity_logging_spec.rb +4 -6
  94. data/spec/active_record/user_brute_force_protection_spec.rb +5 -6
  95. data/spec/active_record/user_magic_login_spec.rb +15 -0
  96. data/spec/active_record/user_oauth_spec.rb +5 -6
  97. data/spec/active_record/user_remember_me_spec.rb +5 -6
  98. data/spec/active_record/user_reset_password_spec.rb +4 -5
  99. data/spec/active_record/user_spec.rb +7 -17
  100. data/spec/controllers/controller_activity_logging_spec.rb +13 -24
  101. data/spec/controllers/controller_brute_force_protection_spec.rb +8 -10
  102. data/spec/controllers/controller_http_basic_auth_spec.rb +20 -21
  103. data/spec/controllers/controller_oauth2_spec.rb +297 -158
  104. data/spec/controllers/controller_oauth_spec.rb +97 -71
  105. data/spec/controllers/controller_remember_me_spec.rb +49 -36
  106. data/spec/controllers/controller_session_timeout_spec.rb +106 -20
  107. data/spec/controllers/controller_spec.rb +87 -111
  108. data/spec/orm/active_record.rb +3 -3
  109. data/spec/providers/example_provider_spec.rb +17 -0
  110. data/spec/providers/example_spec.rb +17 -0
  111. data/spec/providers/examples_spec.rb +17 -0
  112. data/spec/providers/vk_spec.rb +42 -0
  113. data/spec/rails_app/app/active_record/authentication.rb +1 -1
  114. data/spec/rails_app/app/active_record/user.rb +2 -2
  115. data/spec/rails_app/app/assets/config/manifest.js +1 -0
  116. data/spec/rails_app/app/controllers/application_controller.rb +2 -0
  117. data/spec/rails_app/app/controllers/sorcery_controller.rb +250 -46
  118. data/spec/rails_app/app/mailers/sorcery_mailer.rb +23 -17
  119. data/spec/rails_app/app/views/sorcery_mailer/magic_login_email.html.erb +13 -0
  120. data/spec/rails_app/app/views/sorcery_mailer/magic_login_email.text.erb +6 -0
  121. data/spec/rails_app/config/application.rb +14 -9
  122. data/spec/rails_app/config/boot.rb +2 -2
  123. data/spec/rails_app/config/environment.rb +1 -1
  124. data/spec/rails_app/config/environments/test.rb +1 -1
  125. data/spec/rails_app/config/initializers/compatible_legacy_migration.rb +11 -0
  126. data/spec/rails_app/config/initializers/session_store.rb +3 -3
  127. data/spec/rails_app/config/routes.rb +31 -1
  128. data/spec/rails_app/config/secrets.yml +4 -0
  129. data/spec/rails_app/config.ru +1 -1
  130. data/spec/rails_app/db/migrate/activation/20101224223622_add_activation_to_users.rb +4 -4
  131. data/spec/rails_app/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb +10 -10
  132. data/spec/rails_app/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb +5 -5
  133. data/spec/rails_app/db/migrate/core/20101224223620_create_users.rb +5 -5
  134. data/spec/rails_app/db/migrate/external/20101224223628_create_authentications_and_user_providers.rb +3 -3
  135. data/spec/rails_app/db/migrate/invalidate_active_sessions/20180221093235_add_invalidate_active_sessions_before_to_users.rb +9 -0
  136. data/spec/rails_app/db/migrate/magic_login/20170924151831_add_magic_login_to_users.rb +17 -0
  137. data/spec/rails_app/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb +6 -6
  138. data/spec/rails_app/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb +7 -5
  139. data/spec/rails_app/db/schema.rb +7 -9
  140. data/spec/shared_examples/user_activation_shared_examples.rb +177 -58
  141. data/spec/shared_examples/user_activity_logging_shared_examples.rb +47 -41
  142. data/spec/shared_examples/user_brute_force_protection_shared_examples.rb +19 -24
  143. data/spec/shared_examples/user_magic_login_shared_examples.rb +150 -0
  144. data/spec/shared_examples/user_oauth_shared_examples.rb +7 -10
  145. data/spec/shared_examples/user_remember_me_shared_examples.rb +91 -22
  146. data/spec/shared_examples/user_reset_password_shared_examples.rb +153 -58
  147. data/spec/shared_examples/user_shared_examples.rb +328 -145
  148. data/spec/sorcery_crypto_providers_spec.rb +122 -75
  149. data/spec/sorcery_temporary_token_spec.rb +27 -0
  150. data/spec/spec.opts +1 -1
  151. data/spec/spec_helper.rb +19 -14
  152. data/spec/support/migration_helper.rb +29 -0
  153. data/spec/support/providers/example.rb +11 -0
  154. data/spec/support/providers/example_provider.rb +11 -0
  155. data/spec/support/providers/examples.rb +11 -0
  156. metadata +119 -89
  157. data/.travis.yml +0 -132
  158. data/gemfiles/active_record-rails40.gemfile +0 -7
  159. data/gemfiles/active_record-rails41.gemfile +0 -7
  160. data/gemfiles/mongo_mapper-rails40.gemfile +0 -9
  161. data/gemfiles/mongo_mapper-rails41.gemfile +0 -9
  162. data/gemfiles/mongoid-rails40.gemfile +0 -9
  163. data/gemfiles/mongoid-rails41.gemfile +0 -9
  164. data/gemfiles/mongoid3-rails32.gemfile +0 -9
  165. data/lib/sorcery/adapters/data_mapper_adapter.rb +0 -176
  166. data/lib/sorcery/adapters/mongo_mapper_adapter.rb +0 -110
  167. data/lib/sorcery/railties/tasks.rake +0 -6
  168. data/spec/data_mapper/user_activation_spec.rb +0 -10
  169. data/spec/data_mapper/user_activity_logging_spec.rb +0 -14
  170. data/spec/data_mapper/user_brute_force_protection_spec.rb +0 -9
  171. data/spec/data_mapper/user_oauth_spec.rb +0 -9
  172. data/spec/data_mapper/user_remember_me_spec.rb +0 -8
  173. data/spec/data_mapper/user_reset_password_spec.rb +0 -8
  174. data/spec/data_mapper/user_spec.rb +0 -27
  175. data/spec/mongo_mapper/user_activation_spec.rb +0 -9
  176. data/spec/mongo_mapper/user_activity_logging_spec.rb +0 -8
  177. data/spec/mongo_mapper/user_brute_force_protection_spec.rb +0 -8
  178. data/spec/mongo_mapper/user_oauth_spec.rb +0 -8
  179. data/spec/mongo_mapper/user_remember_me_spec.rb +0 -8
  180. data/spec/mongo_mapper/user_reset_password_spec.rb +0 -8
  181. data/spec/mongo_mapper/user_spec.rb +0 -37
  182. data/spec/mongoid/user_activation_spec.rb +0 -9
  183. data/spec/mongoid/user_activity_logging_spec.rb +0 -8
  184. data/spec/mongoid/user_brute_force_protection_spec.rb +0 -8
  185. data/spec/mongoid/user_oauth_spec.rb +0 -8
  186. data/spec/mongoid/user_remember_me_spec.rb +0 -8
  187. data/spec/mongoid/user_reset_password_spec.rb +0 -8
  188. data/spec/mongoid/user_spec.rb +0 -51
  189. data/spec/orm/data_mapper.rb +0 -48
  190. data/spec/orm/mongo_mapper.rb +0 -10
  191. data/spec/orm/mongoid.rb +0 -22
  192. data/spec/rails_app/app/data_mapper/authentication.rb +0 -8
  193. data/spec/rails_app/app/data_mapper/user.rb +0 -7
  194. data/spec/rails_app/app/mongo_mapper/authentication.rb +0 -6
  195. data/spec/rails_app/app/mongo_mapper/user.rb +0 -7
  196. data/spec/rails_app/app/mongoid/authentication.rb +0 -7
  197. data/spec/rails_app/app/mongoid/user.rb +0 -7
  198. data/spec/rails_app/config/initializers/secret_token.rb +0 -7
  199. data/spec/rails_app/log/development.log +0 -1791
@@ -1,5 +1,5 @@
1
1
  AppRoot::Application.routes.draw do
2
- root :to => "application#index"
2
+ root to: 'application#index'
3
3
 
4
4
  controller :sorcery do
5
5
  get :test_login
@@ -11,6 +11,9 @@ AppRoot::Application.routes.draw do
11
11
  get :test_login_from_cookie
12
12
  get :test_login_from
13
13
  get :test_logout_with_remember
14
+ get :test_logout_with_forget_me
15
+ get :test_logout_with_force_forget_me
16
+ get :test_invalidate_active_session
14
17
  get :test_should_be_logged_in
15
18
  get :test_create_from_provider
16
19
  get :test_add_second_provider
@@ -19,29 +22,56 @@ AppRoot::Application.routes.draw do
19
22
  get :test_login_from_twitter
20
23
  get :test_login_from_facebook
21
24
  get :test_login_from_github
25
+ get :test_login_from_paypal
26
+ get :test_login_from_wechat
27
+ get :test_login_from_microsoft
22
28
  get :test_login_from_google
23
29
  get :test_login_from_liveid
24
30
  get :test_login_from_vk
25
31
  get :test_login_from_jira
26
32
  get :test_login_from_salesforce
33
+ get :test_login_from_slack
34
+ get :test_login_from_instagram
35
+ get :test_login_from_auth0
36
+ get :test_login_from_line
37
+ get :test_login_from_discord
38
+ get :test_login_from_battlenet
27
39
  get :login_at_test
28
40
  get :login_at_test_twitter
29
41
  get :login_at_test_facebook
30
42
  get :login_at_test_github
43
+ get :login_at_test_paypal
44
+ get :login_at_test_wechat
45
+ get :login_at_test_microsoft
31
46
  get :login_at_test_google
32
47
  get :login_at_test_liveid
33
48
  get :login_at_test_vk
34
49
  get :login_at_test_jira
35
50
  get :login_at_test_salesforce
51
+ get :login_at_test_slack
52
+ get :login_at_test_instagram
53
+ get :login_at_test_auth0
54
+ get :login_at_test_line
55
+ get :login_at_test_discord
56
+ get :login_at_test_battlenet
36
57
  get :test_return_to_with_external
37
58
  get :test_return_to_with_external_twitter
38
59
  get :test_return_to_with_external_facebook
39
60
  get :test_return_to_with_external_github
61
+ get :test_return_to_with_external_paypal
62
+ get :test_return_to_with_external_wechat
63
+ get :test_return_to_with_external_microsoft
40
64
  get :test_return_to_with_external_google
41
65
  get :test_return_to_with_external_liveid
42
66
  get :test_return_to_with_external_vk
43
67
  get :test_return_to_with_external_jira
44
68
  get :test_return_to_with_external_salesforce
69
+ get :test_return_to_with_external_slack
70
+ get :test_return_to_with_external_instagram
71
+ get :test_return_to_with_external_auth0
72
+ get :test_return_to_with_external_line
73
+ get :test_return_to_with_external_discord
74
+ get :test_return_to_with_external_battlenet
45
75
  get :test_http_basic_auth
46
76
  get :some_action_making_a_non_persisted_change_to_the_user
47
77
  post :test_login_with_remember
@@ -0,0 +1,4 @@
1
+ # secrets.yml
2
+
3
+ test:
4
+ secret_key_base: 'a9789f869a0d0ac2f2b683d6e9410c530696b178bca28a7971f4a652b14ff2da89f2cf4dcbf0355f6bc41f81731aa8e46085674d1acc1980436f61cdba76ff5d'
@@ -1,4 +1,4 @@
1
1
  # This file is used by Rack-based servers to start the application.
2
2
 
3
- require ::File.expand_path('../config/environment', __FILE__)
3
+ require ::File.expand_path('../config/environment', __FILE__)
4
4
  run RailsApp::Application
@@ -1,8 +1,8 @@
1
- class AddActivationToUsers < ActiveRecord::Migration
1
+ class AddActivationToUsers < ActiveRecord::CompatibleLegacyMigration.migration_class
2
2
  def self.up
3
- add_column :users, :activation_state, :string, :default => nil
4
- add_column :users, :activation_token, :string, :default => nil
5
- add_column :users, :activation_token_expires_at, :datetime, :default => nil
3
+ add_column :users, :activation_state, :string, default: nil
4
+ add_column :users, :activation_token, :string, default: nil
5
+ add_column :users, :activation_token_expires_at, :datetime, default: nil
6
6
 
7
7
  add_index :users, :activation_token
8
8
  end
@@ -1,19 +1,19 @@
1
- class AddActivityLoggingToUsers < ActiveRecord::Migration
1
+ class AddActivityLoggingToUsers < ActiveRecord::CompatibleLegacyMigration.migration_class
2
2
  def self.up
3
- add_column :users, :last_login_at, :datetime, :default => nil
4
- add_column :users, :last_logout_at, :datetime, :default => nil
5
- add_column :users, :last_activity_at, :datetime, :default => nil
6
- add_column :users, :last_login_from_ip_address, :string, :default => nil
7
-
8
- add_index :users, [:last_logout_at, :last_activity_at]
3
+ add_column :users, :last_login_at, :datetime, default: nil
4
+ add_column :users, :last_logout_at, :datetime, default: nil
5
+ add_column :users, :last_activity_at, :datetime, default: nil
6
+ add_column :users, :last_login_from_ip_address, :string, default: nil
7
+
8
+ add_index :users, %i[last_logout_at last_activity_at]
9
9
  end
10
10
 
11
11
  def self.down
12
- remove_index :users, [:last_logout_at, :last_activity_at]
13
-
12
+ remove_index :users, %i[last_logout_at last_activity_at]
13
+
14
14
  remove_column :users, :last_activity_at
15
15
  remove_column :users, :last_logout_at
16
16
  remove_column :users, :last_login_at
17
17
  remove_column :users, :last_login_from_ip_address
18
18
  end
19
- end
19
+ end
@@ -1,8 +1,8 @@
1
- class AddBruteForceProtectionToUsers < ActiveRecord::Migration
1
+ class AddBruteForceProtectionToUsers < ActiveRecord::CompatibleLegacyMigration.migration_class
2
2
  def self.up
3
- add_column :users, :failed_logins_count, :integer, :default => 0
4
- add_column :users, :lock_expires_at, :datetime, :default => nil
5
- add_column :users, :unlock_token, :string, :default => nil
3
+ add_column :users, :failed_logins_count, :integer, default: 0
4
+ add_column :users, :lock_expires_at, :datetime, default: nil
5
+ add_column :users, :unlock_token, :string, default: nil
6
6
  end
7
7
 
8
8
  def self.down
@@ -10,4 +10,4 @@ class AddBruteForceProtectionToUsers < ActiveRecord::Migration
10
10
  remove_column :users, :lock_expires_at
11
11
  remove_column :users, :failed_logins_count
12
12
  end
13
- end
13
+ end
@@ -1,16 +1,16 @@
1
- class CreateUsers < ActiveRecord::Migration
1
+ class CreateUsers < ActiveRecord::CompatibleLegacyMigration.migration_class
2
2
  def self.up
3
3
  create_table :users do |t|
4
- t.string :username, :null => false
5
- t.string :email, :default => nil
4
+ t.string :username, null: false
5
+ t.string :email, default: nil
6
6
  t.string :crypted_password
7
7
  t.string :salt
8
8
 
9
- t.timestamps
9
+ t.timestamps null: false
10
10
  end
11
11
  end
12
12
 
13
13
  def self.down
14
14
  drop_table :users
15
15
  end
16
- end
16
+ end
@@ -1,17 +1,17 @@
1
- class CreateAuthenticationsAndUserProviders < ActiveRecord::Migration
1
+ class CreateAuthenticationsAndUserProviders < ActiveRecord::CompatibleLegacyMigration.migration_class
2
2
  def self.up
3
3
  create_table :authentications do |t|
4
4
  t.integer :user_id, null: false
5
5
  t.string :provider, :uid, null: false
6
6
 
7
- t.timestamps
7
+ t.timestamps null: false
8
8
  end
9
9
 
10
10
  create_table :user_providers do |t|
11
11
  t.integer :user_id, null: false
12
12
  t.string :provider, :uid, null: false
13
13
 
14
- t.timestamps
14
+ t.timestamps null: false
15
15
  end
16
16
  end
17
17
 
@@ -0,0 +1,9 @@
1
+ class AddInvalidateSessionsBeforeToUsers < ActiveRecord::CompatibleLegacyMigration.migration_class
2
+ def self.up
3
+ add_column :users, :invalidate_sessions_before, :datetime, default: nil
4
+ end
5
+
6
+ def self.down
7
+ remove_column :users, :invalidate_sessions_before
8
+ end
9
+ end
@@ -0,0 +1,17 @@
1
+ class AddMagicLoginToUsers < ActiveRecord::CompatibleLegacyMigration.migration_class
2
+ def self.up
3
+ add_column :users, :magic_login_token, :string, default: nil
4
+ add_column :users, :magic_login_token_expires_at, :datetime, default: nil
5
+ add_column :users, :magic_login_email_sent_at, :datetime, default: nil
6
+
7
+ add_index :users, :magic_login_token
8
+ end
9
+
10
+ def self.down
11
+ remove_index :users, :magic_login_token
12
+
13
+ remove_column :users, :magic_login_token
14
+ remove_column :users, :magic_login_token_expires_at
15
+ remove_column :users, :magic_login_email_sent_at
16
+ end
17
+ end
@@ -1,15 +1,15 @@
1
- class AddRememberMeTokenToUsers < ActiveRecord::Migration
1
+ class AddRememberMeTokenToUsers < ActiveRecord::CompatibleLegacyMigration.migration_class
2
2
  def self.up
3
- add_column :users, :remember_me_token, :string, :default => nil
4
- add_column :users, :remember_me_token_expires_at, :datetime, :default => nil
5
-
3
+ add_column :users, :remember_me_token, :string, default: nil
4
+ add_column :users, :remember_me_token_expires_at, :datetime, default: nil
5
+
6
6
  add_index :users, :remember_me_token
7
7
  end
8
8
 
9
9
  def self.down
10
10
  remove_index :users, :remember_me_token
11
-
11
+
12
12
  remove_column :users, :remember_me_token_expires_at
13
13
  remove_column :users, :remember_me_token
14
14
  end
15
- end
15
+ end
@@ -1,13 +1,15 @@
1
- class AddResetPasswordToUsers < ActiveRecord::Migration
1
+ class AddResetPasswordToUsers < ActiveRecord::CompatibleLegacyMigration.migration_class
2
2
  def self.up
3
- add_column :users, :reset_password_token, :string, :default => nil
4
- add_column :users, :reset_password_token_expires_at, :datetime, :default => nil
5
- add_column :users, :reset_password_email_sent_at, :datetime, :default => nil
3
+ add_column :users, :reset_password_token, :string, default: nil
4
+ add_column :users, :reset_password_token_expires_at, :datetime, default: nil
5
+ add_column :users, :reset_password_email_sent_at, :datetime, default: nil
6
+ add_column :users, :access_count_to_reset_password_page, :integer, default: 0
6
7
  end
7
8
 
8
9
  def self.down
9
10
  remove_column :users, :reset_password_email_sent_at
10
11
  remove_column :users, :reset_password_token_expires_at
11
12
  remove_column :users, :reset_password_token
13
+ remove_column :users, :access_count_to_reset_password_page
12
14
  end
13
- end
15
+ end
@@ -10,14 +10,12 @@
10
10
  #
11
11
  # It's strongly recommended to check this file into your version control system.
12
12
 
13
- ActiveRecord::Schema.define(:version => 20101224223620) do
14
-
15
- create_table "users", :force => true do |t|
16
- t.string "username"
17
- t.string "email"
18
- t.string "crypted_password"
19
- t.datetime "created_at"
20
- t.datetime "updated_at"
13
+ ActiveRecord::Schema.define(version: 20_101_224_223_620) do
14
+ create_table 'users', force: true do |t|
15
+ t.string 'username'
16
+ t.string 'email'
17
+ t.string 'crypted_password'
18
+ t.datetime 'created_at'
19
+ t.datetime 'updated_at'
21
20
  end
22
-
23
21
  end