devise 3.5.1 → 4.8.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/CHANGELOG.md +281 -1066
- data/MIT-LICENSE +2 -1
- data/README.md +292 -97
- data/app/controllers/devise/confirmations_controller.rb +3 -1
- data/app/controllers/devise/omniauth_callbacks_controller.rb +8 -6
- data/app/controllers/devise/passwords_controller.rb +10 -7
- data/app/controllers/devise/registrations_controller.rb +39 -18
- data/app/controllers/devise/sessions_controller.rb +9 -7
- data/app/controllers/devise/unlocks_controller.rb +4 -2
- data/app/controllers/devise_controller.rb +25 -12
- data/app/helpers/devise_helper.rb +23 -18
- data/app/mailers/devise/mailer.rb +13 -3
- data/app/views/devise/confirmations/new.html.erb +2 -2
- 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/passwords/edit.html.erb +5 -5
- data/app/views/devise/passwords/new.html.erb +2 -2
- data/app/views/devise/registrations/edit.html.erb +9 -5
- data/app/views/devise/registrations/new.html.erb +4 -4
- data/app/views/devise/sessions/new.html.erb +4 -4
- data/app/views/devise/shared/_error_messages.html.erb +15 -0
- data/app/views/devise/shared/_links.html.erb +8 -8
- data/app/views/devise/unlocks/new.html.erb +2 -2
- data/config/locales/en.yml +7 -2
- data/lib/devise/controllers/helpers.rb +42 -33
- data/lib/devise/controllers/rememberable.rb +11 -2
- data/lib/devise/controllers/scoped_views.rb +2 -0
- data/lib/devise/controllers/sign_in_out.rb +40 -21
- data/lib/devise/controllers/store_location.rb +25 -7
- data/lib/devise/controllers/url_helpers.rb +3 -1
- data/lib/devise/delegator.rb +2 -0
- data/lib/devise/encryptor.rb +6 -4
- data/lib/devise/failure_app.rb +84 -28
- data/lib/devise/hooks/activatable.rb +2 -0
- data/lib/devise/hooks/csrf_cleaner.rb +2 -0
- data/lib/devise/hooks/forgetable.rb +2 -0
- data/lib/devise/hooks/lockable.rb +4 -2
- data/lib/devise/hooks/proxy.rb +3 -1
- data/lib/devise/hooks/rememberable.rb +2 -0
- data/lib/devise/hooks/timeoutable.rb +7 -7
- data/lib/devise/hooks/trackable.rb +2 -0
- data/lib/devise/mailers/helpers.rb +7 -4
- data/lib/devise/mapping.rb +3 -1
- data/lib/devise/models/authenticatable.rb +63 -33
- data/lib/devise/models/confirmable.rb +108 -35
- data/lib/devise/models/database_authenticatable.rb +102 -22
- data/lib/devise/models/lockable.rb +24 -6
- data/lib/devise/models/omniauthable.rb +2 -0
- data/lib/devise/models/recoverable.rb +34 -26
- data/lib/devise/models/registerable.rb +4 -0
- data/lib/devise/models/rememberable.rb +42 -26
- data/lib/devise/models/timeoutable.rb +2 -6
- data/lib/devise/models/trackable.rb +15 -1
- data/lib/devise/models/validatable.rb +10 -3
- data/lib/devise/models.rb +3 -1
- data/lib/devise/modules.rb +2 -0
- 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 +139 -65
- data/lib/devise/rails/deprecated_constant_accessor.rb +39 -0
- data/lib/devise/rails/routes.rb +71 -51
- data/lib/devise/rails/warden_compat.rb +3 -10
- data/lib/devise/rails.rb +7 -16
- data/lib/devise/secret_key_finder.rb +27 -0
- data/lib/devise/strategies/authenticatable.rb +5 -3
- data/lib/devise/strategies/base.rb +2 -0
- data/lib/devise/strategies/database_authenticatable.rb +11 -4
- data/lib/devise/strategies/rememberable.rb +5 -6
- 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 -124
- data/lib/devise/time_inflector.rb +2 -0
- data/lib/devise/token_generator.rb +3 -41
- data/lib/devise/version.rb +3 -1
- data/lib/devise.rb +69 -46
- data/lib/generators/active_record/devise_generator.rb +46 -12
- data/lib/generators/active_record/templates/migration.rb +4 -2
- data/lib/generators/active_record/templates/migration_existing.rb +4 -2
- data/lib/generators/devise/controllers_generator.rb +3 -1
- data/lib/generators/devise/devise_generator.rb +5 -3
- data/lib/generators/devise/install_generator.rb +18 -5
- data/lib/generators/devise/orm_helpers.rb +10 -21
- data/lib/generators/devise/views_generator.rb +21 -11
- data/lib/generators/mongoid/devise_generator.rb +7 -5
- data/lib/generators/templates/README +9 -8
- data/lib/generators/templates/controllers/README +1 -1
- data/lib/generators/templates/controllers/confirmations_controller.rb +2 -0
- data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +3 -1
- data/lib/generators/templates/controllers/passwords_controller.rb +2 -0
- data/lib/generators/templates/controllers/registrations_controller.rb +6 -4
- data/lib/generators/templates/controllers/sessions_controller.rb +4 -2
- data/lib/generators/templates/controllers/unlocks_controller.rb +2 -0
- data/lib/generators/templates/devise.rb +65 -23
- 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 +5 -1
- data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +10 -2
- data/lib/generators/templates/simple_form_for/passwords/new.html.erb +4 -1
- data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +11 -3
- data/lib/generators/templates/simple_form_for/registrations/new.html.erb +11 -3
- data/lib/generators/templates/simple_form_for/sessions/new.html.erb +7 -2
- data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +4 -1
- metadata +21 -306
- data/.gitignore +0 -10
- data/.travis.yml +0 -45
- data/.yardopts +0 -9
- data/CONTRIBUTING.md +0 -14
- data/Gemfile +0 -29
- data/Gemfile.lock +0 -191
- data/Rakefile +0 -36
- data/devise.gemspec +0 -29
- data/devise.png +0 -0
- data/gemfiles/Gemfile.rails-3.2-stable +0 -29
- data/gemfiles/Gemfile.rails-3.2-stable.lock +0 -169
- data/gemfiles/Gemfile.rails-4.0-stable +0 -29
- data/gemfiles/Gemfile.rails-4.0-stable.lock +0 -163
- data/gemfiles/Gemfile.rails-4.1-stable +0 -29
- data/gemfiles/Gemfile.rails-4.1-stable.lock +0 -169
- data/gemfiles/Gemfile.rails-4.2-stable +0 -29
- data/gemfiles/Gemfile.rails-4.2-stable.lock +0 -191
- data/script/cached-bundle +0 -49
- data/script/s3-put +0 -71
- data/test/controllers/custom_registrations_controller_test.rb +0 -40
- data/test/controllers/custom_strategy_test.rb +0 -62
- data/test/controllers/helpers_test.rb +0 -316
- data/test/controllers/inherited_controller_i18n_messages_test.rb +0 -51
- data/test/controllers/internal_helpers_test.rb +0 -129
- data/test/controllers/load_hooks_controller_test.rb +0 -19
- data/test/controllers/passwords_controller_test.rb +0 -31
- data/test/controllers/sessions_controller_test.rb +0 -103
- data/test/controllers/url_helpers_test.rb +0 -65
- data/test/delegator_test.rb +0 -19
- data/test/devise_test.rb +0 -107
- data/test/failure_app_test.rb +0 -298
- data/test/generators/active_record_generator_test.rb +0 -109
- data/test/generators/controllers_generator_test.rb +0 -48
- 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 -96
- data/test/helpers/devise_helper_test.rb +0 -49
- data/test/integration/authenticatable_test.rb +0 -729
- data/test/integration/confirmable_test.rb +0 -324
- data/test/integration/database_authenticatable_test.rb +0 -95
- data/test/integration/http_authenticatable_test.rb +0 -105
- data/test/integration/lockable_test.rb +0 -239
- data/test/integration/omniauthable_test.rb +0 -133
- data/test/integration/recoverable_test.rb +0 -347
- data/test/integration/registerable_test.rb +0 -359
- data/test/integration/rememberable_test.rb +0 -176
- data/test/integration/timeoutable_test.rb +0 -189
- data/test/integration/trackable_test.rb +0 -92
- data/test/mailers/confirmation_instructions_test.rb +0 -115
- data/test/mailers/reset_password_instructions_test.rb +0 -96
- data/test/mailers/unlock_instructions_test.rb +0 -91
- data/test/mapping_test.rb +0 -134
- data/test/models/authenticatable_test.rb +0 -23
- data/test/models/confirmable_test.rb +0 -468
- data/test/models/database_authenticatable_test.rb +0 -249
- data/test/models/lockable_test.rb +0 -328
- data/test/models/omniauthable_test.rb +0 -7
- data/test/models/recoverable_test.rb +0 -228
- data/test/models/registerable_test.rb +0 -7
- data/test/models/rememberable_test.rb +0 -204
- data/test/models/serializable_test.rb +0 -49
- data/test/models/timeoutable_test.rb +0 -51
- data/test/models/trackable_test.rb +0 -41
- data/test/models/validatable_test.rb +0 -127
- data/test/models_test.rb +0 -144
- 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 -81
- 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/active_record/user_on_engine.rb +0 -7
- data/test/rails_app/app/active_record/user_on_main_app.rb +0 -7
- 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 -12
- data/test/rails_app/app/controllers/application_with_fake_engine.rb +0 -30
- data/test/rails_app/app/controllers/custom/registrations_controller.rb +0 -31
- 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/from_proc_mailer.rb +0 -3
- data/test/rails_app/app/mailers/users/mailer.rb +0 -3
- data/test/rails_app/app/mailers/users/reply_to_mailer.rb +0 -4
- 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 -39
- data/test/rails_app/app/mongoid/user_on_engine.rb +0 -39
- data/test/rails_app/app/mongoid/user_on_main_app.rb +0 -39
- 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 -14
- 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 -30
- data/test/rails_app/config/environments/production.rb +0 -84
- data/test/rails_app/config/environments/test.rb +0 -41
- data/test/rails_app/config/initializers/backtrace_silencers.rb +0 -7
- data/test/rails_app/config/initializers/devise.rb +0 -180
- 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 -122
- data/test/rails_app/config.ru +0 -4
- data/test/rails_app/db/migrate/20100401102949_create_tables.rb +0 -71
- data/test/rails_app/db/schema.rb +0 -55
- data/test/rails_app/lib/shared_admin.rb +0 -17
- data/test/rails_app/lib/shared_user.rb +0 -29
- data/test/rails_app/lib/shared_user_without_omniauth.rb +0 -13
- 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/rails_test.rb +0 -9
- data/test/routes_test.rb +0 -264
- data/test/support/action_controller/record_identifier.rb +0 -10
- data/test/support/assertions.rb +0 -39
- data/test/support/helpers.rb +0 -73
- data/test/support/integration.rb +0 -92
- data/test/support/locale/en.yml +0 -8
- data/test/support/mongoid.yml +0 -6
- data/test/support/webrat/integrations/rails.rb +0 -24
- data/test/test_helper.rb +0 -34
- data/test/test_helpers_test.rb +0 -178
- data/test/test_models.rb +0 -33
@@ -1,38 +1,23 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Devise
|
2
4
|
module Generators
|
3
5
|
module OrmHelpers
|
4
6
|
def model_contents
|
5
7
|
buffer = <<-CONTENT
|
6
8
|
# Include default devise modules. Others available are:
|
7
|
-
# :confirmable, :lockable, :timeoutable and :omniauthable
|
9
|
+
# :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
|
8
10
|
devise :database_authenticatable, :registerable,
|
9
|
-
:recoverable, :rememberable, :
|
10
|
-
|
11
|
-
CONTENT
|
12
|
-
buffer += <<-CONTENT if needs_attr_accessible?
|
13
|
-
# Setup accessible (or protected) attributes for your model
|
14
|
-
attr_accessible :email, :password, :password_confirmation, :remember_me
|
11
|
+
:recoverable, :rememberable, :validatable
|
15
12
|
|
16
13
|
CONTENT
|
17
14
|
buffer
|
18
15
|
end
|
19
16
|
|
20
|
-
def needs_attr_accessible?
|
21
|
-
rails_3? && !strong_parameters_enabled?
|
22
|
-
end
|
23
|
-
|
24
|
-
def rails_3?
|
25
|
-
Rails::VERSION::MAJOR == 3
|
26
|
-
end
|
27
|
-
|
28
|
-
def strong_parameters_enabled?
|
29
|
-
defined?(ActionController::StrongParameters)
|
30
|
-
end
|
31
|
-
|
32
17
|
private
|
33
18
|
|
34
19
|
def model_exists?
|
35
|
-
File.
|
20
|
+
File.exist?(File.join(destination_root, model_path))
|
36
21
|
end
|
37
22
|
|
38
23
|
def migration_exists?(table_name)
|
@@ -40,7 +25,11 @@ CONTENT
|
|
40
25
|
end
|
41
26
|
|
42
27
|
def migration_path
|
43
|
-
|
28
|
+
if Rails.version >= '5.0.3'
|
29
|
+
db_migrate_path
|
30
|
+
else
|
31
|
+
@migration_path ||= File.join("db", "migrate")
|
32
|
+
end
|
44
33
|
end
|
45
34
|
|
46
35
|
def model_path
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'rails/generators/base'
|
2
4
|
|
3
5
|
module Devise
|
@@ -21,13 +23,6 @@ module Devise
|
|
21
23
|
public_task :copy_views
|
22
24
|
end
|
23
25
|
|
24
|
-
# TODO: Add this to Rails itself
|
25
|
-
module ClassMethods
|
26
|
-
def hide!
|
27
|
-
Rails::Generators.hide_namespace self.namespace
|
28
|
-
end
|
29
|
-
end
|
30
|
-
|
31
26
|
def copy_views
|
32
27
|
if options[:views]
|
33
28
|
options[:views].each do |directory|
|
@@ -47,7 +42,7 @@ module Devise
|
|
47
42
|
def view_directory(name, _target_path = nil)
|
48
43
|
directory name.to_s, _target_path || "#{target_path}/#{name}" do |content|
|
49
44
|
if scope
|
50
|
-
content.gsub
|
45
|
+
content.gsub("devise/shared", "#{plural_scope}/shared")
|
51
46
|
else
|
52
47
|
content
|
53
48
|
end
|
@@ -55,7 +50,11 @@ module Devise
|
|
55
50
|
end
|
56
51
|
|
57
52
|
def target_path
|
58
|
-
@target_path ||= "app/views/#{
|
53
|
+
@target_path ||= "app/views/#{plural_scope || :devise}"
|
54
|
+
end
|
55
|
+
|
56
|
+
def plural_scope
|
57
|
+
@plural_scope ||= scope.presence && scope.underscore.pluralize
|
59
58
|
end
|
60
59
|
end
|
61
60
|
|
@@ -83,6 +82,13 @@ module Devise
|
|
83
82
|
source_root File.expand_path("../../templates/simple_form_for", __FILE__)
|
84
83
|
desc "Copies simple form enabled views to your application."
|
85
84
|
hide!
|
85
|
+
|
86
|
+
def copy_views
|
87
|
+
if options[:views]
|
88
|
+
options[:views].delete('mailer')
|
89
|
+
end
|
90
|
+
super
|
91
|
+
end
|
86
92
|
end
|
87
93
|
|
88
94
|
class ErbGenerator < Rails::Generators::Base #:nodoc:
|
@@ -111,7 +117,7 @@ module Devise
|
|
111
117
|
end
|
112
118
|
|
113
119
|
def target_path
|
114
|
-
"app/views/#{
|
120
|
+
"app/views/#{plural_scope || :devise}/mailer"
|
115
121
|
end
|
116
122
|
end
|
117
123
|
|
@@ -128,7 +134,11 @@ module Devise
|
|
128
134
|
default: defined?(SimpleForm) ? "simple_form_for" : "form_for"
|
129
135
|
|
130
136
|
hook_for :markerb, desc: "Generate markerb instead of erb mail views",
|
131
|
-
default: defined?(Markerb)
|
137
|
+
default: defined?(Markerb),
|
138
|
+
type: :boolean
|
139
|
+
|
140
|
+
hook_for :erb, desc: "Generate erb mail views",
|
141
|
+
default: !defined?(Markerb),
|
132
142
|
type: :boolean
|
133
143
|
end
|
134
144
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'rails/generators/named_base'
|
2
4
|
require 'generators/devise/orm_helpers'
|
3
5
|
|
@@ -32,11 +34,11 @@ module Mongoid
|
|
32
34
|
field :remember_created_at, type: Time
|
33
35
|
|
34
36
|
## Trackable
|
35
|
-
field :sign_in_count, type: Integer, default: 0
|
36
|
-
field :current_sign_in_at, type: Time
|
37
|
-
field :last_sign_in_at, type: Time
|
38
|
-
field :current_sign_in_ip, type: String
|
39
|
-
field :last_sign_in_ip, type: String
|
37
|
+
# field :sign_in_count, type: Integer, default: 0
|
38
|
+
# field :current_sign_in_at, type: Time
|
39
|
+
# field :last_sign_in_at, type: Time
|
40
|
+
# field :current_sign_in_ip, type: String
|
41
|
+
# field :last_sign_in_ip, type: String
|
40
42
|
|
41
43
|
## Confirmable
|
42
44
|
# field :confirmation_token, type: String
|
@@ -1,6 +1,6 @@
|
|
1
1
|
===============================================================================
|
2
2
|
|
3
|
-
|
3
|
+
Depending on your application's configuration some manual setup may be required:
|
4
4
|
|
5
5
|
1. Ensure you have defined default url options in your environments files. Here
|
6
6
|
is an example of default_url_options appropriate for a development environment
|
@@ -10,10 +10,14 @@ Some setup you must do manually if you haven't yet:
|
|
10
10
|
|
11
11
|
In production, :host should be set to the actual host of your application.
|
12
12
|
|
13
|
+
* Required for all applications. *
|
14
|
+
|
13
15
|
2. Ensure you have defined root_url to *something* in your config/routes.rb.
|
14
16
|
For example:
|
15
17
|
|
16
18
|
root to: "home#index"
|
19
|
+
|
20
|
+
* Not required for API-only Applications *
|
17
21
|
|
18
22
|
3. Ensure you have flash messages in app/views/layouts/application.html.erb.
|
19
23
|
For example:
|
@@ -21,15 +25,12 @@ Some setup you must do manually if you haven't yet:
|
|
21
25
|
<p class="notice"><%= notice %></p>
|
22
26
|
<p class="alert"><%= alert %></p>
|
23
27
|
|
24
|
-
|
25
|
-
|
26
|
-
config.assets.initialize_on_precompile = false
|
27
|
-
|
28
|
-
On config/application.rb forcing your application to not access the DB
|
29
|
-
or load models when precompiling your assets.
|
28
|
+
* Not required for API-only Applications *
|
30
29
|
|
31
|
-
|
30
|
+
4. You can copy Devise views (for customization) to your app by running:
|
32
31
|
|
33
32
|
rails g devise:views
|
33
|
+
|
34
|
+
* Not required *
|
34
35
|
|
35
36
|
===============================================================================
|
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
Some setup you must do manually if you haven't yet:
|
4
4
|
|
5
|
-
Ensure you have overridden routes for generated controllers in your
|
5
|
+
Ensure you have overridden routes for generated controllers in your routes.rb.
|
6
6
|
For example:
|
7
7
|
|
8
8
|
Rails.application.routes.draw do
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
class <%= @scope_prefix %>OmniauthCallbacksController < Devise::OmniauthCallbacksController
|
2
4
|
# You should configure your model like this:
|
3
5
|
# devise :omniauthable, omniauth_providers: [:twitter]
|
@@ -7,7 +9,7 @@ class <%= @scope_prefix %>OmniauthCallbacksController < Devise::OmniauthCallback
|
|
7
9
|
# end
|
8
10
|
|
9
11
|
# More info at:
|
10
|
-
# https://github.com/
|
12
|
+
# https://github.com/heartcombo/devise#omniauth
|
11
13
|
|
12
14
|
# GET|POST /resource/auth/twitter
|
13
15
|
# def passthru
|
@@ -1,6 +1,8 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
class <%= @scope_prefix %>RegistrationsController < Devise::RegistrationsController
|
2
|
-
#
|
3
|
-
#
|
4
|
+
# before_action :configure_sign_up_params, only: [:create]
|
5
|
+
# before_action :configure_account_update_params, only: [:update]
|
4
6
|
|
5
7
|
# GET /resource/sign_up
|
6
8
|
# def new
|
@@ -40,12 +42,12 @@ class <%= @scope_prefix %>RegistrationsController < Devise::RegistrationsControl
|
|
40
42
|
|
41
43
|
# If you have extra params to permit, append them to the sanitizer.
|
42
44
|
# def configure_sign_up_params
|
43
|
-
# devise_parameter_sanitizer.
|
45
|
+
# devise_parameter_sanitizer.permit(:sign_up, keys: [:attribute])
|
44
46
|
# end
|
45
47
|
|
46
48
|
# If you have extra params to permit, append them to the sanitizer.
|
47
49
|
# def configure_account_update_params
|
48
|
-
# devise_parameter_sanitizer.
|
50
|
+
# devise_parameter_sanitizer.permit(:account_update, keys: [:attribute])
|
49
51
|
# end
|
50
52
|
|
51
53
|
# The path used after sign up.
|
@@ -1,5 +1,7 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
class <%= @scope_prefix %>SessionsController < Devise::SessionsController
|
2
|
-
#
|
4
|
+
# before_action :configure_sign_in_params, only: [:create]
|
3
5
|
|
4
6
|
# GET /resource/sign_in
|
5
7
|
# def new
|
@@ -20,6 +22,6 @@ class <%= @scope_prefix %>SessionsController < Devise::SessionsController
|
|
20
22
|
|
21
23
|
# If you have extra params to permit, append them to the sanitizer.
|
22
24
|
# def configure_sign_in_params
|
23
|
-
# devise_parameter_sanitizer.
|
25
|
+
# devise_parameter_sanitizer.permit(:sign_in, keys: [:attribute])
|
24
26
|
# end
|
25
27
|
end
|
@@ -1,16 +1,24 @@
|
|
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|
|
4
12
|
# The secret key used by Devise. Devise uses this key to generate
|
5
13
|
# random tokens. Changing this key will render invalid all existing
|
6
14
|
# confirmation, reset password and unlock tokens in the database.
|
7
|
-
# Devise will use the `secret_key_base`
|
15
|
+
# Devise will use the `secret_key_base` as its `secret_key`
|
8
16
|
# by default. You can change it below and use your own secret key.
|
9
|
-
<% if rails_4? -%>
|
10
17
|
# config.secret_key = '<%= SecureRandom.hex(64) %>'
|
11
|
-
|
12
|
-
|
13
|
-
|
18
|
+
|
19
|
+
# ==> Controller configuration
|
20
|
+
# Configure the parent class to the devise controllers.
|
21
|
+
# config.parent_controller = 'DeviseController'
|
14
22
|
|
15
23
|
# ==> Mailer Configuration
|
16
24
|
# Configure the e-mail address which will be shown in Devise::Mailer,
|
@@ -21,6 +29,9 @@ Devise.setup do |config|
|
|
21
29
|
# Configure the class responsible to send e-mails.
|
22
30
|
# config.mailer = 'Devise::Mailer'
|
23
31
|
|
32
|
+
# Configure the parent class responsible to send e-mails.
|
33
|
+
# config.parent_mailer = 'ActionMailer::Base'
|
34
|
+
|
24
35
|
# ==> ORM configuration
|
25
36
|
# Load and configure the ORM. Supports :active_record (default) and
|
26
37
|
# :mongoid (bson_ext recommended) by default. Other ORMs may be
|
@@ -63,7 +74,10 @@ Devise.setup do |config|
|
|
63
74
|
# Tell if authentication through HTTP Auth is enabled. False by default.
|
64
75
|
# It can be set to an array that will enable http authentication only for the
|
65
76
|
# given strategies, for example, `config.http_authenticatable = [:database]` will
|
66
|
-
# enable it only for database authentication.
|
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:
|
67
81
|
# :database = Support basic authentication with authentication key + password
|
68
82
|
# config.http_authenticatable = false
|
69
83
|
|
@@ -91,26 +105,44 @@ Devise.setup do |config|
|
|
91
105
|
# from the server. You can disable this option at your own risk.
|
92
106
|
# config.clean_up_csrf_token_on_authentication = true
|
93
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
|
+
|
94
114
|
# ==> Configuration for :database_authenticatable
|
95
|
-
# For bcrypt, this is the cost for hashing the password and defaults to
|
96
|
-
# 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.
|
97
120
|
#
|
98
121
|
# Limiting the stretches to just one in testing will increase the performance of
|
99
122
|
# your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
|
100
123
|
# a value less than 10 in other environments. Note that, for bcrypt (the default
|
101
|
-
#
|
124
|
+
# algorithm), the cost increases exponentially with the number of stretches (e.g.
|
102
125
|
# a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
|
103
|
-
config.stretches = Rails.env.test? ? 1 :
|
126
|
+
config.stretches = Rails.env.test? ? 1 : 12
|
104
127
|
|
105
|
-
#
|
128
|
+
# Set up a pepper to generate the hashed password.
|
106
129
|
# config.pepper = '<%= SecureRandom.hex(64) %>'
|
107
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
|
136
|
+
|
108
137
|
# ==> Configuration for :confirmable
|
109
138
|
# A period that the user is allowed to access the website even without
|
110
139
|
# confirming their account. For instance, if set to 2.days, the user will be
|
111
140
|
# able to access the website for two days without confirming their account,
|
112
|
-
# access will be blocked just in the third day.
|
113
|
-
# the user
|
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.
|
114
146
|
# config.allow_unconfirmed_access_for = 2.days
|
115
147
|
|
116
148
|
# A period that the user is allowed to confirm their account before their
|
@@ -146,21 +178,18 @@ Devise.setup do |config|
|
|
146
178
|
|
147
179
|
# ==> Configuration for :validatable
|
148
180
|
# Range for password length.
|
149
|
-
config.password_length =
|
181
|
+
config.password_length = 6..128
|
150
182
|
|
151
183
|
# Email regex used to validate email formats. It simply asserts that
|
152
184
|
# one (and only one) @ exists in the given string. This is mainly
|
153
185
|
# to give user feedback and not to assert the e-mail validity.
|
154
|
-
|
186
|
+
config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
|
155
187
|
|
156
188
|
# ==> Configuration for :timeoutable
|
157
189
|
# The time you want to timeout the user session without activity. After this
|
158
190
|
# time the user will be asked for credentials again. Default is 30 minutes.
|
159
191
|
# config.timeout_in = 30.minutes
|
160
192
|
|
161
|
-
# If true, expires auth token on session timeout.
|
162
|
-
# config.expire_auth_token_on_timeout = false
|
163
|
-
|
164
193
|
# ==> Configuration for :lockable
|
165
194
|
# Defines which strategy will be used to lock an account.
|
166
195
|
# :failed_attempts = Locks an account after a number of failed attempts to sign in.
|
@@ -202,11 +231,11 @@ Devise.setup do |config|
|
|
202
231
|
# config.sign_in_after_reset_password = true
|
203
232
|
|
204
233
|
# ==> Configuration for :encryptable
|
205
|
-
# Allow you to use another encryption algorithm besides bcrypt (default).
|
206
|
-
# :sha1, :sha512 or
|
207
|
-
# :authlogic_sha512 (then you should set stretches above to 20
|
208
|
-
# and :restful_authentication_sha1 (then you should set
|
209
|
-
# 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).
|
210
239
|
#
|
211
240
|
# Require the `devise-encryptable` gem when using anything other than bcrypt
|
212
241
|
# config.encryptor = :sha512
|
@@ -266,4 +295,17 @@ Devise.setup do |config|
|
|
266
295
|
# When using OmniAuth, Devise cannot automatically set OmniAuth path,
|
267
296
|
# so you need to do it manually. For the users scope, it would be:
|
268
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
|
269
311
|
end
|
@@ -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) %>)
|
@@ -5,7 +5,11 @@
|
|
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">
|
@@ -7,8 +7,16 @@
|
|
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">
|
@@ -4,7 +4,10 @@
|
|
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">
|
@@ -10,9 +10,17 @@
|
|
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">
|
@@ -4,9 +4,17 @@
|
|
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">
|
@@ -2,8 +2,13 @@
|
|
2
2
|
|
3
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
|
-
|
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" } %>
|
7
12
|
<%= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %>
|
8
13
|
</div>
|
9
14
|
|
@@ -5,7 +5,10 @@
|
|
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">
|