devise 3.5.10 → 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 +279 -1126
- data/MIT-LICENSE +2 -1
- data/README.md +291 -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 +7 -4
- 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 +10 -4
- 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/passwords/edit.html.erb +3 -3
- 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 +5 -2
- data/lib/devise.rb +57 -40
- data/lib/devise/controllers/helpers.rb +30 -27
- data/lib/devise/controllers/rememberable.rb +3 -1
- data/lib/devise/controllers/scoped_views.rb +2 -0
- data/lib/devise/controllers/sign_in_out.rb +39 -14
- 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 +75 -38
- 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 +4 -2
- 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.rb +3 -1
- data/lib/devise/models/authenticatable.rb +63 -33
- data/lib/devise/models/confirmable.rb +90 -29
- data/lib/devise/models/database_authenticatable.rb +93 -22
- data/lib/devise/models/lockable.rb +19 -5
- data/lib/devise/models/omniauthable.rb +2 -0
- data/lib/devise/models/recoverable.rb +33 -21
- data/lib/devise/models/registerable.rb +4 -0
- data/lib/devise/models/rememberable.rb +6 -11
- data/lib/devise/models/timeoutable.rb +2 -0
- data/lib/devise/models/trackable.rb +15 -1
- data/lib/devise/models/validatable.rb +10 -3
- data/lib/devise/modules.rb +2 -0
- data/lib/devise/omniauth.rb +4 -5
- data/lib/devise/omniauth/config.rb +2 -0
- data/lib/devise/omniauth/url_helpers.rb +14 -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.rb +7 -16
- data/lib/devise/rails/deprecated_constant_accessor.rb +39 -0
- data/lib/devise/rails/routes.rb +48 -37
- data/lib/devise/rails/warden_compat.rb +3 -10
- data/lib/devise/secret_key_finder.rb +27 -0
- data/lib/devise/strategies/authenticatable.rb +3 -1
- data/lib/devise/strategies/base.rb +2 -0
- data/lib/devise/strategies/database_authenticatable.rb +11 -4
- data/lib/devise/strategies/rememberable.rb +2 -0
- 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/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 +8 -9
- data/lib/generators/mongoid/devise_generator.rb +7 -5
- data/lib/generators/templates/README +9 -8
- 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 +63 -21
- data/lib/generators/templates/markerb/email_changed.markerb +7 -0
- data/lib/generators/templates/markerb/password_change.markerb +2 -2
- 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 +19 -317
- data/.gitignore +0 -10
- data/.travis.yml +0 -44
- data/.yardopts +0 -9
- data/CODE_OF_CONDUCT.md +0 -22
- data/CONTRIBUTING.md +0 -16
- data/Gemfile +0 -30
- data/Gemfile.lock +0 -187
- data/Rakefile +0 -36
- data/devise.gemspec +0 -27
- data/devise.png +0 -0
- data/gemfiles/Gemfile.rails-3.2-stable +0 -29
- data/gemfiles/Gemfile.rails-3.2-stable.lock +0 -172
- data/gemfiles/Gemfile.rails-4.0-stable +0 -30
- data/gemfiles/Gemfile.rails-4.0-stable.lock +0 -166
- data/gemfiles/Gemfile.rails-4.1-stable +0 -30
- data/gemfiles/Gemfile.rails-4.1-stable.lock +0 -171
- data/gemfiles/Gemfile.rails-4.2-stable +0 -30
- data/gemfiles/Gemfile.rails-4.2-stable.lock +0 -193
- 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/helper_methods_test.rb +0 -21
- 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 -315
- 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 -103
- 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 -135
- data/test/integration/recoverable_test.rb +0 -347
- data/test/integration/registerable_test.rb +0 -359
- data/test/integration/rememberable_test.rb +0 -214
- data/test/integration/timeoutable_test.rb +0 -184
- 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 -511
- data/test/models/database_authenticatable_test.rb +0 -269
- data/test/models/lockable_test.rb +0 -350
- data/test/models/omniauthable_test.rb +0 -7
- data/test/models/recoverable_test.rb +0 -251
- data/test/models/registerable_test.rb +0 -7
- data/test/models/rememberable_test.rb +0 -169
- 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 -153
- 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/active_record/user_without_email.rb +0 -8
- data/test/rails_app/app/controllers/admins/sessions_controller.rb +0 -6
- data/test/rails_app/app/controllers/admins_controller.rb +0 -6
- 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/mongoid/user_without_email.rb +0 -33
- 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.ru +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 -125
- 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_email.rb +0 -26
- 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 -77
- 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
- data/test/time_helpers.rb +0 -137
data/test/orm/active_record.rb
DELETED
@@ -1,10 +0,0 @@
|
|
1
|
-
ActiveRecord::Migration.verbose = false
|
2
|
-
ActiveRecord::Base.logger = Logger.new(nil)
|
3
|
-
ActiveRecord::Base.include_root_in_json = true
|
4
|
-
|
5
|
-
ActiveRecord::Migrator.migrate(File.expand_path("../../rails_app/db/migrate/", __FILE__))
|
6
|
-
|
7
|
-
class ActiveSupport::TestCase
|
8
|
-
self.use_transactional_fixtures = true
|
9
|
-
self.use_instantiated_fixtures = false
|
10
|
-
end
|
data/test/orm/mongoid.rb
DELETED
@@ -1,81 +0,0 @@
|
|
1
|
-
require 'test_helper'
|
2
|
-
require 'devise/parameter_sanitizer'
|
3
|
-
|
4
|
-
class BaseSanitizerTest < ActiveSupport::TestCase
|
5
|
-
def sanitizer(params)
|
6
|
-
Devise::BaseSanitizer.new(User, :user, params)
|
7
|
-
end
|
8
|
-
|
9
|
-
test 'returns chosen params' do
|
10
|
-
sanitizer = sanitizer(user: { "email" => "jose" })
|
11
|
-
assert_equal({ "email" => "jose" }, sanitizer.sanitize(:sign_in))
|
12
|
-
end
|
13
|
-
end
|
14
|
-
|
15
|
-
if defined?(ActionController::StrongParameters)
|
16
|
-
require 'active_model/forbidden_attributes_protection'
|
17
|
-
|
18
|
-
class ParameterSanitizerTest < ActiveSupport::TestCase
|
19
|
-
def sanitizer(params)
|
20
|
-
params = ActionController::Parameters.new(params)
|
21
|
-
Devise::ParameterSanitizer.new(User, :user, params)
|
22
|
-
end
|
23
|
-
|
24
|
-
test 'filters some parameters on sign in by default' do
|
25
|
-
sanitizer = sanitizer(user: { "email" => "jose", "password" => "invalid", "remember_me" => "1" })
|
26
|
-
assert_equal({ "email" => "jose", "password" => "invalid", "remember_me" => "1" }, sanitizer.sanitize(:sign_in))
|
27
|
-
end
|
28
|
-
|
29
|
-
test 'handles auth keys as a hash' do
|
30
|
-
swap Devise, authentication_keys: {email: true} do
|
31
|
-
sanitizer = sanitizer(user: { "email" => "jose", "password" => "invalid" })
|
32
|
-
assert_equal({ "email" => "jose", "password" => "invalid" }, sanitizer.sanitize(:sign_in))
|
33
|
-
end
|
34
|
-
end
|
35
|
-
|
36
|
-
test 'filters some parameters on sign up by default' do
|
37
|
-
sanitizer = sanitizer(user: { "email" => "jose", "role" => "invalid" })
|
38
|
-
assert_equal({ "email" => "jose" }, sanitizer.sanitize(:sign_up))
|
39
|
-
end
|
40
|
-
|
41
|
-
test 'filters some parameters on account update by default' do
|
42
|
-
sanitizer = sanitizer(user: { "email" => "jose", "role" => "invalid" })
|
43
|
-
assert_equal({ "email" => "jose" }, sanitizer.sanitize(:account_update))
|
44
|
-
end
|
45
|
-
|
46
|
-
test 'allows custom hooks' do
|
47
|
-
sanitizer = sanitizer(user: { "email" => "jose", "password" => "invalid" })
|
48
|
-
sanitizer.for(:sign_in) { |user| user.permit(:email, :password) }
|
49
|
-
assert_equal({ "email" => "jose", "password" => "invalid" }, sanitizer.sanitize(:sign_in))
|
50
|
-
end
|
51
|
-
|
52
|
-
test 'adding multiple permitted parameters' do
|
53
|
-
sanitizer = sanitizer(user: { "email" => "jose", "username" => "jose1", "role" => "valid" })
|
54
|
-
sanitizer.for(:sign_in).concat([:username, :role])
|
55
|
-
assert_equal({ "email" => "jose", "username" => "jose1", "role" => "valid" }, sanitizer.sanitize(:sign_in))
|
56
|
-
end
|
57
|
-
|
58
|
-
test 'removing multiple default parameters' do
|
59
|
-
sanitizer = sanitizer(user: { "email" => "jose", "password" => "invalid", "remember_me" => "1" })
|
60
|
-
sanitizer.for(:sign_in).delete(:email)
|
61
|
-
sanitizer.for(:sign_in).delete(:password)
|
62
|
-
assert_equal({ "remember_me" => "1" }, sanitizer.sanitize(:sign_in))
|
63
|
-
end
|
64
|
-
|
65
|
-
test 'raises on unknown hooks' do
|
66
|
-
sanitizer = sanitizer(user: { "email" => "jose", "password" => "invalid" })
|
67
|
-
assert_raise NotImplementedError do
|
68
|
-
sanitizer.sanitize(:unknown)
|
69
|
-
end
|
70
|
-
end
|
71
|
-
|
72
|
-
test 'passes parameters to filter as arguments to sanitizer' do
|
73
|
-
params = {user: stub}
|
74
|
-
sanitizer = Devise::ParameterSanitizer.new(User, :user, params)
|
75
|
-
|
76
|
-
params[:user].expects(:permit).with(kind_of(Symbol), kind_of(Symbol), kind_of(Symbol))
|
77
|
-
|
78
|
-
sanitizer.sanitize(:sign_in)
|
79
|
-
end
|
80
|
-
end
|
81
|
-
end
|
data/test/rails_app/Rakefile
DELETED
@@ -1,12 +0,0 @@
|
|
1
|
-
# Filters added to this controller apply to all controllers in the application.
|
2
|
-
# Likewise, all the methods added will be available for all controllers.
|
3
|
-
|
4
|
-
class ApplicationController < ActionController::Base
|
5
|
-
protect_from_forgery
|
6
|
-
before_filter :current_user, unless: :devise_controller?
|
7
|
-
before_filter :authenticate_user!, if: :devise_controller?
|
8
|
-
respond_to *Mime::SET.map(&:to_sym)
|
9
|
-
|
10
|
-
devise_group :commenter, contains: [:user, :admin]
|
11
|
-
end
|
12
|
-
|
@@ -1,30 +0,0 @@
|
|
1
|
-
class ApplicationWithFakeEngine < ApplicationController
|
2
|
-
private
|
3
|
-
|
4
|
-
helper_method :fake_engine
|
5
|
-
def fake_engine
|
6
|
-
@fake_engine ||= FakeEngine.new
|
7
|
-
end
|
8
|
-
end
|
9
|
-
|
10
|
-
class FakeEngine
|
11
|
-
def user_on_engine_confirmation_path
|
12
|
-
'/user_on_engine/confirmation'
|
13
|
-
end
|
14
|
-
|
15
|
-
def new_user_on_engine_session_path
|
16
|
-
'/user_on_engine/confirmation/new'
|
17
|
-
end
|
18
|
-
|
19
|
-
def new_user_on_engine_registration_path
|
20
|
-
'/user_on_engine/registration/new'
|
21
|
-
end
|
22
|
-
|
23
|
-
def new_user_on_engine_password_path
|
24
|
-
'/user_on_engine/password/new'
|
25
|
-
end
|
26
|
-
|
27
|
-
def new_user_on_engine_unlock_path
|
28
|
-
'/user_on_engine/unlock/new'
|
29
|
-
end
|
30
|
-
end
|
@@ -1,31 +0,0 @@
|
|
1
|
-
class Custom::RegistrationsController < Devise::RegistrationsController
|
2
|
-
def new
|
3
|
-
super do |resource|
|
4
|
-
@new_block_called = true
|
5
|
-
end
|
6
|
-
end
|
7
|
-
|
8
|
-
def create
|
9
|
-
super do |resource|
|
10
|
-
@create_block_called = true
|
11
|
-
end
|
12
|
-
end
|
13
|
-
|
14
|
-
def update
|
15
|
-
super do |resource|
|
16
|
-
@update_block_called = true
|
17
|
-
end
|
18
|
-
end
|
19
|
-
|
20
|
-
def create_block_called?
|
21
|
-
@create_block_called == true
|
22
|
-
end
|
23
|
-
|
24
|
-
def update_block_called?
|
25
|
-
@update_block_called == true
|
26
|
-
end
|
27
|
-
|
28
|
-
def new_block_called?
|
29
|
-
@new_block_called == true
|
30
|
-
end
|
31
|
-
end
|
@@ -1,25 +0,0 @@
|
|
1
|
-
class HomeController < ApplicationController
|
2
|
-
def index
|
3
|
-
end
|
4
|
-
|
5
|
-
def private
|
6
|
-
end
|
7
|
-
|
8
|
-
def user_dashboard
|
9
|
-
end
|
10
|
-
|
11
|
-
def admin_dashboard
|
12
|
-
end
|
13
|
-
|
14
|
-
def join
|
15
|
-
end
|
16
|
-
|
17
|
-
def set
|
18
|
-
session["devise.foo_bar"] = "something"
|
19
|
-
head :ok
|
20
|
-
end
|
21
|
-
|
22
|
-
def unauthenticated
|
23
|
-
render text: "unauthenticated", status: :unauthorized
|
24
|
-
end
|
25
|
-
end
|
@@ -1,14 +0,0 @@
|
|
1
|
-
class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
|
2
|
-
def facebook
|
3
|
-
data = env["omniauth.auth"]
|
4
|
-
session["devise.facebook_data"] = data["extra"]["user_hash"]
|
5
|
-
render json: data
|
6
|
-
end
|
7
|
-
|
8
|
-
def sign_in_facebook
|
9
|
-
user = User.to_adapter.find_first(email: 'user@test.com')
|
10
|
-
user.remember_me = true
|
11
|
-
sign_in user
|
12
|
-
render text: ""
|
13
|
-
end
|
14
|
-
end
|
@@ -1,31 +0,0 @@
|
|
1
|
-
class UsersController < ApplicationController
|
2
|
-
prepend_before_filter :current_user, only: :exhibit
|
3
|
-
before_filter :authenticate_user!, except: [:accept, :exhibit]
|
4
|
-
respond_to :html, :xml
|
5
|
-
|
6
|
-
def index
|
7
|
-
user_session[:cart] = "Cart"
|
8
|
-
respond_with(current_user)
|
9
|
-
end
|
10
|
-
|
11
|
-
def edit_form
|
12
|
-
user_session['last_request_at'] = params.fetch(:last_request_at, 31.minutes.ago.utc)
|
13
|
-
end
|
14
|
-
|
15
|
-
def update_form
|
16
|
-
render text: 'Update'
|
17
|
-
end
|
18
|
-
|
19
|
-
def accept
|
20
|
-
@current_user = current_user
|
21
|
-
end
|
22
|
-
|
23
|
-
def exhibit
|
24
|
-
render text: current_user ? "User is authenticated" : "User is not authenticated"
|
25
|
-
end
|
26
|
-
|
27
|
-
def expire
|
28
|
-
user_session['last_request_at'] = 31.minutes.ago.utc
|
29
|
-
render text: 'User will be expired on next request'
|
30
|
-
end
|
31
|
-
end
|
@@ -1,29 +0,0 @@
|
|
1
|
-
require 'shared_admin'
|
2
|
-
|
3
|
-
class Admin
|
4
|
-
include Mongoid::Document
|
5
|
-
include Shim
|
6
|
-
include SharedAdmin
|
7
|
-
|
8
|
-
## Database authenticatable
|
9
|
-
field :email, type: String
|
10
|
-
field :encrypted_password, type: String
|
11
|
-
|
12
|
-
## Recoverable
|
13
|
-
field :reset_password_token, type: String
|
14
|
-
field :reset_password_sent_at, type: Time
|
15
|
-
|
16
|
-
## Rememberable
|
17
|
-
field :remember_created_at, type: Time
|
18
|
-
|
19
|
-
## Confirmable
|
20
|
-
field :confirmation_token, type: String
|
21
|
-
field :confirmed_at, type: Time
|
22
|
-
field :confirmation_sent_at, type: Time
|
23
|
-
field :unconfirmed_email, type: String # Only if using reconfirmable
|
24
|
-
|
25
|
-
## Lockable
|
26
|
-
field :locked_at, type: Time
|
27
|
-
|
28
|
-
field :active, type: Boolean, default: false
|
29
|
-
end
|
@@ -1,23 +0,0 @@
|
|
1
|
-
module Shim
|
2
|
-
extend ::ActiveSupport::Concern
|
3
|
-
|
4
|
-
included do
|
5
|
-
include ::Mongoid::Timestamps
|
6
|
-
field :created_at, type: DateTime
|
7
|
-
end
|
8
|
-
|
9
|
-
module ClassMethods
|
10
|
-
def order(attribute)
|
11
|
-
asc(attribute)
|
12
|
-
end
|
13
|
-
|
14
|
-
def find_by_email(email)
|
15
|
-
find_by(email: email)
|
16
|
-
end
|
17
|
-
end
|
18
|
-
|
19
|
-
# overwrite equality (because some devise tests use this for asserting model equality)
|
20
|
-
def ==(other)
|
21
|
-
other.is_a?(self.class) && _id == other._id
|
22
|
-
end
|
23
|
-
end
|
@@ -1,39 +0,0 @@
|
|
1
|
-
require 'shared_user'
|
2
|
-
|
3
|
-
class User
|
4
|
-
include Mongoid::Document
|
5
|
-
include Shim
|
6
|
-
include SharedUser
|
7
|
-
|
8
|
-
field :username, type: String
|
9
|
-
field :facebook_token, type: String
|
10
|
-
|
11
|
-
## Database authenticatable
|
12
|
-
field :email, type: String, default: ""
|
13
|
-
field :encrypted_password, type: String, default: ""
|
14
|
-
|
15
|
-
## Recoverable
|
16
|
-
field :reset_password_token, type: String
|
17
|
-
field :reset_password_sent_at, type: Time
|
18
|
-
|
19
|
-
## Rememberable
|
20
|
-
field :remember_created_at, type: Time
|
21
|
-
|
22
|
-
## Trackable
|
23
|
-
field :sign_in_count, type: Integer, default: 0
|
24
|
-
field :current_sign_in_at, type: Time
|
25
|
-
field :last_sign_in_at, type: Time
|
26
|
-
field :current_sign_in_ip, type: String
|
27
|
-
field :last_sign_in_ip, type: String
|
28
|
-
|
29
|
-
## Confirmable
|
30
|
-
field :confirmation_token, type: String
|
31
|
-
field :confirmed_at, type: Time
|
32
|
-
field :confirmation_sent_at, type: Time
|
33
|
-
# field :unconfirmed_email, type: String # Only if using reconfirmable
|
34
|
-
|
35
|
-
## Lockable
|
36
|
-
field :failed_attempts, type: Integer, default: 0 # Only if lock strategy is :failed_attempts
|
37
|
-
field :unlock_token, type: String # Only if unlock strategy is :email or :both
|
38
|
-
field :locked_at, type: Time
|
39
|
-
end
|