sorcery 0.9.1 → 0.16.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.github/FUNDING.yml +1 -0
- data/.github/ISSUE_TEMPLATE.md +24 -0
- data/.github/PULL_REQUEST_TEMPLATE.md +7 -0
- data/.github/workflows/ruby.yml +70 -0
- data/.gitignore +3 -0
- data/.rubocop.yml +55 -0
- data/.rubocop_todo.yml +163 -0
- data/CHANGELOG.md +132 -34
- data/CODE_OF_CONDUCT.md +14 -0
- data/Gemfile +3 -17
- data/{LICENSE.txt → LICENSE.md} +1 -1
- data/MAINTAINING.md +64 -0
- data/README.md +146 -269
- data/Rakefile +4 -2
- data/SECURITY.md +19 -0
- data/gemfiles/rails_52.gemfile +7 -0
- data/gemfiles/rails_60.gemfile +7 -0
- data/gemfiles/rails_61.gemfile +7 -0
- data/gemfiles/rails_70.gemfile +7 -0
- data/lib/generators/sorcery/USAGE +1 -1
- data/lib/generators/sorcery/helpers.rb +8 -4
- data/lib/generators/sorcery/install_generator.rb +41 -35
- data/lib/generators/sorcery/templates/initializer.rb +216 -112
- data/lib/generators/sorcery/templates/migration/activity_logging.rb +7 -7
- data/lib/generators/sorcery/templates/migration/brute_force_protection.rb +5 -5
- data/lib/generators/sorcery/templates/migration/core.rb +5 -7
- data/lib/generators/sorcery/templates/migration/external.rb +4 -4
- data/lib/generators/sorcery/templates/migration/magic_login.rb +9 -0
- data/lib/generators/sorcery/templates/migration/remember_me.rb +5 -5
- data/lib/generators/sorcery/templates/migration/reset_password.rb +7 -6
- data/lib/generators/sorcery/templates/migration/user_activation.rb +6 -6
- data/lib/sorcery/adapters/active_record_adapter.rb +11 -21
- data/lib/sorcery/adapters/mongoid_adapter.rb +23 -11
- data/lib/sorcery/controller/config.rb +27 -23
- data/lib/sorcery/controller/submodules/activity_logging.rb +16 -18
- data/lib/sorcery/controller/submodules/brute_force_protection.rb +1 -2
- data/lib/sorcery/controller/submodules/external.rb +69 -44
- data/lib/sorcery/controller/submodules/http_basic_auth.rb +18 -19
- data/lib/sorcery/controller/submodules/remember_me.rb +16 -16
- data/lib/sorcery/controller/submodules/session_timeout.rb +33 -11
- data/lib/sorcery/controller.rb +50 -35
- data/lib/sorcery/crypto_providers/aes256.rb +17 -16
- data/lib/sorcery/crypto_providers/bcrypt.rb +26 -22
- data/lib/sorcery/crypto_providers/common.rb +1 -1
- data/lib/sorcery/crypto_providers/md5.rb +5 -5
- data/lib/sorcery/crypto_providers/sha1.rb +5 -5
- data/lib/sorcery/crypto_providers/sha256.rb +2 -2
- data/lib/sorcery/crypto_providers/sha512.rb +3 -3
- data/lib/sorcery/engine.rb +19 -11
- data/lib/sorcery/model/config.rb +73 -50
- data/lib/sorcery/model/submodules/activity_logging.rb +31 -12
- data/lib/sorcery/model/submodules/brute_force_protection.rb +38 -31
- data/lib/sorcery/model/submodules/external.rb +22 -10
- data/lib/sorcery/model/submodules/magic_login.rb +130 -0
- data/lib/sorcery/model/submodules/remember_me.rb +19 -7
- data/lib/sorcery/model/submodules/reset_password.rb +64 -42
- data/lib/sorcery/model/submodules/user_activation.rb +52 -54
- data/lib/sorcery/model/temporary_token.rb +30 -7
- data/lib/sorcery/model.rb +65 -40
- data/lib/sorcery/protocols/oauth.rb +4 -9
- data/lib/sorcery/protocols/oauth2.rb +0 -2
- data/lib/sorcery/providers/auth0.rb +46 -0
- data/lib/sorcery/providers/base.rb +4 -4
- data/lib/sorcery/providers/battlenet.rb +51 -0
- data/lib/sorcery/providers/discord.rb +52 -0
- data/lib/sorcery/providers/facebook.rb +8 -11
- data/lib/sorcery/providers/github.rb +5 -7
- data/lib/sorcery/providers/google.rb +3 -5
- data/lib/sorcery/providers/heroku.rb +7 -8
- data/lib/sorcery/providers/instagram.rb +73 -0
- data/lib/sorcery/providers/jira.rb +12 -17
- data/lib/sorcery/providers/line.rb +63 -0
- data/lib/sorcery/providers/linkedin.rb +44 -35
- data/lib/sorcery/providers/liveid.rb +4 -7
- data/lib/sorcery/providers/microsoft.rb +59 -0
- data/lib/sorcery/providers/paypal.rb +60 -0
- data/lib/sorcery/providers/salesforce.rb +3 -5
- data/lib/sorcery/providers/slack.rb +45 -0
- data/lib/sorcery/providers/twitter.rb +4 -6
- data/lib/sorcery/providers/vk.rb +8 -9
- data/lib/sorcery/providers/wechat.rb +81 -0
- data/lib/sorcery/providers/xing.rb +7 -10
- data/lib/sorcery/test_helpers/internal/rails.rb +25 -17
- data/lib/sorcery/test_helpers/internal.rb +15 -14
- data/lib/sorcery/test_helpers/rails/controller.rb +1 -1
- data/lib/sorcery/test_helpers/rails/integration.rb +5 -6
- data/lib/sorcery/test_helpers/rails/request.rb +20 -0
- data/lib/sorcery/version.rb +1 -1
- data/lib/sorcery.rb +4 -17
- data/sorcery.gemspec +43 -28
- data/spec/active_record/user_activation_spec.rb +4 -5
- data/spec/active_record/user_activity_logging_spec.rb +4 -6
- data/spec/active_record/user_brute_force_protection_spec.rb +5 -6
- data/spec/active_record/user_magic_login_spec.rb +15 -0
- data/spec/active_record/user_oauth_spec.rb +5 -6
- data/spec/active_record/user_remember_me_spec.rb +5 -6
- data/spec/active_record/user_reset_password_spec.rb +4 -5
- data/spec/active_record/user_spec.rb +7 -17
- data/spec/controllers/controller_activity_logging_spec.rb +13 -24
- data/spec/controllers/controller_brute_force_protection_spec.rb +8 -10
- data/spec/controllers/controller_http_basic_auth_spec.rb +20 -21
- data/spec/controllers/controller_oauth2_spec.rb +297 -158
- data/spec/controllers/controller_oauth_spec.rb +97 -71
- data/spec/controllers/controller_remember_me_spec.rb +49 -36
- data/spec/controllers/controller_session_timeout_spec.rb +106 -20
- data/spec/controllers/controller_spec.rb +87 -111
- data/spec/orm/active_record.rb +3 -3
- data/spec/providers/example_provider_spec.rb +17 -0
- data/spec/providers/example_spec.rb +17 -0
- data/spec/providers/examples_spec.rb +17 -0
- data/spec/providers/vk_spec.rb +42 -0
- data/spec/rails_app/app/active_record/authentication.rb +1 -1
- data/spec/rails_app/app/active_record/user.rb +2 -2
- data/spec/rails_app/app/assets/config/manifest.js +1 -0
- data/spec/rails_app/app/controllers/application_controller.rb +2 -0
- data/spec/rails_app/app/controllers/sorcery_controller.rb +250 -46
- data/spec/rails_app/app/mailers/sorcery_mailer.rb +23 -17
- data/spec/rails_app/app/views/sorcery_mailer/magic_login_email.html.erb +13 -0
- data/spec/rails_app/app/views/sorcery_mailer/magic_login_email.text.erb +6 -0
- data/spec/rails_app/config/application.rb +14 -9
- data/spec/rails_app/config/boot.rb +2 -2
- data/spec/rails_app/config/environment.rb +1 -1
- data/spec/rails_app/config/environments/test.rb +1 -1
- data/spec/rails_app/config/initializers/compatible_legacy_migration.rb +11 -0
- data/spec/rails_app/config/initializers/session_store.rb +3 -3
- data/spec/rails_app/config/routes.rb +31 -1
- data/spec/rails_app/config/secrets.yml +4 -0
- data/spec/rails_app/config.ru +1 -1
- data/spec/rails_app/db/migrate/activation/20101224223622_add_activation_to_users.rb +4 -4
- data/spec/rails_app/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb +10 -10
- data/spec/rails_app/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb +5 -5
- data/spec/rails_app/db/migrate/core/20101224223620_create_users.rb +5 -5
- data/spec/rails_app/db/migrate/external/20101224223628_create_authentications_and_user_providers.rb +3 -3
- data/spec/rails_app/db/migrate/invalidate_active_sessions/20180221093235_add_invalidate_active_sessions_before_to_users.rb +9 -0
- data/spec/rails_app/db/migrate/magic_login/20170924151831_add_magic_login_to_users.rb +17 -0
- data/spec/rails_app/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb +6 -6
- data/spec/rails_app/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb +7 -5
- data/spec/rails_app/db/schema.rb +7 -9
- data/spec/shared_examples/user_activation_shared_examples.rb +177 -58
- data/spec/shared_examples/user_activity_logging_shared_examples.rb +47 -41
- data/spec/shared_examples/user_brute_force_protection_shared_examples.rb +19 -24
- data/spec/shared_examples/user_magic_login_shared_examples.rb +150 -0
- data/spec/shared_examples/user_oauth_shared_examples.rb +7 -10
- data/spec/shared_examples/user_remember_me_shared_examples.rb +91 -22
- data/spec/shared_examples/user_reset_password_shared_examples.rb +153 -58
- data/spec/shared_examples/user_shared_examples.rb +328 -145
- data/spec/sorcery_crypto_providers_spec.rb +122 -75
- data/spec/sorcery_temporary_token_spec.rb +27 -0
- data/spec/spec.opts +1 -1
- data/spec/spec_helper.rb +19 -14
- data/spec/support/migration_helper.rb +29 -0
- data/spec/support/providers/example.rb +11 -0
- data/spec/support/providers/example_provider.rb +11 -0
- data/spec/support/providers/examples.rb +11 -0
- metadata +119 -89
- data/.travis.yml +0 -132
- data/gemfiles/active_record-rails40.gemfile +0 -7
- data/gemfiles/active_record-rails41.gemfile +0 -7
- data/gemfiles/mongo_mapper-rails40.gemfile +0 -9
- data/gemfiles/mongo_mapper-rails41.gemfile +0 -9
- data/gemfiles/mongoid-rails40.gemfile +0 -9
- data/gemfiles/mongoid-rails41.gemfile +0 -9
- data/gemfiles/mongoid3-rails32.gemfile +0 -9
- data/lib/sorcery/adapters/data_mapper_adapter.rb +0 -176
- data/lib/sorcery/adapters/mongo_mapper_adapter.rb +0 -110
- data/lib/sorcery/railties/tasks.rake +0 -6
- data/spec/data_mapper/user_activation_spec.rb +0 -10
- data/spec/data_mapper/user_activity_logging_spec.rb +0 -14
- data/spec/data_mapper/user_brute_force_protection_spec.rb +0 -9
- data/spec/data_mapper/user_oauth_spec.rb +0 -9
- data/spec/data_mapper/user_remember_me_spec.rb +0 -8
- data/spec/data_mapper/user_reset_password_spec.rb +0 -8
- data/spec/data_mapper/user_spec.rb +0 -27
- data/spec/mongo_mapper/user_activation_spec.rb +0 -9
- data/spec/mongo_mapper/user_activity_logging_spec.rb +0 -8
- data/spec/mongo_mapper/user_brute_force_protection_spec.rb +0 -8
- data/spec/mongo_mapper/user_oauth_spec.rb +0 -8
- data/spec/mongo_mapper/user_remember_me_spec.rb +0 -8
- data/spec/mongo_mapper/user_reset_password_spec.rb +0 -8
- data/spec/mongo_mapper/user_spec.rb +0 -37
- data/spec/mongoid/user_activation_spec.rb +0 -9
- data/spec/mongoid/user_activity_logging_spec.rb +0 -8
- data/spec/mongoid/user_brute_force_protection_spec.rb +0 -8
- data/spec/mongoid/user_oauth_spec.rb +0 -8
- data/spec/mongoid/user_remember_me_spec.rb +0 -8
- data/spec/mongoid/user_reset_password_spec.rb +0 -8
- data/spec/mongoid/user_spec.rb +0 -51
- data/spec/orm/data_mapper.rb +0 -48
- data/spec/orm/mongo_mapper.rb +0 -10
- data/spec/orm/mongoid.rb +0 -22
- data/spec/rails_app/app/data_mapper/authentication.rb +0 -8
- data/spec/rails_app/app/data_mapper/user.rb +0 -7
- data/spec/rails_app/app/mongo_mapper/authentication.rb +0 -6
- data/spec/rails_app/app/mongo_mapper/user.rb +0 -7
- data/spec/rails_app/app/mongoid/authentication.rb +0 -7
- data/spec/rails_app/app/mongoid/user.rb +0 -7
- data/spec/rails_app/config/initializers/secret_token.rb +0 -7
- data/spec/rails_app/log/development.log +0 -1791
@@ -1,5 +1,5 @@
|
|
1
1
|
AppRoot::Application.routes.draw do
|
2
|
-
root :
|
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
|
data/spec/rails_app/config.ru
CHANGED
@@ -1,8 +1,8 @@
|
|
1
|
-
class AddActivationToUsers < ActiveRecord::
|
1
|
+
class AddActivationToUsers < ActiveRecord::CompatibleLegacyMigration.migration_class
|
2
2
|
def self.up
|
3
|
-
add_column :users, :activation_state, :string, :
|
4
|
-
add_column :users, :activation_token, :string, :
|
5
|
-
add_column :users, :activation_token_expires_at, :datetime, :
|
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
|
data/spec/rails_app/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb
CHANGED
@@ -1,19 +1,19 @@
|
|
1
|
-
class AddActivityLoggingToUsers < ActiveRecord::
|
1
|
+
class AddActivityLoggingToUsers < ActiveRecord::CompatibleLegacyMigration.migration_class
|
2
2
|
def self.up
|
3
|
-
add_column :users, :last_login_at, :datetime, :
|
4
|
-
add_column :users, :last_logout_at, :datetime, :
|
5
|
-
add_column :users, :last_activity_at, :datetime, :
|
6
|
-
add_column :users, :last_login_from_ip_address,
|
7
|
-
|
8
|
-
add_index :users, [
|
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, [
|
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::
|
1
|
+
class AddBruteForceProtectionToUsers < ActiveRecord::CompatibleLegacyMigration.migration_class
|
2
2
|
def self.up
|
3
|
-
add_column :users, :failed_logins_count, :integer, :
|
4
|
-
add_column :users, :lock_expires_at, :datetime, :
|
5
|
-
add_column :users, :unlock_token, :string, :
|
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::
|
1
|
+
class CreateUsers < ActiveRecord::CompatibleLegacyMigration.migration_class
|
2
2
|
def self.up
|
3
3
|
create_table :users do |t|
|
4
|
-
t.string :username, :
|
5
|
-
t.string :email, :
|
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
|
data/spec/rails_app/db/migrate/external/20101224223628_create_authentications_and_user_providers.rb
CHANGED
@@ -1,17 +1,17 @@
|
|
1
|
-
class CreateAuthenticationsAndUserProviders < ActiveRecord::
|
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::
|
1
|
+
class AddRememberMeTokenToUsers < ActiveRecord::CompatibleLegacyMigration.migration_class
|
2
2
|
def self.up
|
3
|
-
add_column :users, :remember_me_token, :string, :
|
4
|
-
add_column :users, :remember_me_token_expires_at, :datetime, :
|
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::
|
1
|
+
class AddResetPasswordToUsers < ActiveRecord::CompatibleLegacyMigration.migration_class
|
2
2
|
def self.up
|
3
|
-
add_column :users, :reset_password_token, :string, :
|
4
|
-
add_column :users, :reset_password_token_expires_at, :datetime, :
|
5
|
-
add_column :users, :reset_password_email_sent_at, :datetime, :
|
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
|
data/spec/rails_app/db/schema.rb
CHANGED
@@ -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(:
|
14
|
-
|
15
|
-
|
16
|
-
t.string
|
17
|
-
t.string
|
18
|
-
t.
|
19
|
-
t.datetime
|
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
|