doorkeeper 4.4.0 → 5.6.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/{NEWS.md → CHANGELOG.md} +471 -16
- data/README.md +108 -403
- data/app/assets/stylesheets/doorkeeper/admin/application.css +2 -2
- data/app/controllers/doorkeeper/application_controller.rb +8 -5
- data/app/controllers/doorkeeper/application_metal_controller.rb +7 -11
- data/app/controllers/doorkeeper/applications_controller.rb +62 -27
- data/app/controllers/doorkeeper/authorizations_controller.rb +112 -18
- data/app/controllers/doorkeeper/authorized_applications_controller.rb +22 -3
- data/app/controllers/doorkeeper/token_info_controller.rb +16 -4
- data/app/controllers/doorkeeper/tokens_controller.rb +104 -35
- data/app/helpers/doorkeeper/dashboard_helper.rb +9 -7
- data/app/views/doorkeeper/applications/_delete_form.html.erb +3 -1
- data/app/views/doorkeeper/applications/_form.html.erb +27 -26
- data/app/views/doorkeeper/applications/edit.html.erb +1 -1
- data/app/views/doorkeeper/applications/index.html.erb +17 -7
- data/app/views/doorkeeper/applications/new.html.erb +1 -1
- data/app/views/doorkeeper/applications/show.html.erb +38 -17
- data/app/views/doorkeeper/authorizations/error.html.erb +4 -2
- data/app/views/doorkeeper/authorizations/form_post.html.erb +15 -0
- data/app/views/doorkeeper/authorizations/new.html.erb +16 -10
- data/app/views/layouts/doorkeeper/admin.html.erb +16 -14
- data/config/locales/en.yml +28 -5
- data/lib/doorkeeper/config/abstract_builder.rb +28 -0
- data/lib/doorkeeper/config/option.rb +82 -0
- data/lib/doorkeeper/config/validations.rb +53 -0
- data/lib/doorkeeper/config.rb +477 -142
- data/lib/doorkeeper/engine.rb +17 -4
- data/lib/doorkeeper/errors.rb +25 -16
- data/lib/doorkeeper/grant_flow/fallback_flow.rb +15 -0
- data/lib/doorkeeper/grant_flow/flow.rb +44 -0
- data/lib/doorkeeper/grant_flow/registry.rb +50 -0
- data/lib/doorkeeper/grant_flow.rb +45 -0
- data/lib/doorkeeper/grape/authorization_decorator.rb +6 -4
- data/lib/doorkeeper/grape/helpers.rb +13 -7
- data/lib/doorkeeper/helpers/controller.rb +43 -10
- data/lib/doorkeeper/models/access_grant_mixin.rb +97 -3
- data/lib/doorkeeper/models/access_token_mixin.rb +273 -67
- data/lib/doorkeeper/models/application_mixin.rb +50 -5
- data/lib/doorkeeper/models/concerns/accessible.rb +2 -0
- data/lib/doorkeeper/models/concerns/expirable.rb +7 -3
- data/lib/doorkeeper/models/concerns/expiration_time_sql_math.rb +88 -0
- data/lib/doorkeeper/models/concerns/orderable.rb +2 -0
- data/lib/doorkeeper/models/concerns/ownership.rb +4 -7
- data/lib/doorkeeper/models/concerns/polymorphic_resource_owner.rb +30 -0
- data/lib/doorkeeper/models/concerns/resource_ownerable.rb +47 -0
- data/lib/doorkeeper/models/concerns/reusable.rb +19 -0
- data/lib/doorkeeper/models/concerns/revocable.rb +3 -27
- data/lib/doorkeeper/models/concerns/scopes.rb +12 -2
- data/lib/doorkeeper/models/concerns/secret_storable.rb +106 -0
- data/lib/doorkeeper/oauth/authorization/code.rb +54 -12
- data/lib/doorkeeper/oauth/authorization/context.rb +17 -0
- data/lib/doorkeeper/oauth/authorization/token.rb +64 -24
- data/lib/doorkeeper/oauth/authorization/uri_builder.rb +7 -5
- data/lib/doorkeeper/oauth/authorization_code_request.rb +69 -11
- data/lib/doorkeeper/oauth/base_request.rb +36 -24
- data/lib/doorkeeper/oauth/base_response.rb +2 -0
- data/lib/doorkeeper/oauth/client/credentials.rb +5 -5
- data/lib/doorkeeper/oauth/client.rb +10 -11
- data/lib/doorkeeper/oauth/client_credentials/creator.rb +44 -4
- data/lib/doorkeeper/oauth/client_credentials/issuer.rb +16 -9
- data/lib/doorkeeper/oauth/client_credentials/validator.rb +55 -0
- data/lib/doorkeeper/oauth/client_credentials_request.rb +10 -11
- data/lib/doorkeeper/oauth/code_request.rb +8 -12
- data/lib/doorkeeper/oauth/code_response.rb +27 -15
- data/lib/doorkeeper/oauth/error.rb +3 -1
- data/lib/doorkeeper/oauth/error_response.rb +34 -14
- data/lib/doorkeeper/oauth/forbidden_token_response.rb +11 -3
- data/lib/doorkeeper/oauth/helpers/scope_checker.rb +23 -18
- data/lib/doorkeeper/oauth/helpers/unique_token.rb +20 -3
- data/lib/doorkeeper/oauth/helpers/uri_checker.rb +42 -6
- data/lib/doorkeeper/oauth/hooks/context.rb +21 -0
- data/lib/doorkeeper/oauth/invalid_request_response.rb +43 -0
- data/lib/doorkeeper/oauth/invalid_token_response.rb +29 -4
- data/lib/doorkeeper/oauth/nonstandard.rb +39 -0
- data/lib/doorkeeper/oauth/password_access_token_request.rb +43 -10
- data/lib/doorkeeper/oauth/pre_authorization.rb +136 -26
- data/lib/doorkeeper/oauth/refresh_token_request.rb +67 -31
- data/lib/doorkeeper/oauth/scopes.rb +8 -4
- data/lib/doorkeeper/oauth/token.rb +12 -8
- data/lib/doorkeeper/oauth/token_introspection.rb +99 -25
- data/lib/doorkeeper/oauth/token_request.rb +8 -20
- data/lib/doorkeeper/oauth/token_response.rb +13 -10
- data/lib/doorkeeper/oauth.rb +13 -0
- data/lib/doorkeeper/orm/active_record/access_grant.rb +5 -30
- data/lib/doorkeeper/orm/active_record/access_token.rb +5 -43
- data/lib/doorkeeper/orm/active_record/application.rb +6 -57
- data/lib/doorkeeper/orm/active_record/mixins/access_grant.rb +63 -0
- data/lib/doorkeeper/orm/active_record/mixins/access_token.rb +77 -0
- data/lib/doorkeeper/orm/active_record/mixins/application.rb +210 -0
- data/lib/doorkeeper/orm/active_record/redirect_uri_validator.rb +66 -0
- data/lib/doorkeeper/orm/active_record/stale_records_cleaner.rb +36 -0
- data/lib/doorkeeper/orm/active_record.rb +31 -20
- data/lib/doorkeeper/rails/helpers.rb +10 -8
- data/lib/doorkeeper/rails/routes/abstract_router.rb +35 -0
- data/lib/doorkeeper/rails/routes/mapper.rb +4 -2
- data/lib/doorkeeper/rails/routes/mapping.rb +9 -7
- data/lib/doorkeeper/rails/routes/registry.rb +45 -0
- data/lib/doorkeeper/rails/routes.rb +45 -25
- data/lib/doorkeeper/rake/db.rake +40 -0
- data/lib/doorkeeper/rake/setup.rake +6 -0
- data/lib/doorkeeper/rake.rb +14 -0
- data/lib/doorkeeper/request/authorization_code.rb +6 -4
- data/lib/doorkeeper/request/client_credentials.rb +3 -3
- data/lib/doorkeeper/request/code.rb +1 -1
- data/lib/doorkeeper/request/password.rb +4 -3
- data/lib/doorkeeper/request/refresh_token.rb +6 -5
- data/lib/doorkeeper/request/strategy.rb +4 -2
- data/lib/doorkeeper/request/token.rb +1 -1
- data/lib/doorkeeper/request.rb +61 -34
- data/lib/doorkeeper/secret_storing/base.rb +64 -0
- data/lib/doorkeeper/secret_storing/bcrypt.rb +60 -0
- data/lib/doorkeeper/secret_storing/plain.rb +33 -0
- data/lib/doorkeeper/secret_storing/sha256_hash.rb +26 -0
- data/lib/doorkeeper/server.rb +9 -11
- data/lib/doorkeeper/stale_records_cleaner.rb +24 -0
- data/lib/doorkeeper/validations.rb +2 -0
- data/lib/doorkeeper/version.rb +7 -29
- data/lib/doorkeeper.rb +180 -65
- data/lib/generators/doorkeeper/application_owner_generator.rb +24 -18
- data/lib/generators/doorkeeper/confidential_applications_generator.rb +33 -0
- data/lib/generators/doorkeeper/enable_polymorphic_resource_owner_generator.rb +39 -0
- data/lib/generators/doorkeeper/install_generator.rb +19 -9
- data/lib/generators/doorkeeper/migration_generator.rb +23 -18
- data/lib/generators/doorkeeper/pkce_generator.rb +33 -0
- data/lib/generators/doorkeeper/previous_refresh_token_generator.rb +28 -22
- data/{spec/dummy/db/migrate/20180210183654_add_confidential_to_application.rb → lib/generators/doorkeeper/templates/add_confidential_to_applications.rb.erb} +2 -2
- data/lib/generators/doorkeeper/templates/add_owner_to_application_migration.rb.erb +3 -1
- data/lib/generators/doorkeeper/templates/add_previous_refresh_token_to_access_tokens.rb.erb +2 -0
- data/lib/generators/doorkeeper/templates/enable_pkce_migration.rb.erb +8 -0
- data/lib/generators/doorkeeper/templates/enable_polymorphic_resource_owner_migration.rb.erb +17 -0
- data/lib/generators/doorkeeper/templates/initializer.rb +402 -32
- data/lib/generators/doorkeeper/templates/migration.rb.erb +47 -18
- data/lib/generators/doorkeeper/views_generator.rb +8 -4
- data/vendor/assets/stylesheets/doorkeeper/bootstrap.min.css +4 -5
- metadata +97 -309
- data/.coveralls.yml +0 -1
- data/.github/ISSUE_TEMPLATE.md +0 -25
- data/.github/PULL_REQUEST_TEMPLATE.md +0 -17
- data/.gitignore +0 -19
- data/.hound.yml +0 -2
- data/.rspec +0 -1
- data/.rubocop.yml +0 -17
- data/.travis.yml +0 -38
- data/Appraisals +0 -18
- data/CODE_OF_CONDUCT.md +0 -46
- data/CONTRIBUTING.md +0 -47
- data/Gemfile +0 -10
- data/RELEASING.md +0 -10
- data/Rakefile +0 -20
- data/SECURITY.md +0 -15
- data/app/validators/redirect_uri_validator.rb +0 -44
- data/doorkeeper.gemspec +0 -32
- data/gemfiles/rails_4_2.gemfile +0 -13
- data/gemfiles/rails_5_0.gemfile +0 -12
- data/gemfiles/rails_5_1.gemfile +0 -12
- data/gemfiles/rails_5_2.gemfile +0 -12
- data/gemfiles/rails_master.gemfile +0 -14
- data/lib/doorkeeper/oauth/client_credentials/validation.rb +0 -45
- data/lib/generators/doorkeeper/add_client_confidentiality_generator.rb +0 -31
- data/lib/generators/doorkeeper/templates/add_confidential_to_application_migration.rb.erb +0 -11
- data/spec/controllers/application_metal_controller.rb +0 -10
- data/spec/controllers/applications_controller_spec.rb +0 -69
- data/spec/controllers/authorizations_controller_spec.rb +0 -218
- data/spec/controllers/protected_resources_controller_spec.rb +0 -309
- data/spec/controllers/token_info_controller_spec.rb +0 -56
- data/spec/controllers/tokens_controller_spec.rb +0 -274
- data/spec/dummy/Rakefile +0 -7
- data/spec/dummy/app/controllers/application_controller.rb +0 -3
- data/spec/dummy/app/controllers/custom_authorizations_controller.rb +0 -7
- data/spec/dummy/app/controllers/full_protected_resources_controller.rb +0 -12
- data/spec/dummy/app/controllers/home_controller.rb +0 -17
- data/spec/dummy/app/controllers/metal_controller.rb +0 -11
- data/spec/dummy/app/controllers/semi_protected_resources_controller.rb +0 -11
- data/spec/dummy/app/helpers/application_helper.rb +0 -5
- data/spec/dummy/app/models/user.rb +0 -5
- data/spec/dummy/app/views/home/index.html.erb +0 -0
- data/spec/dummy/app/views/layouts/application.html.erb +0 -14
- data/spec/dummy/config/application.rb +0 -23
- data/spec/dummy/config/boot.rb +0 -9
- data/spec/dummy/config/database.yml +0 -15
- data/spec/dummy/config/environment.rb +0 -5
- data/spec/dummy/config/environments/development.rb +0 -29
- data/spec/dummy/config/environments/production.rb +0 -62
- data/spec/dummy/config/environments/test.rb +0 -44
- data/spec/dummy/config/initializers/backtrace_silencers.rb +0 -7
- data/spec/dummy/config/initializers/doorkeeper.rb +0 -107
- data/spec/dummy/config/initializers/new_framework_defaults.rb +0 -6
- data/spec/dummy/config/initializers/secret_token.rb +0 -8
- data/spec/dummy/config/initializers/session_store.rb +0 -8
- data/spec/dummy/config/initializers/wrap_parameters.rb +0 -14
- data/spec/dummy/config/locales/doorkeeper.en.yml +0 -5
- data/spec/dummy/config/routes.rb +0 -52
- data/spec/dummy/config.ru +0 -4
- data/spec/dummy/db/migrate/20111122132257_create_users.rb +0 -11
- data/spec/dummy/db/migrate/20120312140401_add_password_to_users.rb +0 -7
- data/spec/dummy/db/migrate/20151223192035_create_doorkeeper_tables.rb +0 -62
- data/spec/dummy/db/migrate/20151223200000_add_owner_to_application.rb +0 -9
- data/spec/dummy/db/migrate/20160320211015_add_previous_refresh_token_to_access_tokens.rb +0 -13
- data/spec/dummy/db/schema.rb +0 -68
- data/spec/dummy/public/404.html +0 -26
- data/spec/dummy/public/422.html +0 -26
- data/spec/dummy/public/500.html +0 -26
- data/spec/dummy/public/favicon.ico +0 -0
- data/spec/dummy/script/rails +0 -6
- data/spec/factories.rb +0 -28
- data/spec/generators/application_owner_generator_spec.rb +0 -41
- data/spec/generators/install_generator_spec.rb +0 -31
- data/spec/generators/migration_generator_spec.rb +0 -41
- data/spec/generators/previous_refresh_token_generator_spec.rb +0 -57
- data/spec/generators/templates/routes.rb +0 -3
- data/spec/generators/views_generator_spec.rb +0 -27
- data/spec/grape/grape_integration_spec.rb +0 -135
- data/spec/helpers/doorkeeper/dashboard_helper_spec.rb +0 -24
- data/spec/lib/config_spec.rb +0 -437
- data/spec/lib/doorkeeper_spec.rb +0 -150
- data/spec/lib/models/expirable_spec.rb +0 -50
- data/spec/lib/models/revocable_spec.rb +0 -59
- data/spec/lib/models/scopes_spec.rb +0 -43
- data/spec/lib/oauth/authorization/uri_builder_spec.rb +0 -41
- data/spec/lib/oauth/authorization_code_request_spec.rb +0 -108
- data/spec/lib/oauth/base_request_spec.rb +0 -155
- data/spec/lib/oauth/base_response_spec.rb +0 -45
- data/spec/lib/oauth/client/credentials_spec.rb +0 -90
- data/spec/lib/oauth/client_credentials/creator_spec.rb +0 -44
- data/spec/lib/oauth/client_credentials/issuer_spec.rb +0 -86
- data/spec/lib/oauth/client_credentials/validation_spec.rb +0 -54
- data/spec/lib/oauth/client_credentials_integration_spec.rb +0 -27
- data/spec/lib/oauth/client_credentials_request_spec.rb +0 -105
- data/spec/lib/oauth/client_spec.rb +0 -39
- data/spec/lib/oauth/code_request_spec.rb +0 -43
- data/spec/lib/oauth/code_response_spec.rb +0 -34
- data/spec/lib/oauth/error_response_spec.rb +0 -61
- data/spec/lib/oauth/error_spec.rb +0 -23
- data/spec/lib/oauth/forbidden_token_response_spec.rb +0 -23
- data/spec/lib/oauth/helpers/scope_checker_spec.rb +0 -64
- data/spec/lib/oauth/helpers/unique_token_spec.rb +0 -20
- data/spec/lib/oauth/helpers/uri_checker_spec.rb +0 -213
- data/spec/lib/oauth/invalid_token_response_spec.rb +0 -56
- data/spec/lib/oauth/password_access_token_request_spec.rb +0 -96
- data/spec/lib/oauth/pre_authorization_spec.rb +0 -155
- data/spec/lib/oauth/refresh_token_request_spec.rb +0 -166
- data/spec/lib/oauth/scopes_spec.rb +0 -149
- data/spec/lib/oauth/token_request_spec.rb +0 -96
- data/spec/lib/oauth/token_response_spec.rb +0 -85
- data/spec/lib/oauth/token_spec.rb +0 -116
- data/spec/lib/request/strategy_spec.rb +0 -53
- data/spec/lib/server_spec.rb +0 -59
- data/spec/models/doorkeeper/access_grant_spec.rb +0 -36
- data/spec/models/doorkeeper/access_token_spec.rb +0 -418
- data/spec/models/doorkeeper/application_spec.rb +0 -286
- data/spec/requests/applications/applications_request_spec.rb +0 -94
- data/spec/requests/applications/authorized_applications_spec.rb +0 -30
- data/spec/requests/endpoints/authorization_spec.rb +0 -71
- data/spec/requests/endpoints/token_spec.rb +0 -71
- data/spec/requests/flows/authorization_code_errors_spec.rb +0 -76
- data/spec/requests/flows/authorization_code_spec.rb +0 -149
- data/spec/requests/flows/client_credentials_spec.rb +0 -86
- data/spec/requests/flows/implicit_grant_errors_spec.rb +0 -32
- data/spec/requests/flows/implicit_grant_spec.rb +0 -61
- data/spec/requests/flows/password_spec.rb +0 -197
- data/spec/requests/flows/refresh_token_spec.rb +0 -174
- data/spec/requests/flows/revoke_token_spec.rb +0 -157
- data/spec/requests/flows/skip_authorization_spec.rb +0 -59
- data/spec/requests/protected_resources/metal_spec.rb +0 -14
- data/spec/requests/protected_resources/private_api_spec.rb +0 -81
- data/spec/routing/custom_controller_routes_spec.rb +0 -75
- data/spec/routing/default_routes_spec.rb +0 -39
- data/spec/routing/scoped_routes_spec.rb +0 -31
- data/spec/spec_helper.rb +0 -4
- data/spec/spec_helper_integration.rb +0 -74
- data/spec/support/dependencies/factory_girl.rb +0 -2
- data/spec/support/helpers/access_token_request_helper.rb +0 -11
- data/spec/support/helpers/authorization_request_helper.rb +0 -41
- data/spec/support/helpers/config_helper.rb +0 -9
- data/spec/support/helpers/model_helper.rb +0 -72
- data/spec/support/helpers/request_spec_helper.rb +0 -88
- data/spec/support/helpers/url_helper.rb +0 -56
- data/spec/support/http_method_shim.rb +0 -38
- data/spec/support/orm/active_record.rb +0 -3
- data/spec/support/shared/controllers_shared_context.rb +0 -65
- data/spec/support/shared/models_shared_examples.rb +0 -52
- data/spec/validators/redirect_uri_validator_spec.rb +0 -123
- data/spec/version/version_spec.rb +0 -15
data/spec/lib/doorkeeper_spec.rb
DELETED
@@ -1,150 +0,0 @@
|
|
1
|
-
require 'spec_helper_integration'
|
2
|
-
|
3
|
-
describe Doorkeeper do
|
4
|
-
describe "#authenticate" do
|
5
|
-
let(:request) { double }
|
6
|
-
|
7
|
-
it "calls OAuth::Token#authenticate" do
|
8
|
-
token_strategies = Doorkeeper.configuration.access_token_methods
|
9
|
-
|
10
|
-
expect(Doorkeeper::OAuth::Token).to receive(:authenticate).
|
11
|
-
with(request, *token_strategies)
|
12
|
-
|
13
|
-
Doorkeeper.authenticate(request)
|
14
|
-
end
|
15
|
-
|
16
|
-
it "accepts custom token strategies" do
|
17
|
-
token_strategies = [:first_way, :second_way]
|
18
|
-
|
19
|
-
expect(Doorkeeper::OAuth::Token).to receive(:authenticate).
|
20
|
-
with(request, *token_strategies)
|
21
|
-
|
22
|
-
Doorkeeper.authenticate(request, token_strategies)
|
23
|
-
end
|
24
|
-
end
|
25
|
-
|
26
|
-
describe "#configured?" do
|
27
|
-
after do
|
28
|
-
Doorkeeper.remove_instance_variable(:@config)
|
29
|
-
end
|
30
|
-
|
31
|
-
context "@config is set" do
|
32
|
-
it "returns true" do
|
33
|
-
Doorkeeper.instance_variable_set(:@config, "hi")
|
34
|
-
|
35
|
-
expect(Doorkeeper.configured?).to eq(true)
|
36
|
-
end
|
37
|
-
end
|
38
|
-
|
39
|
-
context "@config is not set" do
|
40
|
-
it "returns false" do
|
41
|
-
Doorkeeper.instance_variable_set(:@config, nil)
|
42
|
-
|
43
|
-
expect(Doorkeeper.configured?).to eq(false)
|
44
|
-
end
|
45
|
-
end
|
46
|
-
|
47
|
-
it "is deprecated" do
|
48
|
-
expect(ActiveSupport::Deprecation).to receive(:warn).
|
49
|
-
with("Method `Doorkeeper#configured?` has been deprecated without replacement.")
|
50
|
-
|
51
|
-
Doorkeeper.configured?
|
52
|
-
end
|
53
|
-
end
|
54
|
-
|
55
|
-
describe "#database_installed?" do
|
56
|
-
before do
|
57
|
-
["AccessToken", "AccessGrant", "Application"].each do |klass|
|
58
|
-
@original_classes ||= {}
|
59
|
-
@original_classes[klass] = Doorkeeper.const_get(klass)
|
60
|
-
Doorkeeper.send(:remove_const, klass)
|
61
|
-
end
|
62
|
-
end
|
63
|
-
|
64
|
-
after do
|
65
|
-
["AccessToken", "AccessGrant", "Application"].each do |klass|
|
66
|
-
Doorkeeper.send(:remove_const, klass)
|
67
|
-
Doorkeeper.const_set(klass, @original_classes[klass])
|
68
|
-
end
|
69
|
-
end
|
70
|
-
|
71
|
-
context "all tables exist" do
|
72
|
-
before do
|
73
|
-
klass = double table_exists?: true
|
74
|
-
|
75
|
-
Doorkeeper.const_set(:AccessToken, klass)
|
76
|
-
Doorkeeper.const_set(:AccessGrant, klass)
|
77
|
-
Doorkeeper.const_set(:Application, klass)
|
78
|
-
end
|
79
|
-
|
80
|
-
it "returns true" do
|
81
|
-
expect(Doorkeeper.database_installed?).to eq(true)
|
82
|
-
end
|
83
|
-
|
84
|
-
it "is deprecated" do
|
85
|
-
expect(ActiveSupport::Deprecation).to receive(:warn).
|
86
|
-
with("Method `Doorkeeper#database_installed?` has been deprecated without replacement.")
|
87
|
-
|
88
|
-
Doorkeeper.database_installed?
|
89
|
-
end
|
90
|
-
end
|
91
|
-
|
92
|
-
context "all tables do not exist" do
|
93
|
-
before do
|
94
|
-
klass = double table_exists?: false
|
95
|
-
|
96
|
-
Doorkeeper.const_set(:AccessToken, klass)
|
97
|
-
Doorkeeper.const_set(:AccessGrant, klass)
|
98
|
-
Doorkeeper.const_set(:Application, klass)
|
99
|
-
end
|
100
|
-
|
101
|
-
it "returns false" do
|
102
|
-
expect(Doorkeeper.database_installed?).to eq(false)
|
103
|
-
end
|
104
|
-
|
105
|
-
it "is deprecated" do
|
106
|
-
expect(ActiveSupport::Deprecation).to receive(:warn).
|
107
|
-
with("Method `Doorkeeper#database_installed?` has been deprecated without replacement.")
|
108
|
-
|
109
|
-
Doorkeeper.database_installed?
|
110
|
-
end
|
111
|
-
end
|
112
|
-
end
|
113
|
-
|
114
|
-
describe "#installed?" do
|
115
|
-
context "methods return true" do
|
116
|
-
before do
|
117
|
-
allow(Doorkeeper).to receive(:configured?).and_return(true).once
|
118
|
-
allow(Doorkeeper).to receive(:database_installed?).and_return(true).once
|
119
|
-
end
|
120
|
-
|
121
|
-
it "returns true" do
|
122
|
-
expect(Doorkeeper.installed?).to eq(true)
|
123
|
-
end
|
124
|
-
end
|
125
|
-
|
126
|
-
context "methods return false" do
|
127
|
-
before do
|
128
|
-
allow(Doorkeeper).to receive(:configured?).and_return(false).once
|
129
|
-
allow(Doorkeeper).to receive(:database_installed?).and_return(false).once
|
130
|
-
end
|
131
|
-
|
132
|
-
it "returns false" do
|
133
|
-
expect(Doorkeeper.installed?).to eq(false)
|
134
|
-
end
|
135
|
-
end
|
136
|
-
|
137
|
-
it "is deprecated" do
|
138
|
-
expect(ActiveSupport::Deprecation).to receive(:warn).
|
139
|
-
with("Method `Doorkeeper#configured?` has been deprecated without replacement.")
|
140
|
-
|
141
|
-
expect(ActiveSupport::Deprecation).to receive(:warn).
|
142
|
-
with("Method `Doorkeeper#database_installed?` has been deprecated without replacement.")
|
143
|
-
|
144
|
-
expect(ActiveSupport::Deprecation).to receive(:warn).
|
145
|
-
with("Method `Doorkeeper#installed?` has been deprecated without replacement.")
|
146
|
-
|
147
|
-
Doorkeeper.installed?
|
148
|
-
end
|
149
|
-
end
|
150
|
-
end
|
@@ -1,50 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
require 'active_support/time'
|
3
|
-
require 'doorkeeper/models/concerns/expirable'
|
4
|
-
|
5
|
-
describe 'Expirable' do
|
6
|
-
subject do
|
7
|
-
Class.new do
|
8
|
-
include Doorkeeper::Models::Expirable
|
9
|
-
end.new
|
10
|
-
end
|
11
|
-
|
12
|
-
before do
|
13
|
-
allow(subject).to receive(:created_at).and_return(1.minute.ago)
|
14
|
-
end
|
15
|
-
|
16
|
-
describe :expired? do
|
17
|
-
it 'is not expired if time has not passed' do
|
18
|
-
allow(subject).to receive(:expires_in).and_return(2.minutes)
|
19
|
-
expect(subject).not_to be_expired
|
20
|
-
end
|
21
|
-
|
22
|
-
it 'is expired if time has passed' do
|
23
|
-
allow(subject).to receive(:expires_in).and_return(10.seconds)
|
24
|
-
expect(subject).to be_expired
|
25
|
-
end
|
26
|
-
|
27
|
-
it 'is not expired if expires_in is not set' do
|
28
|
-
allow(subject).to receive(:expires_in).and_return(nil)
|
29
|
-
expect(subject).not_to be_expired
|
30
|
-
end
|
31
|
-
end
|
32
|
-
|
33
|
-
describe :expires_in_seconds do
|
34
|
-
it 'should return the amount of time remaining until the token is expired' do
|
35
|
-
allow(subject).to receive(:expires_in).and_return(2.minutes)
|
36
|
-
expect(subject.expires_in_seconds).to eq(60)
|
37
|
-
end
|
38
|
-
|
39
|
-
it 'should return 0 when expired' do
|
40
|
-
allow(subject).to receive(:expires_in).and_return(30.seconds)
|
41
|
-
expect(subject.expires_in_seconds).to eq(0)
|
42
|
-
end
|
43
|
-
|
44
|
-
it 'should return nil when expires_in is nil' do
|
45
|
-
allow(subject).to receive(:expires_in).and_return(nil)
|
46
|
-
expect(subject.expires_in_seconds).to be_nil
|
47
|
-
end
|
48
|
-
|
49
|
-
end
|
50
|
-
end
|
@@ -1,59 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
require 'active_support/core_ext/object/blank'
|
3
|
-
require 'doorkeeper/models/concerns/revocable'
|
4
|
-
|
5
|
-
describe 'Revocable' do
|
6
|
-
subject do
|
7
|
-
Class.new do
|
8
|
-
include Doorkeeper::Models::Revocable
|
9
|
-
end.new
|
10
|
-
end
|
11
|
-
|
12
|
-
describe :revoke do
|
13
|
-
it 'updates :revoked_at attribute with current time' do
|
14
|
-
utc = double utc: double
|
15
|
-
clock = double now: utc
|
16
|
-
expect(subject).to receive(:update_attribute).with(:revoked_at, clock.now.utc)
|
17
|
-
subject.revoke(clock)
|
18
|
-
end
|
19
|
-
end
|
20
|
-
|
21
|
-
describe :revoked? do
|
22
|
-
it 'is revoked if :revoked_at has passed' do
|
23
|
-
allow(subject).to receive(:revoked_at).and_return(Time.now.utc - 1000)
|
24
|
-
expect(subject).to be_revoked
|
25
|
-
end
|
26
|
-
|
27
|
-
it 'is not revoked if :revoked_at has not passed' do
|
28
|
-
allow(subject).to receive(:revoked_at).and_return(Time.now.utc + 1000)
|
29
|
-
expect(subject).not_to be_revoked
|
30
|
-
end
|
31
|
-
|
32
|
-
it 'is not revoked if :revoked_at is not set' do
|
33
|
-
allow(subject).to receive(:revoked_at).and_return(nil)
|
34
|
-
expect(subject).not_to be_revoked
|
35
|
-
end
|
36
|
-
end
|
37
|
-
|
38
|
-
describe :revoke_previous_refresh_token! do
|
39
|
-
it "revokes the previous token if existing, and resets the
|
40
|
-
`previous_refresh_token` attribute" do
|
41
|
-
previous_token = FactoryBot.create(
|
42
|
-
:access_token,
|
43
|
-
refresh_token: "refresh_token"
|
44
|
-
)
|
45
|
-
current_token = FactoryBot.create(
|
46
|
-
:access_token,
|
47
|
-
previous_refresh_token: previous_token.refresh_token
|
48
|
-
)
|
49
|
-
|
50
|
-
expect_any_instance_of(
|
51
|
-
Doorkeeper::AccessToken
|
52
|
-
).to receive(:revoke).and_call_original
|
53
|
-
current_token.revoke_previous_refresh_token!
|
54
|
-
|
55
|
-
expect(current_token.previous_refresh_token).to be_empty
|
56
|
-
expect(previous_token.reload).to be_revoked
|
57
|
-
end
|
58
|
-
end
|
59
|
-
end
|
@@ -1,43 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
require 'active_support/core_ext/module/delegation'
|
3
|
-
require 'active_support/core_ext/object/blank'
|
4
|
-
require 'doorkeeper/oauth/scopes'
|
5
|
-
require 'doorkeeper/models/concerns/scopes'
|
6
|
-
|
7
|
-
describe 'Doorkeeper::Models::Scopes' do
|
8
|
-
subject do
|
9
|
-
Class.new(Hash) do
|
10
|
-
include Doorkeeper::Models::Scopes
|
11
|
-
end.new
|
12
|
-
end
|
13
|
-
|
14
|
-
before do
|
15
|
-
subject[:scopes] = 'public admin'
|
16
|
-
end
|
17
|
-
|
18
|
-
describe :scopes do
|
19
|
-
it 'is a `Scopes` class' do
|
20
|
-
expect(subject.scopes).to be_a(Doorkeeper::OAuth::Scopes)
|
21
|
-
end
|
22
|
-
|
23
|
-
it 'includes scopes' do
|
24
|
-
expect(subject.scopes).to include('public')
|
25
|
-
end
|
26
|
-
end
|
27
|
-
|
28
|
-
describe :scopes_string do
|
29
|
-
it 'is a `Scopes` class' do
|
30
|
-
expect(subject.scopes_string).to eq('public admin')
|
31
|
-
end
|
32
|
-
end
|
33
|
-
|
34
|
-
describe :includes_scope? do
|
35
|
-
it 'should return true if at least one scope is included' do
|
36
|
-
expect(subject.includes_scope?('public', 'private')).to be true
|
37
|
-
end
|
38
|
-
|
39
|
-
it 'should return false if no scopes are included' do
|
40
|
-
expect(subject.includes_scope?('teacher', 'student')).to be false
|
41
|
-
end
|
42
|
-
end
|
43
|
-
end
|
@@ -1,41 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
require 'active_support/core_ext/string'
|
3
|
-
require 'uri'
|
4
|
-
require 'rack/utils'
|
5
|
-
require 'doorkeeper/oauth/authorization/uri_builder'
|
6
|
-
|
7
|
-
module Doorkeeper::OAuth::Authorization
|
8
|
-
describe URIBuilder do
|
9
|
-
subject { URIBuilder }
|
10
|
-
|
11
|
-
describe :uri_with_query do
|
12
|
-
it 'returns the uri with query' do
|
13
|
-
uri = subject.uri_with_query 'http://example.com/', parameter: 'value'
|
14
|
-
expect(uri).to eq('http://example.com/?parameter=value')
|
15
|
-
end
|
16
|
-
|
17
|
-
it 'rejects nil values' do
|
18
|
-
uri = subject.uri_with_query 'http://example.com/', parameter: ''
|
19
|
-
expect(uri).to eq('http://example.com/?')
|
20
|
-
end
|
21
|
-
|
22
|
-
it 'preserves original query parameters' do
|
23
|
-
uri = subject.uri_with_query 'http://example.com/?query1=value', parameter: 'value'
|
24
|
-
expect(uri).to match(/query1=value/)
|
25
|
-
expect(uri).to match(/parameter=value/)
|
26
|
-
end
|
27
|
-
end
|
28
|
-
|
29
|
-
describe :uri_with_fragment do
|
30
|
-
it 'returns uri with parameters as fragments' do
|
31
|
-
uri = subject.uri_with_fragment 'http://example.com/', parameter: 'value'
|
32
|
-
expect(uri).to eq('http://example.com/#parameter=value')
|
33
|
-
end
|
34
|
-
|
35
|
-
it 'preserves original query parameters' do
|
36
|
-
uri = subject.uri_with_fragment 'http://example.com/?query1=value1', parameter: 'value'
|
37
|
-
expect(uri).to eq('http://example.com/?query1=value1#parameter=value')
|
38
|
-
end
|
39
|
-
end
|
40
|
-
end
|
41
|
-
end
|
@@ -1,108 +0,0 @@
|
|
1
|
-
require 'spec_helper_integration'
|
2
|
-
|
3
|
-
module Doorkeeper::OAuth
|
4
|
-
describe AuthorizationCodeRequest do
|
5
|
-
let(:server) do
|
6
|
-
double :server,
|
7
|
-
access_token_expires_in: 2.days,
|
8
|
-
refresh_token_enabled?: false,
|
9
|
-
custom_access_token_expires_in: ->(_app) { nil }
|
10
|
-
end
|
11
|
-
|
12
|
-
let(:grant) { FactoryBot.create :access_grant }
|
13
|
-
let(:client) { grant.application }
|
14
|
-
let(:redirect_uri) { client.redirect_uri }
|
15
|
-
let(:params) { { redirect_uri: redirect_uri } }
|
16
|
-
|
17
|
-
subject do
|
18
|
-
AuthorizationCodeRequest.new server, grant, client, params
|
19
|
-
end
|
20
|
-
|
21
|
-
it 'issues a new token for the client' do
|
22
|
-
expect do
|
23
|
-
subject.authorize
|
24
|
-
end.to change { client.reload.access_tokens.count }.by(1)
|
25
|
-
end
|
26
|
-
|
27
|
-
it "issues the token with same grant's scopes" do
|
28
|
-
subject.authorize
|
29
|
-
expect(Doorkeeper::AccessToken.last.scopes).to eq(grant.scopes)
|
30
|
-
end
|
31
|
-
|
32
|
-
it 'revokes the grant' do
|
33
|
-
expect { subject.authorize }.to change { grant.reload.accessible? }
|
34
|
-
end
|
35
|
-
|
36
|
-
it 'requires the grant to be accessible' do
|
37
|
-
grant.revoke
|
38
|
-
subject.validate
|
39
|
-
expect(subject.error).to eq(:invalid_grant)
|
40
|
-
end
|
41
|
-
|
42
|
-
it 'requires the grant' do
|
43
|
-
subject.grant = nil
|
44
|
-
subject.validate
|
45
|
-
expect(subject.error).to eq(:invalid_grant)
|
46
|
-
end
|
47
|
-
|
48
|
-
it 'requires the client' do
|
49
|
-
subject.client = nil
|
50
|
-
subject.validate
|
51
|
-
expect(subject.error).to eq(:invalid_client)
|
52
|
-
end
|
53
|
-
|
54
|
-
it 'requires the redirect_uri' do
|
55
|
-
subject.redirect_uri = nil
|
56
|
-
subject.validate
|
57
|
-
expect(subject.error).to eq(:invalid_request)
|
58
|
-
end
|
59
|
-
|
60
|
-
it "matches the redirect_uri with grant's one" do
|
61
|
-
subject.redirect_uri = 'http://other.com'
|
62
|
-
subject.validate
|
63
|
-
expect(subject.error).to eq(:invalid_grant)
|
64
|
-
end
|
65
|
-
|
66
|
-
it "matches the client with grant's one" do
|
67
|
-
subject.client = FactoryBot.create :application
|
68
|
-
subject.validate
|
69
|
-
expect(subject.error).to eq(:invalid_grant)
|
70
|
-
end
|
71
|
-
|
72
|
-
it 'skips token creation if there is a matching one' do
|
73
|
-
Doorkeeper.configure do
|
74
|
-
orm DOORKEEPER_ORM
|
75
|
-
reuse_access_token
|
76
|
-
end
|
77
|
-
|
78
|
-
FactoryBot.create(:access_token, application_id: client.id,
|
79
|
-
resource_owner_id: grant.resource_owner_id, scopes: grant.scopes.to_s)
|
80
|
-
|
81
|
-
expect { subject.authorize }.to_not change { Doorkeeper::AccessToken.count }
|
82
|
-
end
|
83
|
-
|
84
|
-
it "calls configured request callback methods" do
|
85
|
-
expect(Doorkeeper.configuration.before_successful_strategy_response).to receive(:call).with(subject).once
|
86
|
-
expect(Doorkeeper.configuration.after_successful_strategy_response).to receive(:call).with(subject, instance_of(Doorkeeper::OAuth::TokenResponse)).once
|
87
|
-
subject.authorize
|
88
|
-
end
|
89
|
-
|
90
|
-
context "when redirect_uri contains some query params" do
|
91
|
-
let(:redirect_uri) { client.redirect_uri + "?query=q" }
|
92
|
-
|
93
|
-
it "compares only host part with grant's redirect_uri" do
|
94
|
-
subject.validate
|
95
|
-
expect(subject.error).to eq(nil)
|
96
|
-
end
|
97
|
-
end
|
98
|
-
|
99
|
-
context "when redirect_uri is not an URI" do
|
100
|
-
let(:redirect_uri) { '123d#!s' }
|
101
|
-
|
102
|
-
it "responds with invalid_grant" do
|
103
|
-
subject.validate
|
104
|
-
expect(subject.error).to eq(:invalid_grant)
|
105
|
-
end
|
106
|
-
end
|
107
|
-
end
|
108
|
-
end
|
@@ -1,155 +0,0 @@
|
|
1
|
-
require 'spec_helper_integration'
|
2
|
-
|
3
|
-
module Doorkeeper::OAuth
|
4
|
-
describe BaseRequest do
|
5
|
-
let(:access_token) do
|
6
|
-
double :access_token,
|
7
|
-
token: "some-token",
|
8
|
-
expires_in: "3600",
|
9
|
-
expires_in_seconds: "300",
|
10
|
-
scopes_string: "two scopes",
|
11
|
-
refresh_token: "some-refresh-token",
|
12
|
-
token_type: "bearer",
|
13
|
-
created_at: 0
|
14
|
-
end
|
15
|
-
|
16
|
-
let(:client) { double :client, id: '1' }
|
17
|
-
|
18
|
-
let(:scopes_array) { %w[public write] }
|
19
|
-
|
20
|
-
let(:server) do
|
21
|
-
double :server,
|
22
|
-
access_token_expires_in: 100,
|
23
|
-
custom_access_token_expires_in: ->(_) { nil },
|
24
|
-
refresh_token_enabled?: false
|
25
|
-
end
|
26
|
-
|
27
|
-
subject do
|
28
|
-
BaseRequest.new
|
29
|
-
end
|
30
|
-
|
31
|
-
describe "#authorize" do
|
32
|
-
before do
|
33
|
-
allow(subject).to receive(:access_token).and_return(access_token)
|
34
|
-
end
|
35
|
-
|
36
|
-
it "validates itself" do
|
37
|
-
expect(subject).to receive(:validate).once
|
38
|
-
subject.authorize
|
39
|
-
end
|
40
|
-
|
41
|
-
context "valid" do
|
42
|
-
before do
|
43
|
-
allow(subject).to receive(:valid?).and_return(true)
|
44
|
-
end
|
45
|
-
|
46
|
-
it "calls callback methods" do
|
47
|
-
expect(subject).to receive(:before_successful_response).once
|
48
|
-
expect(subject).to receive(:after_successful_response).once
|
49
|
-
subject.authorize
|
50
|
-
end
|
51
|
-
|
52
|
-
it "returns a TokenResponse object" do
|
53
|
-
result = subject.authorize
|
54
|
-
|
55
|
-
expect(result).to be_an_instance_of(TokenResponse)
|
56
|
-
expect(result.body).to eq(
|
57
|
-
TokenResponse.new(access_token).body
|
58
|
-
)
|
59
|
-
end
|
60
|
-
end
|
61
|
-
|
62
|
-
context "invalid" do
|
63
|
-
before do
|
64
|
-
allow(subject).to receive(:valid?).and_return(false)
|
65
|
-
allow(subject).to receive(:error).and_return("server_error")
|
66
|
-
allow(subject).to receive(:state).and_return("hello")
|
67
|
-
end
|
68
|
-
|
69
|
-
it "returns an ErrorResponse object" do
|
70
|
-
error_description = I18n.translate(
|
71
|
-
"server_error",
|
72
|
-
scope: %i[doorkeeper errors messages]
|
73
|
-
)
|
74
|
-
|
75
|
-
result = subject.authorize
|
76
|
-
|
77
|
-
expect(result).to be_an_instance_of(ErrorResponse)
|
78
|
-
|
79
|
-
expect(result.body).to eq(
|
80
|
-
error: "server_error",
|
81
|
-
error_description: error_description,
|
82
|
-
state: "hello"
|
83
|
-
)
|
84
|
-
end
|
85
|
-
end
|
86
|
-
end
|
87
|
-
|
88
|
-
describe "#default_scopes" do
|
89
|
-
it "delegates to the server" do
|
90
|
-
expect(subject).to receive(:server).and_return(server).once
|
91
|
-
expect(server).to receive(:default_scopes).once
|
92
|
-
|
93
|
-
subject.default_scopes
|
94
|
-
end
|
95
|
-
end
|
96
|
-
|
97
|
-
describe "#find_or_create_access_token" do
|
98
|
-
it "returns an instance of AccessToken" do
|
99
|
-
result = subject.find_or_create_access_token(
|
100
|
-
client,
|
101
|
-
"1",
|
102
|
-
"public",
|
103
|
-
server
|
104
|
-
)
|
105
|
-
|
106
|
-
expect(result).to be_an_instance_of(Doorkeeper::AccessToken)
|
107
|
-
end
|
108
|
-
end
|
109
|
-
|
110
|
-
describe "#scopes" do
|
111
|
-
context "@original_scopes is present" do
|
112
|
-
before do
|
113
|
-
subject.instance_variable_set(:@original_scopes, "public write")
|
114
|
-
end
|
115
|
-
|
116
|
-
it "returns array of @original_scopes" do
|
117
|
-
result = subject.scopes
|
118
|
-
|
119
|
-
expect(result).to eq(scopes_array)
|
120
|
-
end
|
121
|
-
end
|
122
|
-
|
123
|
-
context "@original_scopes is not present" do
|
124
|
-
before do
|
125
|
-
subject.instance_variable_set(:@original_scopes, "")
|
126
|
-
end
|
127
|
-
|
128
|
-
it "calls #default_scopes" do
|
129
|
-
allow(subject).to receive(:server).and_return(server).once
|
130
|
-
allow(server).to receive(:default_scopes).and_return(scopes_array).once
|
131
|
-
|
132
|
-
result = subject.scopes
|
133
|
-
|
134
|
-
expect(result).to eq(scopes_array)
|
135
|
-
end
|
136
|
-
end
|
137
|
-
end
|
138
|
-
|
139
|
-
describe "#valid?" do
|
140
|
-
context "error is nil" do
|
141
|
-
it "returns true" do
|
142
|
-
allow(subject).to receive(:error).and_return(nil).once
|
143
|
-
expect(subject.valid?).to eq(true)
|
144
|
-
end
|
145
|
-
end
|
146
|
-
|
147
|
-
context "error is not nil" do
|
148
|
-
it "returns false" do
|
149
|
-
allow(subject).to receive(:error).and_return(Object.new).once
|
150
|
-
expect(subject.valid?).to eq(false)
|
151
|
-
end
|
152
|
-
end
|
153
|
-
end
|
154
|
-
end
|
155
|
-
end
|
@@ -1,45 +0,0 @@
|
|
1
|
-
require 'spec_helper_integration'
|
2
|
-
|
3
|
-
module Doorkeeper::OAuth
|
4
|
-
describe BaseResponse do
|
5
|
-
subject do
|
6
|
-
BaseResponse.new
|
7
|
-
end
|
8
|
-
|
9
|
-
describe "#body" do
|
10
|
-
it "returns an empty Hash" do
|
11
|
-
expect(subject.body).to eq({})
|
12
|
-
end
|
13
|
-
end
|
14
|
-
|
15
|
-
describe "#description" do
|
16
|
-
it "returns an empty String" do
|
17
|
-
expect(subject.description).to eq("")
|
18
|
-
end
|
19
|
-
end
|
20
|
-
|
21
|
-
describe "#headers" do
|
22
|
-
it "returns an empty Hash" do
|
23
|
-
expect(subject.headers).to eq({})
|
24
|
-
end
|
25
|
-
end
|
26
|
-
|
27
|
-
describe "#redirectable?" do
|
28
|
-
it "returns false" do
|
29
|
-
expect(subject.redirectable?).to eq(false)
|
30
|
-
end
|
31
|
-
end
|
32
|
-
|
33
|
-
describe "#redirect_uri" do
|
34
|
-
it "returns an empty String" do
|
35
|
-
expect(subject.redirect_uri).to eq("")
|
36
|
-
end
|
37
|
-
end
|
38
|
-
|
39
|
-
describe "#status" do
|
40
|
-
it "returns :ok" do
|
41
|
-
expect(subject.status).to eq(:ok)
|
42
|
-
end
|
43
|
-
end
|
44
|
-
end
|
45
|
-
end
|