sorcery 0.8.4 → 0.8.5
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of sorcery might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/.gitignore +54 -0
- data/.travis.yml +13 -1
- data/CHANGELOG.md +234 -0
- data/Gemfile +17 -14
- data/Gemfile.rails4 +24 -0
- data/README.md +300 -0
- data/Rakefile +3 -79
- data/VERSION +1 -1
- data/lib/generators/sorcery/helpers.rb +40 -0
- data/lib/generators/sorcery/install_generator.rb +21 -17
- data/lib/generators/sorcery/templates/initializer.rb +1 -1
- data/lib/generators/sorcery/templates/migration/activity_logging.rb +2 -11
- data/lib/generators/sorcery/templates/migration/brute_force_protection.rb +1 -7
- data/lib/generators/sorcery/templates/migration/core.rb +5 -8
- data/lib/generators/sorcery/templates/migration/external.rb +1 -5
- data/lib/generators/sorcery/templates/migration/remember_me.rb +2 -9
- data/lib/generators/sorcery/templates/migration/reset_password.rb +2 -10
- data/lib/generators/sorcery/templates/migration/user_activation.rb +2 -10
- data/lib/sorcery/controller.rb +16 -4
- data/lib/sorcery/controller/submodules/external.rb +9 -8
- data/lib/sorcery/controller/submodules/external/protocols/oauth2.rb +2 -1
- data/lib/sorcery/controller/submodules/external/providers/facebook.rb +2 -1
- data/lib/sorcery/controller/submodules/external/providers/github.rb +2 -1
- data/lib/sorcery/controller/submodules/external/providers/google.rb +2 -1
- data/lib/sorcery/controller/submodules/external/providers/linkedin.rb +2 -1
- data/lib/sorcery/controller/submodules/external/providers/liveid.rb +2 -1
- data/lib/sorcery/controller/submodules/external/providers/twitter.rb +3 -2
- data/lib/sorcery/controller/submodules/external/providers/vk.rb +2 -1
- data/lib/sorcery/controller/submodules/external/providers/xing.rb +2 -1
- data/lib/sorcery/controller/submodules/remember_me.rb +1 -1
- data/lib/sorcery/controller/submodules/session_timeout.rb +1 -1
- data/lib/sorcery/model.rb +9 -3
- data/lib/sorcery/model/adapters/mongoid.rb +3 -3
- data/lib/sorcery/model/submodules/brute_force_protection.rb +6 -8
- data/lib/sorcery/model/submodules/reset_password.rb +5 -1
- data/lib/sorcery/model/submodules/user_activation.rb +18 -4
- data/lib/sorcery/test_helpers/internal.rb +21 -4
- data/lib/sorcery/test_helpers/internal/rails.rb +4 -4
- data/lib/sorcery/test_helpers/rails.rb +2 -2
- data/sorcery.gemspec +25 -363
- data/spec/{rails3/spec → active_record}/controller_activity_logging_spec.rb +29 -19
- data/spec/active_record/controller_brute_force_protection_spec.rb +136 -0
- data/spec/{rails3/spec → active_record}/controller_http_basic_auth_spec.rb +26 -17
- data/spec/{rails3/spec → active_record}/controller_oauth2_spec.rb +93 -56
- data/spec/{rails3/spec → active_record}/controller_oauth_spec.rb +35 -29
- data/spec/{rails3/spec → active_record}/controller_remember_me_spec.rb +28 -28
- data/spec/{rails3/spec → active_record}/controller_session_timeout_spec.rb +11 -11
- data/spec/{rails3/spec → active_record}/controller_spec.rb +19 -19
- data/spec/{rails3/spec → active_record}/integration_spec.rb +2 -2
- data/spec/{rails3/spec → active_record}/user_activation_spec.rb +8 -6
- data/spec/active_record/user_activity_logging_spec.rb +8 -0
- data/spec/{rails3/spec → active_record}/user_brute_force_protection_spec.rb +5 -4
- data/spec/{rails3/spec → active_record}/user_oauth_spec.rb +5 -4
- data/spec/{rails3/spec → active_record}/user_remember_me_spec.rb +4 -3
- data/spec/{rails3/spec → active_record}/user_reset_password_spec.rb +6 -6
- data/spec/{rails3/spec → active_record}/user_spec.rb +12 -10
- data/spec/{rails3_mongo_mapper/spec → mongo_mapper}/controller_spec.rb +15 -15
- data/spec/mongo_mapper/user_activation_spec.rb +10 -0
- data/spec/mongo_mapper/user_activity_logging_spec.rb +8 -0
- data/spec/mongo_mapper/user_brute_force_protection_spec.rb +8 -0
- data/spec/mongo_mapper/user_oauth_spec.rb +8 -0
- data/spec/mongo_mapper/user_remember_me_spec.rb +8 -0
- data/spec/mongo_mapper/user_reset_password_spec.rb +8 -0
- data/spec/{rails3_mongo_mapper/spec → mongo_mapper}/user_spec.rb +9 -8
- data/spec/{rails3_mongoid/spec → mongoid}/controller_activity_logging_spec.rb +8 -8
- data/spec/{rails3_mongoid/spec → mongoid}/controller_spec.rb +14 -14
- data/spec/mongoid/user_activation_spec.rb +10 -0
- data/spec/mongoid/user_activity_logging_spec.rb +9 -0
- data/spec/mongoid/user_brute_force_protection_spec.rb +9 -0
- data/spec/mongoid/user_oauth_spec.rb +9 -0
- data/spec/mongoid/user_remember_me_spec.rb +9 -0
- data/spec/mongoid/user_reset_password_spec.rb +9 -0
- data/spec/{rails3_mongoid/spec → mongoid}/user_spec.rb +10 -9
- data/spec/orm/active_record.rb +7 -0
- data/spec/orm/mongo_mapper.rb +10 -0
- data/spec/orm/mongoid.rb +17 -0
- data/spec/{rails3/app/models → rails_app/app/active_record}/authentication.rb +0 -0
- data/spec/{rails3/app/models → rails_app/app/active_record}/user.rb +1 -2
- data/spec/rails_app/app/active_record/user_provider.rb +3 -0
- data/spec/{rails3/app/controllers/application_controller.rb → rails_app/app/controllers/sorcery_controller.rb} +26 -15
- data/spec/{rails3 → rails_app}/app/helpers/application_helper.rb +0 -0
- data/spec/{rails3 → rails_app}/app/mailers/sorcery_mailer.rb +0 -0
- data/spec/{rails3_mongo_mapper/app/models → rails_app/app/mongo_mapper}/authentication.rb +0 -0
- data/spec/{rails3_mongo_mapper/app/models → rails_app/app/mongo_mapper}/user.rb +0 -0
- data/spec/{rails3_mongoid/app/models → rails_app/app/mongoid}/authentication.rb +0 -0
- data/spec/{rails3_mongoid/app/models → rails_app/app/mongoid}/user.rb +2 -0
- data/spec/{rails3 → rails_app}/app/views/application/index.html.erb +0 -0
- data/spec/{rails3 → rails_app}/app/views/layouts/application.html.erb +0 -0
- data/spec/{rails3 → rails_app}/app/views/sorcery_mailer/activation_email.html.erb +0 -0
- data/spec/{rails3 → rails_app}/app/views/sorcery_mailer/activation_email.text.erb +0 -0
- data/spec/{rails3/app/views/sorcery_mailer/activation_success_email.html.erb → rails_app/app/views/sorcery_mailer/activation_needed_email.html.erb} +0 -0
- data/spec/{rails3_mongo_mapper → rails_app}/app/views/sorcery_mailer/activation_success_email.html.erb +0 -0
- data/spec/{rails3 → rails_app}/app/views/sorcery_mailer/activation_success_email.text.erb +0 -0
- data/spec/{rails3 → rails_app}/app/views/sorcery_mailer/reset_password_email.html.erb +0 -0
- data/spec/{rails3 → rails_app}/app/views/sorcery_mailer/reset_password_email.text.erb +0 -0
- data/spec/{rails3 → rails_app}/app/views/sorcery_mailer/send_unlock_token_email.text.erb +0 -0
- data/spec/{rails3_mongo_mapper → rails_app}/config.ru +1 -1
- data/spec/{rails3_mongoid → rails_app}/config/application.rb +13 -8
- data/spec/rails_app/config/boot.rb +4 -0
- data/spec/rails_app/config/database.yml +22 -0
- data/spec/{rails3 → rails_app}/config/environment.rb +0 -0
- data/spec/{rails3_mongo_mapper → rails_app}/config/environments/test.rb +2 -0
- data/spec/{rails3 → rails_app}/config/initializers/backtrace_silencers.rb +0 -0
- data/spec/{rails3 → rails_app}/config/initializers/inflections.rb +0 -0
- data/spec/{rails3 → rails_app}/config/initializers/mime_types.rb +0 -0
- data/spec/{rails3 → rails_app}/config/initializers/secret_token.rb +0 -0
- data/spec/{rails3 → rails_app}/config/initializers/session_store.rb +4 -0
- data/spec/{rails3 → rails_app}/config/locales/en.yml +0 -0
- data/spec/rails_app/config/routes.rb +37 -0
- data/spec/{rails3 → rails_app}/db/migrate/activation/20101224223622_add_activation_to_users.rb +3 -3
- data/spec/{rails3 → rails_app}/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb +0 -0
- data/spec/{rails3 → rails_app}/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb +0 -0
- data/spec/{rails3 → rails_app}/db/migrate/core/20101224223620_create_users.rb +0 -0
- data/spec/rails_app/db/migrate/external/20101224223628_create_authentications_and_user_providers.rb +22 -0
- data/spec/{rails3 → rails_app}/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb +0 -0
- data/spec/{rails3 → rails_app}/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb +0 -0
- data/spec/{rails3 → rails_app}/db/schema.rb +0 -0
- data/spec/{rails3 → rails_app}/db/seeds.rb +0 -0
- data/spec/{rails3 → rails_app}/public/404.html +0 -0
- data/spec/{rails3 → rails_app}/public/422.html +0 -0
- data/spec/{rails3 → rails_app}/public/500.html +0 -0
- data/spec/{rails3 → rails_app}/public/favicon.ico +0 -0
- data/spec/{rails3 → rails_app}/public/images/rails.png +0 -0
- data/spec/{rails3 → rails_app}/public/javascripts/application.js +0 -0
- data/spec/{rails3 → rails_app}/public/javascripts/controls.js +0 -0
- data/spec/{rails3 → rails_app}/public/javascripts/dragdrop.js +0 -0
- data/spec/{rails3 → rails_app}/public/javascripts/effects.js +0 -0
- data/spec/{rails3 → rails_app}/public/javascripts/prototype.js +0 -0
- data/spec/{rails3 → rails_app}/public/javascripts/rails.js +0 -0
- data/spec/{rails3 → rails_app}/public/robots.txt +0 -0
- data/spec/{rails3/lib/tasks → rails_app/public/stylesheets}/.gitkeep +0 -0
- data/spec/shared_examples/controller_oauth_shared_examples.rb +22 -8
- data/spec/shared_examples/user_activation_shared_examples.rb +49 -27
- data/spec/shared_examples/user_reset_password_shared_examples.rb +33 -21
- data/spec/shared_examples/user_shared_examples.rb +65 -50
- data/spec/sorcery_crypto_providers_spec.rb +47 -45
- data/spec/spec_helper.rb +38 -4
- metadata +117 -254
- data/Gemfile.lock +0 -175
- data/README.rdoc +0 -261
- data/spec/Gemfile +0 -12
- data/spec/Gemfile.lock +0 -129
- data/spec/README.md +0 -31
- data/spec/Rakefile +0 -12
- data/spec/rails3/.gitignore +0 -4
- data/spec/rails3/.rspec +0 -1
- data/spec/rails3/Gemfile +0 -15
- data/spec/rails3/Gemfile.lock +0 -162
- data/spec/rails3/README +0 -256
- data/spec/rails3/Rakefile +0 -11
- data/spec/rails3/config.ru +0 -4
- data/spec/rails3/config/application.rb +0 -46
- data/spec/rails3/config/boot.rb +0 -13
- data/spec/rails3/config/database.yml +0 -27
- data/spec/rails3/config/environments/development.rb +0 -26
- data/spec/rails3/config/environments/in_memory.rb +0 -35
- data/spec/rails3/config/environments/production.rb +0 -49
- data/spec/rails3/config/environments/test.rb +0 -35
- data/spec/rails3/config/routes.rb +0 -59
- data/spec/rails3/db/migrate/external/20101224223628_create_authentications.rb +0 -14
- data/spec/rails3/public/stylesheets/.gitkeep +0 -0
- data/spec/rails3/script/rails +0 -6
- data/spec/rails3/spec/controller_brute_force_protection_spec.rb +0 -96
- data/spec/rails3/spec/spec.opts +0 -2
- data/spec/rails3/spec/spec_helper.orig.rb +0 -27
- data/spec/rails3/spec/spec_helper.rb +0 -71
- data/spec/rails3/spec/user_activity_logging_spec.rb +0 -8
- data/spec/rails3/vendor/plugins/.gitkeep +0 -0
- data/spec/rails3_mongo_mapper/.gitignore +0 -4
- data/spec/rails3_mongo_mapper/.rspec +0 -1
- data/spec/rails3_mongo_mapper/Gemfile +0 -16
- data/spec/rails3_mongo_mapper/Gemfile.lock +0 -156
- data/spec/rails3_mongo_mapper/Rakefile +0 -11
- data/spec/rails3_mongo_mapper/app/controllers/application_controller.rb +0 -122
- data/spec/rails3_mongo_mapper/app/helpers/application_helper.rb +0 -2
- data/spec/rails3_mongo_mapper/app/mailers/sorcery_mailer.rb +0 -25
- data/spec/rails3_mongo_mapper/app/views/layouts/application.html.erb +0 -14
- data/spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_email.html.erb +0 -17
- data/spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_email.text.erb +0 -9
- data/spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_success_email.text.erb +0 -9
- data/spec/rails3_mongo_mapper/app/views/sorcery_mailer/reset_password_email.html.erb +0 -16
- data/spec/rails3_mongo_mapper/app/views/sorcery_mailer/reset_password_email.text.erb +0 -8
- data/spec/rails3_mongo_mapper/config/application.rb +0 -51
- data/spec/rails3_mongo_mapper/config/boot.rb +0 -13
- data/spec/rails3_mongo_mapper/config/environment.rb +0 -5
- data/spec/rails3_mongo_mapper/config/environments/development.rb +0 -30
- data/spec/rails3_mongo_mapper/config/environments/in_memory.rb +0 -0
- data/spec/rails3_mongo_mapper/config/environments/production.rb +0 -49
- data/spec/rails3_mongo_mapper/config/initializers/backtrace_silencers.rb +0 -7
- data/spec/rails3_mongo_mapper/config/initializers/inflections.rb +0 -10
- data/spec/rails3_mongo_mapper/config/initializers/mime_types.rb +0 -5
- data/spec/rails3_mongo_mapper/config/initializers/mongo.rb +0 -2
- data/spec/rails3_mongo_mapper/config/initializers/secret_token.rb +0 -7
- data/spec/rails3_mongo_mapper/config/initializers/session_store.rb +0 -8
- data/spec/rails3_mongo_mapper/config/locales/en.yml +0 -5
- data/spec/rails3_mongo_mapper/config/routes.rb +0 -59
- data/spec/rails3_mongo_mapper/db/schema.rb +0 -23
- data/spec/rails3_mongo_mapper/db/seeds.rb +0 -7
- data/spec/rails3_mongo_mapper/lib/tasks/.gitkeep +0 -0
- data/spec/rails3_mongo_mapper/public/404.html +0 -26
- data/spec/rails3_mongo_mapper/public/422.html +0 -26
- data/spec/rails3_mongo_mapper/public/500.html +0 -26
- data/spec/rails3_mongo_mapper/public/favicon.ico +0 -0
- data/spec/rails3_mongo_mapper/public/images/rails.png +0 -0
- data/spec/rails3_mongo_mapper/public/javascripts/application.js +0 -2
- data/spec/rails3_mongo_mapper/public/javascripts/controls.js +0 -965
- data/spec/rails3_mongo_mapper/public/javascripts/dragdrop.js +0 -974
- data/spec/rails3_mongo_mapper/public/javascripts/effects.js +0 -1123
- data/spec/rails3_mongo_mapper/public/javascripts/prototype.js +0 -6001
- data/spec/rails3_mongo_mapper/public/javascripts/rails.js +0 -175
- data/spec/rails3_mongo_mapper/public/robots.txt +0 -5
- data/spec/rails3_mongo_mapper/public/stylesheets/.gitkeep +0 -0
- data/spec/rails3_mongo_mapper/script/rails +0 -6
- data/spec/rails3_mongo_mapper/spec/spec.opts +0 -2
- data/spec/rails3_mongo_mapper/spec/spec_helper.orig.rb +0 -27
- data/spec/rails3_mongo_mapper/spec/spec_helper.rb +0 -55
- data/spec/rails3_mongo_mapper/spec/user_activation_spec.rb +0 -9
- data/spec/rails3_mongo_mapper/spec/user_activity_logging_spec.rb +0 -8
- data/spec/rails3_mongo_mapper/spec/user_brute_force_protection_spec.rb +0 -8
- data/spec/rails3_mongo_mapper/spec/user_oauth_spec.rb +0 -8
- data/spec/rails3_mongo_mapper/spec/user_remember_me_spec.rb +0 -8
- data/spec/rails3_mongo_mapper/spec/user_reset_password_spec.rb +0 -8
- data/spec/rails3_mongo_mapper/vendor/plugins/.gitkeep +0 -0
- data/spec/rails3_mongoid/.gitignore +0 -4
- data/spec/rails3_mongoid/.rspec +0 -1
- data/spec/rails3_mongoid/Gemfile +0 -15
- data/spec/rails3_mongoid/Gemfile.lock +0 -146
- data/spec/rails3_mongoid/Rakefile +0 -11
- data/spec/rails3_mongoid/app/controllers/application_controller.rb +0 -127
- data/spec/rails3_mongoid/app/helpers/application_helper.rb +0 -2
- data/spec/rails3_mongoid/app/mailers/sorcery_mailer.rb +0 -25
- data/spec/rails3_mongoid/app/views/layouts/application.html.erb +0 -14
- data/spec/rails3_mongoid/app/views/sorcery_mailer/activation_email.html.erb +0 -17
- data/spec/rails3_mongoid/app/views/sorcery_mailer/activation_email.text.erb +0 -9
- data/spec/rails3_mongoid/app/views/sorcery_mailer/activation_success_email.html.erb +0 -17
- data/spec/rails3_mongoid/app/views/sorcery_mailer/activation_success_email.text.erb +0 -9
- data/spec/rails3_mongoid/app/views/sorcery_mailer/reset_password_email.html.erb +0 -16
- data/spec/rails3_mongoid/app/views/sorcery_mailer/reset_password_email.text.erb +0 -8
- data/spec/rails3_mongoid/config.ru +0 -4
- data/spec/rails3_mongoid/config/boot.rb +0 -13
- data/spec/rails3_mongoid/config/environment.rb +0 -5
- data/spec/rails3_mongoid/config/environments/development.rb +0 -26
- data/spec/rails3_mongoid/config/environments/in_memory.rb +0 -0
- data/spec/rails3_mongoid/config/environments/production.rb +0 -49
- data/spec/rails3_mongoid/config/environments/test.rb +0 -35
- data/spec/rails3_mongoid/config/initializers/backtrace_silencers.rb +0 -7
- data/spec/rails3_mongoid/config/initializers/inflections.rb +0 -10
- data/spec/rails3_mongoid/config/initializers/mime_types.rb +0 -5
- data/spec/rails3_mongoid/config/initializers/secret_token.rb +0 -7
- data/spec/rails3_mongoid/config/initializers/session_store.rb +0 -8
- data/spec/rails3_mongoid/config/locales/en.yml +0 -5
- data/spec/rails3_mongoid/config/mongoid.yml +0 -7
- data/spec/rails3_mongoid/config/routes.rb +0 -59
- data/spec/rails3_mongoid/db/schema.rb +0 -23
- data/spec/rails3_mongoid/db/seeds.rb +0 -7
- data/spec/rails3_mongoid/lib/tasks/.gitkeep +0 -0
- data/spec/rails3_mongoid/public/404.html +0 -26
- data/spec/rails3_mongoid/public/422.html +0 -26
- data/spec/rails3_mongoid/public/500.html +0 -26
- data/spec/rails3_mongoid/public/favicon.ico +0 -0
- data/spec/rails3_mongoid/public/images/rails.png +0 -0
- data/spec/rails3_mongoid/public/javascripts/application.js +0 -2
- data/spec/rails3_mongoid/public/javascripts/controls.js +0 -965
- data/spec/rails3_mongoid/public/javascripts/dragdrop.js +0 -974
- data/spec/rails3_mongoid/public/javascripts/effects.js +0 -1123
- data/spec/rails3_mongoid/public/javascripts/prototype.js +0 -6001
- data/spec/rails3_mongoid/public/javascripts/rails.js +0 -175
- data/spec/rails3_mongoid/public/robots.txt +0 -5
- data/spec/rails3_mongoid/public/stylesheets/.gitkeep +0 -0
- data/spec/rails3_mongoid/script/rails +0 -6
- data/spec/rails3_mongoid/spec/spec.opts +0 -2
- data/spec/rails3_mongoid/spec/spec_helper.orig.rb +0 -27
- data/spec/rails3_mongoid/spec/spec_helper.rb +0 -55
- data/spec/rails3_mongoid/spec/user_activation_spec.rb +0 -9
- data/spec/rails3_mongoid/spec/user_activity_logging_spec.rb +0 -8
- data/spec/rails3_mongoid/spec/user_brute_force_protection_spec.rb +0 -8
- data/spec/rails3_mongoid/spec/user_oauth_spec.rb +0 -8
- data/spec/rails3_mongoid/spec/user_remember_me_spec.rb +0 -8
- data/spec/rails3_mongoid/spec/user_reset_password_spec.rb +0 -8
- data/spec/rails3_mongoid/vendor/plugins/.gitkeep +0 -0
@@ -1,6 +1,7 @@
|
|
1
|
-
require
|
2
|
-
|
3
|
-
require
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
require 'rails_app/app/mailers/sorcery_mailer'
|
4
|
+
require 'shared_examples/user_shared_examples'
|
4
5
|
|
5
6
|
describe "User with no submodules (core)" do
|
6
7
|
before(:all) do
|
@@ -12,15 +13,15 @@ describe "User with no submodules (core)" do
|
|
12
13
|
User.should respond_to(:authenticates_with_sorcery!)
|
13
14
|
end
|
14
15
|
end
|
15
|
-
|
16
|
+
|
16
17
|
# ----------------- PLUGIN CONFIGURATION -----------------------
|
17
|
-
|
18
|
+
|
18
19
|
it_should_behave_like "rails_3_core_model"
|
19
|
-
|
20
|
+
|
20
21
|
describe User, "external users" do
|
21
22
|
|
22
23
|
it_should_behave_like "external_user"
|
23
|
-
|
24
|
+
|
24
25
|
end
|
25
26
|
|
26
27
|
describe User, "when inherited" do
|
@@ -34,5 +35,5 @@ describe "User with no submodules (core)" do
|
|
34
35
|
SubUser.fields.should include("blabla")
|
35
36
|
end
|
36
37
|
end
|
37
|
-
|
38
|
-
end
|
38
|
+
|
39
|
+
end
|
data/spec/orm/mongoid.rb
ADDED
@@ -0,0 +1,17 @@
|
|
1
|
+
require 'mongoid'
|
2
|
+
|
3
|
+
Mongoid.configure do |config|
|
4
|
+
database = "sorcery_mongoid_test"
|
5
|
+
if config.respond_to?(:connect_to)
|
6
|
+
config.connect_to(database)
|
7
|
+
else
|
8
|
+
config.master = Mongo::Connection.new.db(database)
|
9
|
+
end
|
10
|
+
|
11
|
+
config.use_utc = true
|
12
|
+
config.include_root_in_json = true
|
13
|
+
end
|
14
|
+
|
15
|
+
class TestUser
|
16
|
+
include Mongoid::Document
|
17
|
+
end
|
File without changes
|
@@ -1,6 +1,5 @@
|
|
1
1
|
class User < ActiveRecord::Base
|
2
|
-
attr_accessible :username, :email, :password, :password_confirmation, :authentications_attributes
|
3
|
-
|
4
2
|
has_many :authentications, :dependent => :destroy
|
3
|
+
has_many :user_providers, :dependent => :destroy
|
5
4
|
accepts_nested_attributes_for :authentications
|
6
5
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
require 'oauth'
|
2
2
|
|
3
|
-
class
|
3
|
+
class SorceryController < ActionController::Base
|
4
4
|
protect_from_forgery
|
5
5
|
|
6
6
|
#before_filter :validate_session, :only => [:test_should_be_logged_in] if defined?(:validate_session)
|
@@ -15,12 +15,12 @@ class ApplicationController < ActionController::Base
|
|
15
15
|
end
|
16
16
|
|
17
17
|
def some_action_making_a_non_persisted_change_to_the_user
|
18
|
-
current_user.
|
18
|
+
current_user.email = "to_be_ignored"
|
19
19
|
render :nothing => true
|
20
20
|
end
|
21
|
-
|
21
|
+
|
22
22
|
def test_login
|
23
|
-
@user = login(params[:
|
23
|
+
@user = login(params[:email], params[:password])
|
24
24
|
render :text => ""
|
25
25
|
end
|
26
26
|
|
@@ -32,7 +32,7 @@ class ApplicationController < ActionController::Base
|
|
32
32
|
end
|
33
33
|
|
34
34
|
def test_return_to
|
35
|
-
@user = login(params[:
|
35
|
+
@user = login(params[:email], params[:password])
|
36
36
|
redirect_back_or_to(:index, :notice => 'haha!')
|
37
37
|
end
|
38
38
|
|
@@ -48,14 +48,14 @@ class ApplicationController < ActionController::Base
|
|
48
48
|
end
|
49
49
|
|
50
50
|
def test_login_with_remember
|
51
|
-
@user = login(params[:
|
51
|
+
@user = login(params[:email], params[:password])
|
52
52
|
remember_me!
|
53
53
|
|
54
54
|
render :text => ""
|
55
55
|
end
|
56
56
|
|
57
57
|
def test_login_with_remember_in_login
|
58
|
-
@user = login(params[:
|
58
|
+
@user = login(params[:email], params[:password], params[:remember])
|
59
59
|
|
60
60
|
render :text => ""
|
61
61
|
end
|
@@ -97,6 +97,10 @@ class ApplicationController < ActionController::Base
|
|
97
97
|
login_at(:liveid)
|
98
98
|
end
|
99
99
|
|
100
|
+
def login_at_test_with_state
|
101
|
+
login_at(:facebook, {:state => "bla"})
|
102
|
+
end
|
103
|
+
|
100
104
|
def test_login_from
|
101
105
|
if @user = login_from(:twitter)
|
102
106
|
redirect_to "bla", :notice => "Success!"
|
@@ -186,23 +190,30 @@ class ApplicationController < ActionController::Base
|
|
186
190
|
redirect_to "blu", :alert => "Failed!"
|
187
191
|
end
|
188
192
|
end
|
189
|
-
|
193
|
+
|
194
|
+
def test_add_second_provider
|
195
|
+
provider = params[:provider]
|
196
|
+
if logged_in?
|
197
|
+
if @user = add_provider_to_user(provider)
|
198
|
+
redirect_to "bla", :notice => "Success!"
|
199
|
+
else
|
200
|
+
redirect_to "blu", :alert => "Failed!"
|
201
|
+
end
|
202
|
+
end
|
203
|
+
end
|
204
|
+
|
190
205
|
def test_create_from_provider_with_block
|
191
206
|
provider = params[:provider]
|
192
207
|
login_from(provider)
|
193
208
|
@user = create_from(provider) do |user|
|
194
|
-
# check uniqueness of
|
195
|
-
User.where(:
|
209
|
+
# check uniqueness of email
|
210
|
+
User.where(:email => user.email).empty?
|
196
211
|
end
|
197
|
-
if @user
|
212
|
+
if @user
|
198
213
|
redirect_to "bla", :notice => "Success!"
|
199
214
|
else
|
200
215
|
redirect_to "blu", :alert => "Failed!"
|
201
216
|
end
|
202
217
|
end
|
203
218
|
|
204
|
-
protected
|
205
|
-
|
206
|
-
|
207
|
-
|
208
219
|
end
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
@@ -2,17 +2,22 @@ require File.expand_path('../boot', __FILE__)
|
|
2
2
|
|
3
3
|
require "action_controller/railtie"
|
4
4
|
require "action_mailer/railtie"
|
5
|
-
require "active_resource/railtie"
|
6
5
|
require "rails/test_unit/railtie"
|
7
6
|
|
8
|
-
require
|
7
|
+
Bundler.require :default, SORCERY_ORM
|
9
8
|
|
10
|
-
|
11
|
-
#
|
12
|
-
|
9
|
+
begin
|
10
|
+
require "#{SORCERY_ORM}/railtie"
|
11
|
+
rescue LoadError
|
12
|
+
end
|
13
|
+
|
14
|
+
require "sorcery"
|
13
15
|
|
14
16
|
module AppRoot
|
15
17
|
class Application < Rails::Application
|
18
|
+
config.autoload_paths.reject!{ |p| p =~ /\/app\/(\w+)$/ && !%w(controllers helpers mailers views).include?($1) }
|
19
|
+
config.autoload_paths += [ "#{config.root}/app/#{SORCERY_ORM}" ]
|
20
|
+
|
16
21
|
# Settings in config/environments/* take precedence over those specified here.
|
17
22
|
# Application configuration should go into files in config/initializers
|
18
23
|
# -- all .rb files in that directory are automatically loaded.
|
@@ -43,9 +48,9 @@ module AppRoot
|
|
43
48
|
|
44
49
|
# Configure sensitive parameters which will be filtered from the log file.
|
45
50
|
config.filter_parameters += [:password]
|
46
|
-
|
51
|
+
|
47
52
|
config.action_mailer.delivery_method = :test
|
48
|
-
|
53
|
+
|
49
54
|
config.active_support.deprecation = :stderr
|
50
55
|
end
|
51
|
-
end
|
56
|
+
end
|
@@ -0,0 +1,22 @@
|
|
1
|
+
# SQLite version 3.x
|
2
|
+
# gem install sqlite3-ruby (not necessary on OS X Leopard)
|
3
|
+
development:
|
4
|
+
adapter: sqlite3
|
5
|
+
database: db/development.sqlite3
|
6
|
+
pool: 5
|
7
|
+
timeout: 5000
|
8
|
+
|
9
|
+
# Warning: The database defined as "test" will be erased and
|
10
|
+
# re-generated from your development database when you run "rake".
|
11
|
+
# Do not set this db to the same as development or production.
|
12
|
+
test:
|
13
|
+
adapter: sqlite3
|
14
|
+
database: db/test.sqlite3
|
15
|
+
pool: 5
|
16
|
+
timeout: 5000
|
17
|
+
# adapter: sqlite3
|
18
|
+
# database: ":memory:"
|
19
|
+
|
20
|
+
production:
|
21
|
+
adapter: sqlite3
|
22
|
+
database: ":memory:"
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
@@ -6,3 +6,7 @@ AppRoot::Application.config.session_store :cookie_store, :key => '_app_root_sess
|
|
6
6
|
# which shouldn't be used to store highly confidential information
|
7
7
|
# (create the session table with "rails generate session_migration")
|
8
8
|
# AppRoot::Application.config.session_store :active_record_store
|
9
|
+
|
10
|
+
if AppRoot::Application.config.respond_to?(:secret_key_base=)
|
11
|
+
AppRoot::Application.config.secret_key_base = "foobar"
|
12
|
+
end
|
File without changes
|
@@ -0,0 +1,37 @@
|
|
1
|
+
AppRoot::Application.routes.draw do
|
2
|
+
root :to => "application#index"
|
3
|
+
|
4
|
+
controller :sorcery do
|
5
|
+
get :test_login
|
6
|
+
get :test_logout
|
7
|
+
get :some_action
|
8
|
+
post :test_return_to
|
9
|
+
get :test_auto_login
|
10
|
+
post :test_login_with_remember_in_login
|
11
|
+
get :test_login_from_cookie
|
12
|
+
get :test_login_from
|
13
|
+
get :test_logout_with_remember
|
14
|
+
get :test_should_be_logged_in
|
15
|
+
get :test_create_from_provider
|
16
|
+
get :test_add_second_provider
|
17
|
+
get :test_return_to_with_external
|
18
|
+
get :test_login_from5
|
19
|
+
get :test_login_from4
|
20
|
+
get :test_login_from2
|
21
|
+
get :test_login_from3
|
22
|
+
get :test_return_to_with_external5
|
23
|
+
get :login_at_test2
|
24
|
+
get :login_at_test3
|
25
|
+
get :login_at_test4
|
26
|
+
get :test_return_to_with_external2
|
27
|
+
get :test_return_to_with_external3
|
28
|
+
get :test_return_to_with_external4
|
29
|
+
get :test_http_basic_auth
|
30
|
+
get :some_action_making_a_non_persisted_change_to_the_user
|
31
|
+
post :test_login_with_remember
|
32
|
+
get :test_create_from_provider_with_block
|
33
|
+
get :login_at_test
|
34
|
+
get :login_at_test5
|
35
|
+
get :login_at_test_with_state
|
36
|
+
end
|
37
|
+
end
|
data/spec/{rails3 → rails_app}/db/migrate/activation/20101224223622_add_activation_to_users.rb
RENAMED
@@ -3,15 +3,15 @@ class AddActivationToUsers < ActiveRecord::Migration
|
|
3
3
|
add_column :users, :activation_state, :string, :default => nil
|
4
4
|
add_column :users, :activation_token, :string, :default => nil
|
5
5
|
add_column :users, :activation_token_expires_at, :datetime, :default => nil
|
6
|
-
|
6
|
+
|
7
7
|
add_index :users, :activation_token
|
8
8
|
end
|
9
9
|
|
10
10
|
def self.down
|
11
11
|
remove_index :users, :activation_token
|
12
|
-
|
12
|
+
|
13
13
|
remove_column :users, :activation_token_expires_at
|
14
14
|
remove_column :users, :activation_token
|
15
15
|
remove_column :users, :activation_state
|
16
16
|
end
|
17
|
-
end
|
17
|
+
end
|