devise 3.0.0 → 4.8.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/CHANGELOG.md +351 -0
- data/MIT-LICENSE +2 -1
- data/README.md +422 -130
- data/app/controllers/devise/confirmations_controller.rb +17 -6
- data/app/controllers/devise/omniauth_callbacks_controller.rb +12 -6
- data/app/controllers/devise/passwords_controller.rb +23 -8
- data/app/controllers/devise/registrations_controller.rb +70 -28
- data/app/controllers/devise/sessions_controller.rb +49 -17
- data/app/controllers/devise/unlocks_controller.rb +11 -4
- data/app/controllers/devise_controller.rb +74 -34
- data/app/helpers/devise_helper.rb +23 -18
- data/app/mailers/devise/mailer.rb +25 -10
- data/app/views/devise/confirmations/new.html.erb +9 -5
- data/app/views/devise/mailer/confirmation_instructions.html.erb +1 -1
- data/app/views/devise/mailer/email_changed.html.erb +7 -0
- data/app/views/devise/mailer/password_change.html.erb +3 -0
- data/app/views/devise/mailer/reset_password_instructions.html.erb +1 -1
- data/app/views/devise/mailer/unlock_instructions.html.erb +1 -1
- data/app/views/devise/passwords/edit.html.erb +16 -7
- data/app/views/devise/passwords/new.html.erb +9 -5
- data/app/views/devise/registrations/edit.html.erb +29 -15
- data/app/views/devise/registrations/new.html.erb +20 -9
- data/app/views/devise/sessions/new.html.erb +19 -10
- data/app/views/devise/shared/_error_messages.html.erb +15 -0
- data/app/views/devise/shared/{_links.erb → _links.html.erb} +10 -10
- data/app/views/devise/unlocks/new.html.erb +9 -5
- data/config/locales/en.yml +26 -20
- data/lib/devise/controllers/helpers.rb +122 -125
- data/lib/devise/controllers/rememberable.rb +14 -14
- data/lib/devise/controllers/scoped_views.rb +3 -1
- data/lib/devise/controllers/sign_in_out.rb +121 -0
- data/lib/devise/controllers/store_location.rb +76 -0
- data/lib/devise/controllers/url_helpers.rb +10 -8
- data/lib/devise/delegator.rb +2 -0
- data/lib/devise/encryptor.rb +24 -0
- data/lib/devise/failure_app.rb +132 -42
- data/lib/devise/hooks/activatable.rb +7 -6
- data/lib/devise/hooks/csrf_cleaner.rb +9 -0
- data/lib/devise/hooks/forgetable.rb +3 -1
- data/lib/devise/hooks/lockable.rb +5 -3
- data/lib/devise/hooks/proxy.rb +23 -0
- data/lib/devise/hooks/rememberable.rb +7 -4
- data/lib/devise/hooks/timeoutable.rb +18 -8
- data/lib/devise/hooks/trackable.rb +3 -1
- data/lib/devise/mailers/helpers.rb +15 -18
- data/lib/devise/mapping.rb +9 -3
- data/lib/devise/models/authenticatable.rb +102 -80
- data/lib/devise/models/confirmable.rb +154 -72
- data/lib/devise/models/database_authenticatable.rb +125 -25
- data/lib/devise/models/lockable.rb +50 -29
- data/lib/devise/models/omniauthable.rb +3 -1
- data/lib/devise/models/recoverable.rb +72 -50
- data/lib/devise/models/registerable.rb +4 -0
- data/lib/devise/models/rememberable.rb +65 -32
- data/lib/devise/models/timeoutable.rb +4 -8
- data/lib/devise/models/trackable.rb +20 -4
- data/lib/devise/models/validatable.rb +16 -9
- data/lib/devise/models.rb +6 -13
- data/lib/devise/modules.rb +12 -11
- data/lib/devise/omniauth/config.rb +2 -0
- data/lib/devise/omniauth/url_helpers.rb +14 -5
- data/lib/devise/omniauth.rb +4 -5
- data/lib/devise/orm/active_record.rb +5 -1
- data/lib/devise/orm/mongoid.rb +6 -2
- data/lib/devise/parameter_filter.rb +4 -0
- data/lib/devise/parameter_sanitizer.rb +144 -34
- data/lib/devise/rails/deprecated_constant_accessor.rb +39 -0
- data/lib/devise/rails/routes.rb +191 -127
- data/lib/devise/rails/warden_compat.rb +2 -1
- data/lib/devise/rails.rb +13 -20
- data/lib/devise/secret_key_finder.rb +27 -0
- data/lib/devise/strategies/authenticatable.rb +21 -22
- data/lib/devise/strategies/base.rb +3 -1
- data/lib/devise/strategies/database_authenticatable.rb +15 -4
- data/lib/devise/strategies/rememberable.rb +15 -3
- data/lib/devise/test/controller_helpers.rb +167 -0
- data/lib/devise/test/integration_helpers.rb +63 -0
- data/lib/devise/test_helpers.rb +7 -123
- data/lib/devise/time_inflector.rb +4 -2
- data/lib/devise/token_generator.rb +32 -0
- data/lib/devise/version.rb +3 -1
- data/lib/devise.rb +124 -78
- data/lib/generators/active_record/devise_generator.rb +64 -15
- data/lib/generators/active_record/templates/migration.rb +9 -8
- data/lib/generators/active_record/templates/migration_existing.rb +9 -8
- data/lib/generators/devise/controllers_generator.rb +46 -0
- data/lib/generators/devise/devise_generator.rb +10 -6
- data/lib/generators/devise/install_generator.rb +19 -1
- data/lib/generators/devise/orm_helpers.rb +17 -9
- data/lib/generators/devise/views_generator.rb +51 -28
- data/lib/generators/mongoid/devise_generator.rb +24 -24
- data/lib/generators/templates/README +13 -12
- data/lib/generators/templates/controllers/README +14 -0
- data/lib/generators/templates/controllers/confirmations_controller.rb +30 -0
- data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +30 -0
- data/lib/generators/templates/controllers/passwords_controller.rb +34 -0
- data/lib/generators/templates/controllers/registrations_controller.rb +62 -0
- data/lib/generators/templates/controllers/sessions_controller.rb +27 -0
- data/lib/generators/templates/controllers/unlocks_controller.rb +30 -0
- data/lib/generators/templates/devise.rb +118 -53
- data/lib/generators/templates/markerb/confirmation_instructions.markerb +1 -1
- data/lib/generators/templates/markerb/email_changed.markerb +7 -0
- data/lib/generators/templates/markerb/password_change.markerb +3 -0
- data/lib/generators/templates/markerb/reset_password_instructions.markerb +1 -1
- data/lib/generators/templates/markerb/unlock_instructions.markerb +1 -1
- data/lib/generators/templates/simple_form_for/confirmations/new.html.erb +6 -2
- data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +12 -4
- data/lib/generators/templates/simple_form_for/passwords/new.html.erb +5 -2
- data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +14 -6
- data/lib/generators/templates/simple_form_for/registrations/new.html.erb +12 -4
- data/lib/generators/templates/simple_form_for/sessions/new.html.erb +11 -6
- data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +5 -2
- metadata +73 -294
- data/.gitignore +0 -10
- data/.travis.yml +0 -20
- data/.yardopts +0 -9
- data/CHANGELOG.rdoc +0 -941
- data/CONTRIBUTING.md +0 -14
- data/Gemfile +0 -31
- data/Gemfile.lock +0 -159
- data/Rakefile +0 -35
- data/app/views/devise/_links.erb +0 -3
- data/devise.gemspec +0 -26
- data/devise.png +0 -0
- data/gemfiles/Gemfile.rails-3.2.x +0 -31
- data/gemfiles/Gemfile.rails-3.2.x.lock +0 -156
- data/lib/devise/models/token_authenticatable.rb +0 -89
- data/lib/devise/strategies/token_authenticatable.rb +0 -91
- data/test/controllers/custom_strategy_test.rb +0 -62
- data/test/controllers/helpers_test.rb +0 -253
- data/test/controllers/internal_helpers_test.rb +0 -120
- data/test/controllers/passwords_controller_test.rb +0 -32
- data/test/controllers/sessions_controller_test.rb +0 -99
- data/test/controllers/url_helpers_test.rb +0 -59
- data/test/delegator_test.rb +0 -19
- data/test/devise_test.rb +0 -83
- data/test/failure_app_test.rb +0 -221
- data/test/generators/active_record_generator_test.rb +0 -73
- data/test/generators/devise_generator_test.rb +0 -39
- data/test/generators/install_generator_test.rb +0 -13
- data/test/generators/mongoid_generator_test.rb +0 -23
- data/test/generators/views_generator_test.rb +0 -67
- data/test/helpers/devise_helper_test.rb +0 -51
- data/test/integration/authenticatable_test.rb +0 -699
- data/test/integration/confirmable_test.rb +0 -299
- data/test/integration/database_authenticatable_test.rb +0 -84
- data/test/integration/http_authenticatable_test.rb +0 -115
- data/test/integration/lockable_test.rb +0 -242
- data/test/integration/omniauthable_test.rb +0 -133
- data/test/integration/recoverable_test.rb +0 -335
- data/test/integration/registerable_test.rb +0 -349
- data/test/integration/rememberable_test.rb +0 -165
- data/test/integration/timeoutable_test.rb +0 -150
- data/test/integration/token_authenticatable_test.rb +0 -205
- data/test/integration/trackable_test.rb +0 -92
- data/test/mailers/confirmation_instructions_test.rb +0 -111
- data/test/mailers/reset_password_instructions_test.rb +0 -92
- data/test/mailers/unlock_instructions_test.rb +0 -87
- data/test/mapping_test.rb +0 -127
- data/test/models/authenticatable_test.rb +0 -13
- data/test/models/confirmable_test.rb +0 -452
- data/test/models/database_authenticatable_test.rb +0 -226
- data/test/models/lockable_test.rb +0 -282
- data/test/models/omniauthable_test.rb +0 -7
- data/test/models/recoverable_test.rb +0 -222
- data/test/models/registerable_test.rb +0 -7
- data/test/models/rememberable_test.rb +0 -175
- data/test/models/serializable_test.rb +0 -49
- data/test/models/timeoutable_test.rb +0 -46
- data/test/models/token_authenticatable_test.rb +0 -55
- data/test/models/trackable_test.rb +0 -13
- data/test/models/validatable_test.rb +0 -127
- data/test/models_test.rb +0 -163
- data/test/omniauth/config_test.rb +0 -57
- data/test/omniauth/url_helpers_test.rb +0 -54
- data/test/orm/active_record.rb +0 -10
- data/test/orm/mongoid.rb +0 -13
- data/test/parameter_sanitizer_test.rb +0 -58
- data/test/rails_app/Rakefile +0 -6
- data/test/rails_app/app/active_record/admin.rb +0 -6
- data/test/rails_app/app/active_record/shim.rb +0 -2
- data/test/rails_app/app/active_record/user.rb +0 -6
- data/test/rails_app/app/controllers/admins/sessions_controller.rb +0 -6
- data/test/rails_app/app/controllers/admins_controller.rb +0 -11
- data/test/rails_app/app/controllers/application_controller.rb +0 -9
- data/test/rails_app/app/controllers/home_controller.rb +0 -25
- data/test/rails_app/app/controllers/publisher/registrations_controller.rb +0 -2
- data/test/rails_app/app/controllers/publisher/sessions_controller.rb +0 -2
- data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb +0 -14
- data/test/rails_app/app/controllers/users_controller.rb +0 -31
- data/test/rails_app/app/helpers/application_helper.rb +0 -3
- data/test/rails_app/app/mailers/users/mailer.rb +0 -12
- data/test/rails_app/app/mongoid/admin.rb +0 -29
- data/test/rails_app/app/mongoid/shim.rb +0 -23
- data/test/rails_app/app/mongoid/user.rb +0 -42
- data/test/rails_app/app/views/admins/index.html.erb +0 -1
- data/test/rails_app/app/views/admins/sessions/new.html.erb +0 -2
- data/test/rails_app/app/views/home/admin_dashboard.html.erb +0 -1
- data/test/rails_app/app/views/home/index.html.erb +0 -1
- data/test/rails_app/app/views/home/join.html.erb +0 -1
- data/test/rails_app/app/views/home/private.html.erb +0 -1
- data/test/rails_app/app/views/home/user_dashboard.html.erb +0 -1
- data/test/rails_app/app/views/layouts/application.html.erb +0 -24
- data/test/rails_app/app/views/users/edit_form.html.erb +0 -1
- data/test/rails_app/app/views/users/index.html.erb +0 -1
- data/test/rails_app/app/views/users/mailer/confirmation_instructions.erb +0 -1
- data/test/rails_app/app/views/users/sessions/new.html.erb +0 -1
- data/test/rails_app/bin/bundle +0 -3
- data/test/rails_app/bin/rails +0 -4
- data/test/rails_app/bin/rake +0 -4
- data/test/rails_app/config/application.rb +0 -40
- data/test/rails_app/config/boot.rb +0 -8
- data/test/rails_app/config/database.yml +0 -18
- data/test/rails_app/config/environment.rb +0 -5
- data/test/rails_app/config/environments/development.rb +0 -34
- data/test/rails_app/config/environments/production.rb +0 -84
- data/test/rails_app/config/environments/test.rb +0 -36
- data/test/rails_app/config/initializers/backtrace_silencers.rb +0 -7
- data/test/rails_app/config/initializers/devise.rb +0 -178
- data/test/rails_app/config/initializers/inflections.rb +0 -2
- data/test/rails_app/config/initializers/secret_token.rb +0 -8
- data/test/rails_app/config/initializers/session_store.rb +0 -1
- data/test/rails_app/config/routes.rb +0 -104
- data/test/rails_app/config.ru +0 -4
- data/test/rails_app/db/migrate/20100401102949_create_tables.rb +0 -74
- data/test/rails_app/db/schema.rb +0 -52
- data/test/rails_app/lib/shared_admin.rb +0 -14
- data/test/rails_app/lib/shared_user.rb +0 -25
- data/test/rails_app/public/404.html +0 -26
- data/test/rails_app/public/422.html +0 -26
- data/test/rails_app/public/500.html +0 -26
- data/test/rails_app/public/favicon.ico +0 -0
- data/test/routes_test.rb +0 -250
- data/test/support/assertions.rb +0 -40
- data/test/support/helpers.rb +0 -91
- data/test/support/integration.rb +0 -92
- data/test/support/locale/en.yml +0 -4
- data/test/support/webrat/integrations/rails.rb +0 -24
- data/test/test_helper.rb +0 -34
- data/test/test_helpers_test.rb +0 -151
- data/test/test_models.rb +0 -26
@@ -1,13 +1,36 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# Assuming you have not yet modified this file, each configuration option below
|
4
|
+
# is set to its default value. Note that some are commented out while others
|
5
|
+
# are not: uncommented lines are intended to protect your configuration from
|
6
|
+
# breaking changes in upgrades (i.e., in the event that future versions of
|
7
|
+
# Devise change the default values for those options).
|
8
|
+
#
|
1
9
|
# Use this hook to configure devise mailer, warden hooks and so forth.
|
2
10
|
# Many of these configuration options can be set straight in your model.
|
3
11
|
Devise.setup do |config|
|
12
|
+
# The secret key used by Devise. Devise uses this key to generate
|
13
|
+
# random tokens. Changing this key will render invalid all existing
|
14
|
+
# confirmation, reset password and unlock tokens in the database.
|
15
|
+
# Devise will use the `secret_key_base` as its `secret_key`
|
16
|
+
# by default. You can change it below and use your own secret key.
|
17
|
+
# config.secret_key = '<%= SecureRandom.hex(64) %>'
|
18
|
+
|
19
|
+
# ==> Controller configuration
|
20
|
+
# Configure the parent class to the devise controllers.
|
21
|
+
# config.parent_controller = 'DeviseController'
|
22
|
+
|
4
23
|
# ==> Mailer Configuration
|
5
24
|
# Configure the e-mail address which will be shown in Devise::Mailer,
|
6
|
-
# note that it will be overwritten if you use your own mailer class
|
7
|
-
|
25
|
+
# note that it will be overwritten if you use your own mailer class
|
26
|
+
# with default "from" parameter.
|
27
|
+
config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
|
8
28
|
|
9
29
|
# Configure the class responsible to send e-mails.
|
10
|
-
# config.mailer =
|
30
|
+
# config.mailer = 'Devise::Mailer'
|
31
|
+
|
32
|
+
# Configure the parent class responsible to send e-mails.
|
33
|
+
# config.parent_mailer = 'ActionMailer::Base'
|
11
34
|
|
12
35
|
# ==> ORM configuration
|
13
36
|
# Load and configure the ORM. Supports :active_record (default) and
|
@@ -23,7 +46,7 @@ Devise.setup do |config|
|
|
23
46
|
# session. If you need permissions, you should implement that in a before filter.
|
24
47
|
# You can also supply a hash where the value is a boolean determining whether
|
25
48
|
# or not authentication should be aborted when the value is not present.
|
26
|
-
# config.authentication_keys = [
|
49
|
+
# config.authentication_keys = [:email]
|
27
50
|
|
28
51
|
# Configure parameters from the request object used for authentication. Each entry
|
29
52
|
# given should be a request method and it will automatically be passed to the
|
@@ -35,12 +58,12 @@ Devise.setup do |config|
|
|
35
58
|
# Configure which authentication keys should be case-insensitive.
|
36
59
|
# These keys will be downcased upon creating or modifying a user and when used
|
37
60
|
# to authenticate or find a user. Default is :email.
|
38
|
-
config.case_insensitive_keys = [
|
61
|
+
config.case_insensitive_keys = [:email]
|
39
62
|
|
40
63
|
# Configure which authentication keys should have whitespace stripped.
|
41
64
|
# These keys will have whitespace before and after removed upon creating or
|
42
65
|
# modifying a user and when used to authenticate or find a user. Default is :email.
|
43
|
-
config.strip_whitespace_keys = [
|
66
|
+
config.strip_whitespace_keys = [:email]
|
44
67
|
|
45
68
|
# Tell if authentication through request.params is enabled. True by default.
|
46
69
|
# It can be set to an array that will enable params authentication only for the
|
@@ -50,19 +73,19 @@ Devise.setup do |config|
|
|
50
73
|
|
51
74
|
# Tell if authentication through HTTP Auth is enabled. False by default.
|
52
75
|
# It can be set to an array that will enable http authentication only for the
|
53
|
-
# given strategies, for example, `config.http_authenticatable = [:
|
54
|
-
# enable it only for
|
76
|
+
# given strategies, for example, `config.http_authenticatable = [:database]` will
|
77
|
+
# enable it only for database authentication.
|
78
|
+
# For API-only applications to support authentication "out-of-the-box", you will likely want to
|
79
|
+
# enable this with :database unless you are using a custom strategy.
|
80
|
+
# The supported strategies are:
|
55
81
|
# :database = Support basic authentication with authentication key + password
|
56
|
-
# :token = Support basic authentication with token authentication key
|
57
|
-
# :token_options = Support token authentication with options as defined in
|
58
|
-
# http://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Token.html
|
59
82
|
# config.http_authenticatable = false
|
60
83
|
|
61
|
-
# If
|
84
|
+
# If 401 status code should be returned for AJAX requests. True by default.
|
62
85
|
# config.http_authenticatable_on_xhr = true
|
63
86
|
|
64
|
-
# The realm used in Http Basic Authentication.
|
65
|
-
# config.http_authentication_realm =
|
87
|
+
# The realm used in Http Basic Authentication. 'Application' by default.
|
88
|
+
# config.http_authentication_realm = 'Application'
|
66
89
|
|
67
90
|
# It will change confirmation, password recovery and other workflows
|
68
91
|
# to behave the same regardless if the e-mail provided was right or wrong.
|
@@ -70,30 +93,56 @@ Devise.setup do |config|
|
|
70
93
|
# config.paranoid = true
|
71
94
|
|
72
95
|
# By default Devise will store the user in session. You can skip storage for
|
73
|
-
#
|
96
|
+
# particular strategies by setting this option.
|
74
97
|
# Notice that if you are skipping storage for all authentication paths, you
|
75
98
|
# may want to disable generating routes to Devise's sessions controller by
|
76
|
-
# passing :
|
99
|
+
# passing skip: :sessions to `devise_for` in your config/routes.rb
|
77
100
|
config.skip_session_storage = [:http_auth]
|
78
101
|
|
102
|
+
# By default, Devise cleans up the CSRF token on authentication to
|
103
|
+
# avoid CSRF token fixation attacks. This means that, when using AJAX
|
104
|
+
# requests for sign in and sign up, you need to get a new CSRF token
|
105
|
+
# from the server. You can disable this option at your own risk.
|
106
|
+
# config.clean_up_csrf_token_on_authentication = true
|
107
|
+
|
108
|
+
# When false, Devise will not attempt to reload routes on eager load.
|
109
|
+
# This can reduce the time taken to boot the app but if your application
|
110
|
+
# requires the Devise mappings to be loaded during boot time the application
|
111
|
+
# won't boot properly.
|
112
|
+
# config.reload_routes = true
|
113
|
+
|
79
114
|
# ==> Configuration for :database_authenticatable
|
80
|
-
# For bcrypt, this is the cost for hashing the password and defaults to
|
81
|
-
# using other
|
115
|
+
# For bcrypt, this is the cost for hashing the password and defaults to 12. If
|
116
|
+
# using other algorithms, it sets how many times you want the password to be hashed.
|
117
|
+
# The number of stretches used for generating the hashed password are stored
|
118
|
+
# with the hashed password. This allows you to change the stretches without
|
119
|
+
# invalidating existing passwords.
|
82
120
|
#
|
83
121
|
# Limiting the stretches to just one in testing will increase the performance of
|
84
122
|
# your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
|
85
|
-
# a value less than 10 in other environments.
|
86
|
-
|
123
|
+
# a value less than 10 in other environments. Note that, for bcrypt (the default
|
124
|
+
# algorithm), the cost increases exponentially with the number of stretches (e.g.
|
125
|
+
# a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
|
126
|
+
config.stretches = Rails.env.test? ? 1 : 12
|
87
127
|
|
88
|
-
#
|
89
|
-
# config.pepper = <%= SecureRandom.hex(64)
|
128
|
+
# Set up a pepper to generate the hashed password.
|
129
|
+
# config.pepper = '<%= SecureRandom.hex(64) %>'
|
130
|
+
|
131
|
+
# Send a notification to the original email when the user's email is changed.
|
132
|
+
# config.send_email_changed_notification = false
|
133
|
+
|
134
|
+
# Send a notification email when the user's password is changed.
|
135
|
+
# config.send_password_change_notification = false
|
90
136
|
|
91
137
|
# ==> Configuration for :confirmable
|
92
138
|
# A period that the user is allowed to access the website even without
|
93
|
-
# confirming
|
94
|
-
# able to access the website for two days without confirming
|
95
|
-
# access will be blocked just in the third day.
|
96
|
-
# the user
|
139
|
+
# confirming their account. For instance, if set to 2.days, the user will be
|
140
|
+
# able to access the website for two days without confirming their account,
|
141
|
+
# access will be blocked just in the third day.
|
142
|
+
# You can also set it to nil, which will allow the user to access the website
|
143
|
+
# without confirming their account.
|
144
|
+
# Default is 0.days, meaning the user cannot access the website without
|
145
|
+
# confirming their account.
|
97
146
|
# config.allow_unconfirmed_access_for = 2.days
|
98
147
|
|
99
148
|
# A period that the user is allowed to confirm their account before their
|
@@ -106,41 +155,41 @@ Devise.setup do |config|
|
|
106
155
|
|
107
156
|
# If true, requires any email changes to be confirmed (exactly the same way as
|
108
157
|
# initial account confirmation) to be applied. Requires additional unconfirmed_email
|
109
|
-
# db field (see migrations). Until confirmed new email is stored in
|
110
|
-
#
|
158
|
+
# db field (see migrations). Until confirmed, new email is stored in
|
159
|
+
# unconfirmed_email column, and copied to email column on successful confirmation.
|
111
160
|
config.reconfirmable = true
|
112
161
|
|
113
162
|
# Defines which key will be used when confirming an account
|
114
|
-
# config.confirmation_keys = [
|
163
|
+
# config.confirmation_keys = [:email]
|
115
164
|
|
116
165
|
# ==> Configuration for :rememberable
|
117
166
|
# The time the user will be remembered without asking for credentials again.
|
118
167
|
# config.remember_for = 2.weeks
|
119
168
|
|
169
|
+
# Invalidates all the remember me tokens when the user signs out.
|
170
|
+
config.expire_all_remember_me_on_sign_out = true
|
171
|
+
|
120
172
|
# If true, extends the user's remember period when remembered via cookie.
|
121
173
|
# config.extend_remember_period = false
|
122
174
|
|
123
175
|
# Options to be passed to the created cookie. For instance, you can set
|
124
|
-
# :
|
176
|
+
# secure: true in order to force SSL only cookies.
|
125
177
|
# config.rememberable_options = {}
|
126
178
|
|
127
179
|
# ==> Configuration for :validatable
|
128
|
-
# Range for password length.
|
129
|
-
config.password_length =
|
180
|
+
# Range for password length.
|
181
|
+
config.password_length = 6..128
|
130
182
|
|
131
183
|
# Email regex used to validate email formats. It simply asserts that
|
132
184
|
# one (and only one) @ exists in the given string. This is mainly
|
133
185
|
# to give user feedback and not to assert the e-mail validity.
|
134
|
-
|
186
|
+
config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
|
135
187
|
|
136
188
|
# ==> Configuration for :timeoutable
|
137
189
|
# The time you want to timeout the user session without activity. After this
|
138
190
|
# time the user will be asked for credentials again. Default is 30 minutes.
|
139
191
|
# config.timeout_in = 30.minutes
|
140
192
|
|
141
|
-
# If true, expires auth token on session timeout.
|
142
|
-
# config.expire_auth_token_on_timeout = false
|
143
|
-
|
144
193
|
# ==> Configuration for :lockable
|
145
194
|
# Defines which strategy will be used to lock an account.
|
146
195
|
# :failed_attempts = Locks an account after a number of failed attempts to sign in.
|
@@ -148,7 +197,7 @@ Devise.setup do |config|
|
|
148
197
|
# config.lock_strategy = :failed_attempts
|
149
198
|
|
150
199
|
# Defines which key will be used when locking and unlocking an account
|
151
|
-
# config.unlock_keys = [
|
200
|
+
# config.unlock_keys = [:email]
|
152
201
|
|
153
202
|
# Defines which strategy will be used to unlock an account.
|
154
203
|
# :email = Sends an unlock link to the user email
|
@@ -164,30 +213,33 @@ Devise.setup do |config|
|
|
164
213
|
# Time interval to unlock the account if :time is enabled as unlock_strategy.
|
165
214
|
# config.unlock_in = 1.hour
|
166
215
|
|
216
|
+
# Warn on the last attempt before the account is locked.
|
217
|
+
# config.last_attempt_warning = true
|
218
|
+
|
167
219
|
# ==> Configuration for :recoverable
|
168
220
|
#
|
169
221
|
# Defines which key will be used when recovering the password for an account
|
170
|
-
# config.reset_password_keys = [
|
222
|
+
# config.reset_password_keys = [:email]
|
171
223
|
|
172
224
|
# Time interval you can reset your password with a reset password key.
|
173
225
|
# Don't put a too small interval or your users won't have the time to
|
174
226
|
# change their passwords.
|
175
227
|
config.reset_password_within = 6.hours
|
176
228
|
|
229
|
+
# When set to false, does not sign a user in automatically after their password is
|
230
|
+
# reset. Defaults to true, so a user is signed in automatically after a reset.
|
231
|
+
# config.sign_in_after_reset_password = true
|
232
|
+
|
177
233
|
# ==> Configuration for :encryptable
|
178
|
-
# Allow you to use another encryption algorithm besides bcrypt (default).
|
179
|
-
# :sha1, :sha512 or
|
180
|
-
# :authlogic_sha512 (then you should set stretches above to 20
|
181
|
-
# and :restful_authentication_sha1 (then you should set
|
182
|
-
# REST_AUTH_SITE_KEY to pepper).
|
234
|
+
# Allow you to use another hashing or encryption algorithm besides bcrypt (default).
|
235
|
+
# You can use :sha1, :sha512 or algorithms from others authentication tools as
|
236
|
+
# :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
|
237
|
+
# for default behavior) and :restful_authentication_sha1 (then you should set
|
238
|
+
# stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
|
183
239
|
#
|
184
240
|
# Require the `devise-encryptable` gem when using anything other than bcrypt
|
185
241
|
# config.encryptor = :sha512
|
186
242
|
|
187
|
-
# ==> Configuration for :token_authenticatable
|
188
|
-
# Defines name of the authentication token params key
|
189
|
-
# config.token_authentication_key = :auth_token
|
190
|
-
|
191
243
|
# ==> Scopes configuration
|
192
244
|
# Turn scoped views on. Before rendering "sessions/new", it will first check for
|
193
245
|
# "users/sessions/new". It's turned off by default because it's slower if you
|
@@ -211,7 +263,7 @@ Devise.setup do |config|
|
|
211
263
|
# should add them to the navigational formats lists.
|
212
264
|
#
|
213
265
|
# The "*/*" below is required to match Internet Explorer requests.
|
214
|
-
# config.navigational_formats = [
|
266
|
+
# config.navigational_formats = ['*/*', :html]
|
215
267
|
|
216
268
|
# The default HTTP method used to sign out a resource. Default is :delete.
|
217
269
|
config.sign_out_via = :delete
|
@@ -219,7 +271,7 @@ Devise.setup do |config|
|
|
219
271
|
# ==> OmniAuth
|
220
272
|
# Add a new OmniAuth provider. Check the wiki for more information on setting
|
221
273
|
# up on your models and hooks.
|
222
|
-
# config.omniauth :github, 'APP_ID', 'APP_SECRET', :
|
274
|
+
# config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
|
223
275
|
|
224
276
|
# ==> Warden configuration
|
225
277
|
# If you want to use other strategies, that are not supported by Devise, or
|
@@ -227,7 +279,7 @@ Devise.setup do |config|
|
|
227
279
|
#
|
228
280
|
# config.warden do |manager|
|
229
281
|
# manager.intercept_401 = false
|
230
|
-
# manager.default_strategies(:
|
282
|
+
# manager.default_strategies(scope: :user).unshift :some_external_strategy
|
231
283
|
# end
|
232
284
|
|
233
285
|
# ==> Mountable engine configurations
|
@@ -235,12 +287,25 @@ Devise.setup do |config|
|
|
235
287
|
# is mountable, there are some extra configurations to be taken into account.
|
236
288
|
# The following options are available, assuming the engine is mounted as:
|
237
289
|
#
|
238
|
-
# mount MyEngine, at:
|
290
|
+
# mount MyEngine, at: '/my_engine'
|
239
291
|
#
|
240
292
|
# The router that invoked `devise_for`, in the example above, would be:
|
241
293
|
# config.router_name = :my_engine
|
242
294
|
#
|
243
|
-
# When using
|
295
|
+
# When using OmniAuth, Devise cannot automatically set OmniAuth path,
|
244
296
|
# so you need to do it manually. For the users scope, it would be:
|
245
|
-
# config.omniauth_path_prefix =
|
297
|
+
# config.omniauth_path_prefix = '/my_engine/users/auth'
|
298
|
+
|
299
|
+
# ==> Turbolinks configuration
|
300
|
+
# If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
|
301
|
+
#
|
302
|
+
# ActiveSupport.on_load(:devise_failure_app) do
|
303
|
+
# include Turbolinks::Controller
|
304
|
+
# end
|
305
|
+
|
306
|
+
# ==> Configuration for :registerable
|
307
|
+
|
308
|
+
# When set to false, does not sign a user in automatically after their password is
|
309
|
+
# changed. Defaults to true, so a user is signed in automatically after changing a password.
|
310
|
+
# config.sign_in_after_change_password = true
|
246
311
|
end
|
@@ -2,4 +2,4 @@ Welcome <%= @email %>!
|
|
2
2
|
|
3
3
|
You can confirm your account through the link below:
|
4
4
|
|
5
|
-
|
5
|
+
[Confirm my account](<%= confirmation_url(@resource, confirmation_token: @token) %>)
|
@@ -0,0 +1,7 @@
|
|
1
|
+
Hello <%= @email %>!
|
2
|
+
|
3
|
+
<% if @resource.try(:unconfirmed_email?) %>
|
4
|
+
We're contacting you to notify you that your email is being changed to <%= @resource.unconfirmed_email %>.
|
5
|
+
<% else %>
|
6
|
+
We're contacting you to notify you that your email has been changed to <%= @resource.email %>.
|
7
|
+
<% end %>
|
@@ -2,7 +2,7 @@ Hello <%= @resource.email %>!
|
|
2
2
|
|
3
3
|
Someone has requested a link to change your password, and you can do this through the link below.
|
4
4
|
|
5
|
-
|
5
|
+
[Change my password](<%= edit_password_url(@resource, reset_password_token: @token) %>)
|
6
6
|
|
7
7
|
If you didn't request this, please ignore this email.
|
8
8
|
Your password won't change until you access the link above and create a new one.
|
@@ -4,4 +4,4 @@ Your account has been locked due to an excessive number of unsuccessful sign in
|
|
4
4
|
|
5
5
|
Click the link below to unlock your account:
|
6
6
|
|
7
|
-
|
7
|
+
[Unlock my account](<%= unlock_url(@resource, unlock_token: @token) %>)
|
@@ -1,11 +1,15 @@
|
|
1
1
|
<h2>Resend confirmation instructions</h2>
|
2
2
|
|
3
|
-
<%= simple_form_for(resource, :
|
3
|
+
<%= simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
|
4
4
|
<%= f.error_notification %>
|
5
5
|
<%= f.full_error :confirmation_token %>
|
6
6
|
|
7
7
|
<div class="form-inputs">
|
8
|
-
<%= f.input :email,
|
8
|
+
<%= f.input :email,
|
9
|
+
required: true,
|
10
|
+
autofocus: true,
|
11
|
+
value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email),
|
12
|
+
input_html: { autocomplete: "email" } %>
|
9
13
|
</div>
|
10
14
|
|
11
15
|
<div class="form-actions">
|
@@ -1,14 +1,22 @@
|
|
1
1
|
<h2>Change your password</h2>
|
2
2
|
|
3
|
-
<%= simple_form_for(resource, :
|
3
|
+
<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
|
4
4
|
<%= f.error_notification %>
|
5
5
|
|
6
|
-
<%= f.input :reset_password_token, :
|
6
|
+
<%= f.input :reset_password_token, as: :hidden %>
|
7
7
|
<%= f.full_error :reset_password_token %>
|
8
8
|
|
9
9
|
<div class="form-inputs">
|
10
|
-
<%= f.input :password,
|
11
|
-
|
10
|
+
<%= f.input :password,
|
11
|
+
label: "New password",
|
12
|
+
required: true,
|
13
|
+
autofocus: true,
|
14
|
+
hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length),
|
15
|
+
input_html: { autocomplete: "new-password" } %>
|
16
|
+
<%= f.input :password_confirmation,
|
17
|
+
label: "Confirm your new password",
|
18
|
+
required: true,
|
19
|
+
input_html: { autocomplete: "new-password" } %>
|
12
20
|
</div>
|
13
21
|
|
14
22
|
<div class="form-actions">
|
@@ -1,10 +1,13 @@
|
|
1
1
|
<h2>Forgot your password?</h2>
|
2
2
|
|
3
|
-
<%= simple_form_for(resource, :
|
3
|
+
<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
|
4
4
|
<%= f.error_notification %>
|
5
5
|
|
6
6
|
<div class="form-inputs">
|
7
|
-
<%= f.input :email,
|
7
|
+
<%= f.input :email,
|
8
|
+
required: true,
|
9
|
+
autofocus: true,
|
10
|
+
input_html: { autocomplete: "email" } %>
|
8
11
|
</div>
|
9
12
|
|
10
13
|
<div class="form-actions">
|
@@ -1,18 +1,26 @@
|
|
1
1
|
<h2>Edit <%= resource_name.to_s.humanize %></h2>
|
2
2
|
|
3
|
-
<%= simple_form_for(resource, :
|
3
|
+
<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
|
4
4
|
<%= f.error_notification %>
|
5
5
|
|
6
6
|
<div class="form-inputs">
|
7
|
-
<%= f.input :email, :
|
7
|
+
<%= f.input :email, required: true, autofocus: true %>
|
8
8
|
|
9
9
|
<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
|
10
10
|
<p>Currently waiting confirmation for: <%= resource.unconfirmed_email %></p>
|
11
11
|
<% end %>
|
12
12
|
|
13
|
-
<%= f.input :password,
|
14
|
-
|
15
|
-
|
13
|
+
<%= f.input :password,
|
14
|
+
hint: "leave it blank if you don't want to change it",
|
15
|
+
required: false,
|
16
|
+
input_html: { autocomplete: "new-password" } %>
|
17
|
+
<%= f.input :password_confirmation,
|
18
|
+
required: false,
|
19
|
+
input_html: { autocomplete: "new-password" } %>
|
20
|
+
<%= f.input :current_password,
|
21
|
+
hint: "we need your current password to confirm your changes",
|
22
|
+
required: true,
|
23
|
+
input_html: { autocomplete: "current-password" } %>
|
16
24
|
</div>
|
17
25
|
|
18
26
|
<div class="form-actions">
|
@@ -22,6 +30,6 @@
|
|
22
30
|
|
23
31
|
<h3>Cancel my account</h3>
|
24
32
|
|
25
|
-
<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :
|
33
|
+
<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
|
26
34
|
|
27
35
|
<%= link_to "Back", :back %>
|
@@ -1,12 +1,20 @@
|
|
1
1
|
<h2>Sign up</h2>
|
2
2
|
|
3
|
-
<%= simple_form_for(resource, :
|
3
|
+
<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
|
4
4
|
<%= f.error_notification %>
|
5
5
|
|
6
6
|
<div class="form-inputs">
|
7
|
-
<%= f.input :email,
|
8
|
-
|
9
|
-
|
7
|
+
<%= f.input :email,
|
8
|
+
required: true,
|
9
|
+
autofocus: true,
|
10
|
+
input_html: { autocomplete: "email" }%>
|
11
|
+
<%= f.input :password,
|
12
|
+
required: true,
|
13
|
+
hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length),
|
14
|
+
input_html: { autocomplete: "new-password" } %>
|
15
|
+
<%= f.input :password_confirmation,
|
16
|
+
required: true,
|
17
|
+
input_html: { autocomplete: "new-password" } %>
|
10
18
|
</div>
|
11
19
|
|
12
20
|
<div class="form-actions">
|
@@ -1,14 +1,19 @@
|
|
1
|
-
<h2>
|
1
|
+
<h2>Log in</h2>
|
2
2
|
|
3
|
-
<%= simple_form_for(resource, :
|
3
|
+
<%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
|
4
4
|
<div class="form-inputs">
|
5
|
-
<%= f.input :email,
|
6
|
-
|
7
|
-
|
5
|
+
<%= f.input :email,
|
6
|
+
required: false,
|
7
|
+
autofocus: true,
|
8
|
+
input_html: { autocomplete: "email" } %>
|
9
|
+
<%= f.input :password,
|
10
|
+
required: false,
|
11
|
+
input_html: { autocomplete: "current-password" } %>
|
12
|
+
<%= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %>
|
8
13
|
</div>
|
9
14
|
|
10
15
|
<div class="form-actions">
|
11
|
-
<%= f.button :submit, "
|
16
|
+
<%= f.button :submit, "Log in" %>
|
12
17
|
</div>
|
13
18
|
<% end %>
|
14
19
|
|
@@ -1,11 +1,14 @@
|
|
1
1
|
<h2>Resend unlock instructions</h2>
|
2
2
|
|
3
|
-
<%= simple_form_for(resource, :
|
3
|
+
<%= simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
|
4
4
|
<%= f.error_notification %>
|
5
5
|
<%= f.full_error :unlock_token %>
|
6
6
|
|
7
7
|
<div class="form-inputs">
|
8
|
-
<%= f.input :email,
|
8
|
+
<%= f.input :email,
|
9
|
+
required: true,
|
10
|
+
autofocus: true,
|
11
|
+
input_html: { autocomplete: "email" } %>
|
9
12
|
</div>
|
10
13
|
|
11
14
|
<div class="form-actions">
|