doorkeeper 5.1.0 → 5.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Appraisals +3 -3
- data/CHANGELOG.md +881 -0
- data/CONTRIBUTING.md +11 -9
- data/Dangerfile +2 -2
- data/Dockerfile +29 -0
- data/Gemfile +4 -3
- data/NEWS.md +1 -814
- data/README.md +11 -3
- data/RELEASING.md +6 -5
- data/app/controllers/doorkeeper/application_controller.rb +2 -2
- data/app/controllers/doorkeeper/application_metal_controller.rb +3 -2
- data/app/controllers/doorkeeper/applications_controller.rb +1 -0
- data/app/controllers/doorkeeper/authorizations_controller.rb +16 -9
- data/app/controllers/doorkeeper/authorized_applications_controller.rb +2 -2
- data/app/controllers/doorkeeper/tokens_controller.rb +32 -9
- data/app/views/doorkeeper/applications/_form.html.erb +0 -6
- data/app/views/doorkeeper/applications/show.html.erb +1 -1
- data/config/locales/en.yml +8 -2
- data/doorkeeper.gemspec +9 -1
- data/gemfiles/rails_5_0.gemfile +3 -2
- data/gemfiles/rails_5_1.gemfile +3 -2
- data/gemfiles/rails_5_2.gemfile +3 -2
- data/gemfiles/rails_6_0.gemfile +4 -3
- data/gemfiles/rails_master.gemfile +3 -2
- data/lib/doorkeeper/config/option.rb +13 -7
- data/lib/doorkeeper/config.rb +157 -42
- data/lib/doorkeeper/errors.rb +13 -18
- data/lib/doorkeeper/grape/helpers.rb +6 -2
- data/lib/doorkeeper/helpers/controller.rb +28 -7
- data/lib/doorkeeper/models/access_grant_mixin.rb +7 -6
- data/lib/doorkeeper/models/access_token_mixin.rb +99 -20
- data/lib/doorkeeper/models/application_mixin.rb +3 -3
- data/lib/doorkeeper/models/concerns/ownership.rb +1 -1
- data/lib/doorkeeper/models/concerns/reusable.rb +1 -1
- data/lib/doorkeeper/models/concerns/revocable.rb +0 -27
- data/lib/doorkeeper/oauth/authorization/code.rb +12 -14
- data/lib/doorkeeper/oauth/authorization/token.rb +10 -7
- data/lib/doorkeeper/oauth/authorization_code_request.rb +31 -15
- data/lib/doorkeeper/oauth/base_request.rb +10 -4
- data/lib/doorkeeper/oauth/client.rb +7 -8
- data/lib/doorkeeper/oauth/client_credentials/creator.rb +23 -2
- data/lib/doorkeeper/oauth/client_credentials/issuer.rb +7 -7
- data/lib/doorkeeper/oauth/client_credentials/{validation.rb → validator.rb} +10 -2
- data/lib/doorkeeper/oauth/client_credentials_request.rb +1 -1
- data/lib/doorkeeper/oauth/code_request.rb +5 -11
- data/lib/doorkeeper/oauth/code_response.rb +4 -4
- data/lib/doorkeeper/oauth/error.rb +1 -1
- data/lib/doorkeeper/oauth/error_response.rb +6 -6
- data/lib/doorkeeper/oauth/helpers/scope_checker.rb +7 -5
- data/lib/doorkeeper/oauth/helpers/unique_token.rb +8 -5
- data/lib/doorkeeper/oauth/helpers/uri_checker.rb +19 -5
- data/lib/doorkeeper/oauth/invalid_request_response.rb +43 -0
- data/lib/doorkeeper/oauth/invalid_token_response.rb +5 -2
- data/lib/doorkeeper/oauth/nonstandard.rb +39 -0
- data/lib/doorkeeper/oauth/password_access_token_request.rb +9 -4
- data/lib/doorkeeper/oauth/pre_authorization.rb +76 -38
- data/lib/doorkeeper/oauth/refresh_token_request.rb +17 -14
- data/lib/doorkeeper/oauth/token.rb +2 -2
- data/lib/doorkeeper/oauth/token_introspection.rb +26 -16
- data/lib/doorkeeper/oauth/token_request.rb +4 -18
- data/lib/doorkeeper/orm/active_record/access_grant.rb +4 -43
- data/lib/doorkeeper/orm/active_record/access_token.rb +4 -35
- data/lib/doorkeeper/orm/active_record/application.rb +5 -83
- data/lib/doorkeeper/orm/active_record/mixins/access_grant.rb +53 -0
- data/lib/doorkeeper/orm/active_record/mixins/access_token.rb +47 -0
- data/lib/doorkeeper/orm/active_record/mixins/application.rb +128 -0
- data/lib/doorkeeper/orm/active_record/redirect_uri_validator.rb +61 -0
- data/lib/doorkeeper/orm/active_record.rb +21 -6
- data/lib/doorkeeper/rails/helpers.rb +4 -4
- data/lib/doorkeeper/rails/routes.rb +5 -7
- data/lib/doorkeeper/rake/db.rake +3 -3
- data/lib/doorkeeper/request/authorization_code.rb +5 -3
- data/lib/doorkeeper/request/client_credentials.rb +2 -2
- data/lib/doorkeeper/request/password.rb +2 -2
- data/lib/doorkeeper/request/refresh_token.rb +3 -3
- data/lib/doorkeeper/request.rb +7 -12
- data/lib/doorkeeper/server.rb +3 -7
- data/lib/doorkeeper/stale_records_cleaner.rb +6 -2
- data/lib/doorkeeper/version.rb +1 -1
- data/lib/doorkeeper.rb +6 -3
- data/lib/generators/doorkeeper/application_owner_generator.rb +1 -1
- data/lib/generators/doorkeeper/confidential_applications_generator.rb +1 -1
- data/lib/generators/doorkeeper/migration_generator.rb +1 -1
- data/lib/generators/doorkeeper/pkce_generator.rb +1 -1
- data/lib/generators/doorkeeper/previous_refresh_token_generator.rb +7 -7
- data/lib/generators/doorkeeper/templates/initializer.rb +149 -33
- data/lib/generators/doorkeeper/templates/migration.rb.erb +4 -1
- data/spec/controllers/application_metal_controller_spec.rb +1 -1
- data/spec/controllers/applications_controller_spec.rb +95 -1
- data/spec/controllers/authorizations_controller_spec.rb +156 -75
- data/spec/controllers/protected_resources_controller_spec.rb +28 -20
- data/spec/controllers/token_info_controller_spec.rb +1 -1
- data/spec/controllers/tokens_controller_spec.rb +206 -38
- data/spec/dummy/config/application.rb +3 -1
- data/spec/dummy/config/initializers/doorkeeper.rb +54 -9
- data/spec/dummy/db/migrate/20151223192035_create_doorkeeper_tables.rb +3 -3
- data/spec/dummy/db/migrate/20160320211015_add_previous_refresh_token_to_access_tokens.rb +1 -1
- data/spec/dummy/db/migrate/20180210183654_add_confidential_to_applications.rb +1 -1
- data/spec/generators/install_generator_spec.rb +1 -1
- data/spec/generators/previous_refresh_token_generator_spec.rb +2 -2
- data/spec/helpers/doorkeeper/dashboard_helper_spec.rb +1 -1
- data/spec/lib/config_spec.rb +104 -7
- data/spec/lib/doorkeeper_spec.rb +1 -1
- data/spec/lib/models/revocable_spec.rb +3 -3
- data/spec/lib/oauth/authorization_code_request_spec.rb +129 -115
- data/spec/lib/oauth/base_request_spec.rb +154 -135
- data/spec/lib/oauth/base_response_spec.rb +27 -29
- data/spec/lib/oauth/client/credentials_spec.rb +1 -1
- data/spec/lib/oauth/client_credentials/creator_spec.rb +43 -3
- data/spec/lib/oauth/client_credentials/issuer_spec.rb +12 -12
- data/spec/lib/oauth/client_credentials/validation_spec.rb +4 -4
- data/spec/lib/oauth/client_credentials_integration_spec.rb +16 -18
- data/spec/lib/oauth/client_credentials_request_spec.rb +78 -80
- data/spec/lib/oauth/client_spec.rb +26 -26
- data/spec/lib/oauth/code_request_spec.rb +34 -35
- data/spec/lib/oauth/code_response_spec.rb +21 -25
- data/spec/lib/oauth/error_response_spec.rb +42 -44
- data/spec/lib/oauth/error_spec.rb +12 -14
- data/spec/lib/oauth/forbidden_token_response_spec.rb +11 -13
- data/spec/lib/oauth/helpers/scope_checker_spec.rb +30 -18
- data/spec/lib/oauth/helpers/uri_checker_spec.rb +17 -2
- data/spec/lib/oauth/invalid_request_response_spec.rb +73 -0
- data/spec/lib/oauth/invalid_token_response_spec.rb +32 -34
- data/spec/lib/oauth/password_access_token_request_spec.rb +145 -147
- data/spec/lib/oauth/pre_authorization_spec.rb +161 -153
- data/spec/lib/oauth/refresh_token_request_spec.rb +138 -138
- data/spec/lib/oauth/scopes_spec.rb +104 -106
- data/spec/lib/oauth/token_request_spec.rb +117 -110
- data/spec/lib/oauth/token_response_spec.rb +71 -73
- data/spec/lib/oauth/token_spec.rb +121 -123
- data/spec/lib/server_spec.rb +0 -12
- data/spec/models/doorkeeper/access_grant_spec.rb +21 -4
- data/spec/models/doorkeeper/access_token_spec.rb +42 -11
- data/spec/models/doorkeeper/application_spec.rb +114 -77
- data/spec/requests/applications/applications_request_spec.rb +1 -1
- data/spec/requests/endpoints/authorization_spec.rb +26 -8
- data/spec/requests/endpoints/token_spec.rb +1 -1
- data/spec/requests/flows/authorization_code_errors_spec.rb +1 -0
- data/spec/requests/flows/authorization_code_spec.rb +123 -45
- data/spec/requests/flows/client_credentials_spec.rb +38 -0
- data/spec/requests/flows/implicit_grant_errors_spec.rb +22 -10
- data/spec/requests/flows/implicit_grant_spec.rb +9 -8
- data/spec/requests/flows/password_spec.rb +67 -10
- data/spec/requests/flows/refresh_token_spec.rb +20 -20
- data/spec/requests/flows/revoke_token_spec.rb +37 -23
- data/spec/spec_helper.rb +1 -4
- data/spec/support/doorkeeper_rspec.rb +1 -1
- data/spec/support/helpers/request_spec_helper.rb +14 -2
- data/spec/support/shared/controllers_shared_context.rb +33 -23
- data/spec/validators/redirect_uri_validator_spec.rb +41 -16
- metadata +19 -16
- data/.coveralls.yml +0 -1
- data/.github/ISSUE_TEMPLATE.md +0 -25
- data/.github/PULL_REQUEST_TEMPLATE.md +0 -17
- data/.gitignore +0 -20
- data/.gitlab-ci.yml +0 -16
- data/.hound.yml +0 -3
- data/.rspec +0 -1
- data/.rubocop.yml +0 -50
- data/.travis.yml +0 -35
- data/app/validators/redirect_uri_validator.rb +0 -50
- data/spec/support/http_method_shim.rb +0 -29
|
@@ -2,191 +2,189 @@
|
|
|
2
2
|
|
|
3
3
|
require "spec_helper"
|
|
4
4
|
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
let(:owner) { double :owner, id: 99 }
|
|
5
|
+
describe Doorkeeper::OAuth::PasswordAccessTokenRequest do
|
|
6
|
+
let(:server) do
|
|
7
|
+
double(
|
|
8
|
+
:server,
|
|
9
|
+
default_scopes: Doorkeeper::OAuth::Scopes.new,
|
|
10
|
+
access_token_expires_in: 2.hours,
|
|
11
|
+
refresh_token_enabled?: false,
|
|
12
|
+
custom_access_token_expires_in: lambda { |context|
|
|
13
|
+
context.grant_type == Doorkeeper::OAuth::PASSWORD ? 1234 : nil
|
|
14
|
+
},
|
|
15
|
+
)
|
|
16
|
+
end
|
|
17
|
+
let(:client) { FactoryBot.create(:application) }
|
|
18
|
+
let(:owner) { double :owner, id: 99 }
|
|
20
19
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
20
|
+
before do
|
|
21
|
+
allow(server).to receive(:option_defined?).with(:custom_access_token_expires_in).and_return(true)
|
|
22
|
+
end
|
|
24
23
|
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
24
|
+
subject do
|
|
25
|
+
described_class.new(server, client, owner)
|
|
26
|
+
end
|
|
28
27
|
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
28
|
+
it "issues a new token for the client" do
|
|
29
|
+
expect do
|
|
30
|
+
subject.authorize
|
|
31
|
+
end.to change { client.reload.access_tokens.count }.by(1)
|
|
33
32
|
|
|
34
|
-
|
|
35
|
-
|
|
33
|
+
expect(client.reload.access_tokens.max_by(&:created_at).expires_in).to eq(1234)
|
|
34
|
+
end
|
|
36
35
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
36
|
+
it "issues a new token without a client" do
|
|
37
|
+
expect do
|
|
38
|
+
subject.client = nil
|
|
39
|
+
subject.authorize
|
|
40
|
+
end.to change { Doorkeeper::AccessToken.count }.by(1)
|
|
41
|
+
end
|
|
43
42
|
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
43
|
+
it "does not issue a new token with an invalid client" do
|
|
44
|
+
expect do
|
|
45
|
+
subject.client = nil
|
|
46
|
+
subject.parameters = { client_id: "bad_id" }
|
|
47
|
+
subject.authorize
|
|
48
|
+
end.not_to(change { Doorkeeper::AccessToken.count })
|
|
50
49
|
|
|
51
|
-
|
|
52
|
-
|
|
50
|
+
expect(subject.error).to eq(:invalid_client)
|
|
51
|
+
end
|
|
53
52
|
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
53
|
+
it "requires the owner" do
|
|
54
|
+
subject.resource_owner = nil
|
|
55
|
+
subject.validate
|
|
56
|
+
expect(subject.error).to eq(:invalid_grant)
|
|
57
|
+
end
|
|
59
58
|
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
59
|
+
it "optionally accepts the client" do
|
|
60
|
+
subject.client = nil
|
|
61
|
+
expect(subject).to be_valid
|
|
62
|
+
end
|
|
64
63
|
|
|
65
|
-
|
|
66
|
-
|
|
64
|
+
it "creates token even when there is already one (default)" do
|
|
65
|
+
FactoryBot.create(:access_token, application_id: client.id, resource_owner_id: owner.id)
|
|
67
66
|
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
67
|
+
expect do
|
|
68
|
+
subject.authorize
|
|
69
|
+
end.to change { Doorkeeper::AccessToken.count }.by(1)
|
|
70
|
+
end
|
|
72
71
|
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
72
|
+
it "skips token creation if there is already one reusable" do
|
|
73
|
+
allow(Doorkeeper.configuration).to receive(:reuse_access_token).and_return(true)
|
|
74
|
+
FactoryBot.create(:access_token, application_id: client.id, resource_owner_id: owner.id)
|
|
76
75
|
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
76
|
+
expect do
|
|
77
|
+
subject.authorize
|
|
78
|
+
end.not_to(change { Doorkeeper::AccessToken.count })
|
|
79
|
+
end
|
|
81
80
|
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
81
|
+
it "creates token when there is already one but non reusable" do
|
|
82
|
+
allow(Doorkeeper.configuration).to receive(:reuse_access_token).and_return(true)
|
|
83
|
+
FactoryBot.create(:access_token, application_id: client.id, resource_owner_id: owner.id)
|
|
84
|
+
allow_any_instance_of(Doorkeeper::AccessToken).to receive(:reusable?).and_return(false)
|
|
86
85
|
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
86
|
+
expect do
|
|
87
|
+
subject.authorize
|
|
88
|
+
end.to change { Doorkeeper::AccessToken.count }.by(1)
|
|
89
|
+
end
|
|
91
90
|
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
91
|
+
it "calls configured request callback methods" do
|
|
92
|
+
expect(Doorkeeper.configuration.before_successful_strategy_response)
|
|
93
|
+
.to receive(:call).with(subject).once
|
|
95
94
|
|
|
96
|
-
|
|
97
|
-
|
|
95
|
+
expect(Doorkeeper.configuration.after_successful_strategy_response)
|
|
96
|
+
.to receive(:call).with(subject, instance_of(Doorkeeper::OAuth::TokenResponse)).once
|
|
98
97
|
|
|
99
|
-
|
|
98
|
+
subject.authorize
|
|
99
|
+
end
|
|
100
|
+
|
|
101
|
+
describe "with scopes" do
|
|
102
|
+
subject do
|
|
103
|
+
described_class.new(server, client, owner, scope: "public")
|
|
100
104
|
end
|
|
101
105
|
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
106
|
+
context "when scopes_by_grant_type is not configured for grant_type" do
|
|
107
|
+
it "returns error when scopes are invalid" do
|
|
108
|
+
allow(server).to receive(:scopes).and_return(Doorkeeper::OAuth::Scopes.from_string("another"))
|
|
109
|
+
subject.validate
|
|
110
|
+
expect(subject.error).to eq(:invalid_scope)
|
|
105
111
|
end
|
|
106
112
|
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
subject.
|
|
111
|
-
|
|
112
|
-
end
|
|
113
|
-
|
|
114
|
-
it "creates the token with scopes if scopes are valid" do
|
|
115
|
-
allow(server).to receive(:scopes).and_return(Doorkeeper::OAuth::Scopes.from_string("public"))
|
|
116
|
-
expect do
|
|
117
|
-
subject.authorize
|
|
118
|
-
end.to change { Doorkeeper::AccessToken.count }.by(1)
|
|
119
|
-
|
|
120
|
-
expect(Doorkeeper::AccessToken.last.scopes).to include("public")
|
|
121
|
-
end
|
|
122
|
-
end
|
|
113
|
+
it "creates the token with scopes if scopes are valid" do
|
|
114
|
+
allow(server).to receive(:scopes).and_return(Doorkeeper::OAuth::Scopes.from_string("public"))
|
|
115
|
+
expect do
|
|
116
|
+
subject.authorize
|
|
117
|
+
end.to change { Doorkeeper::AccessToken.count }.by(1)
|
|
123
118
|
|
|
124
|
-
|
|
125
|
-
it "returns error when scopes are valid but not permitted for grant_type" do
|
|
126
|
-
allow(server)
|
|
127
|
-
.to receive(:scopes).and_return(Doorkeeper::OAuth::Scopes.from_string("public"))
|
|
128
|
-
allow(Doorkeeper.configuration)
|
|
129
|
-
.to receive(:scopes_by_grant_type).and_return(password: "another")
|
|
130
|
-
subject.validate
|
|
131
|
-
expect(subject.error).to eq(:invalid_scope)
|
|
132
|
-
end
|
|
133
|
-
|
|
134
|
-
it "creates the token with scopes if scopes are valid and permitted for grant_type" do
|
|
135
|
-
allow(server).to receive(:scopes).and_return(Doorkeeper::OAuth::Scopes.from_string("public"))
|
|
136
|
-
allow(Doorkeeper.configuration)
|
|
137
|
-
.to receive(:scopes_by_grant_type).and_return(password: [:public])
|
|
138
|
-
|
|
139
|
-
expect do
|
|
140
|
-
subject.authorize
|
|
141
|
-
end.to change { Doorkeeper::AccessToken.count }.by(1)
|
|
142
|
-
|
|
143
|
-
expect(Doorkeeper::AccessToken.last.scopes).to include("public")
|
|
144
|
-
end
|
|
119
|
+
expect(Doorkeeper::AccessToken.last.scopes).to include("public")
|
|
145
120
|
end
|
|
146
121
|
end
|
|
147
122
|
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
:
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
if context.scopes.exists?("public")
|
|
157
|
-
222
|
|
158
|
-
elsif context.scopes.exists?("magic")
|
|
159
|
-
Float::INFINITY
|
|
160
|
-
end
|
|
161
|
-
}
|
|
162
|
-
)
|
|
163
|
-
end
|
|
164
|
-
|
|
165
|
-
before do
|
|
166
|
-
allow(server).to receive(:option_defined?).with(:custom_access_token_expires_in).and_return(true)
|
|
123
|
+
context "when scopes_by_grant_type is configured for grant_type" do
|
|
124
|
+
it "returns error when scopes are valid but not permitted for grant_type" do
|
|
125
|
+
allow(server)
|
|
126
|
+
.to receive(:scopes).and_return(Doorkeeper::OAuth::Scopes.from_string("public"))
|
|
127
|
+
allow(Doorkeeper.configuration)
|
|
128
|
+
.to receive(:scopes_by_grant_type).and_return(password: "another")
|
|
129
|
+
subject.validate
|
|
130
|
+
expect(subject.error).to eq(:invalid_scope)
|
|
167
131
|
end
|
|
168
132
|
|
|
169
|
-
it "
|
|
170
|
-
subject = PasswordAccessTokenRequest.new(server, client, owner, scope: "public")
|
|
133
|
+
it "creates the token with scopes if scopes are valid and permitted for grant_type" do
|
|
171
134
|
allow(server).to receive(:scopes).and_return(Doorkeeper::OAuth::Scopes.from_string("public"))
|
|
135
|
+
allow(Doorkeeper.configuration)
|
|
136
|
+
.to receive(:scopes_by_grant_type).and_return(password: [:public])
|
|
172
137
|
|
|
173
138
|
expect do
|
|
174
139
|
subject.authorize
|
|
175
140
|
end.to change { Doorkeeper::AccessToken.count }.by(1)
|
|
176
141
|
|
|
177
|
-
expect(Doorkeeper::AccessToken.last.
|
|
142
|
+
expect(Doorkeeper::AccessToken.last.scopes).to include("public")
|
|
178
143
|
end
|
|
144
|
+
end
|
|
145
|
+
end
|
|
179
146
|
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
147
|
+
describe "with custom expiry" do
|
|
148
|
+
let(:server) do
|
|
149
|
+
double(
|
|
150
|
+
:server,
|
|
151
|
+
default_scopes: Doorkeeper::OAuth::Scopes.new,
|
|
152
|
+
access_token_expires_in: 2.hours,
|
|
153
|
+
refresh_token_enabled?: false,
|
|
154
|
+
custom_access_token_expires_in: lambda { |context|
|
|
155
|
+
if context.scopes.exists?("public")
|
|
156
|
+
222
|
|
157
|
+
elsif context.scopes.exists?("magic")
|
|
158
|
+
Float::INFINITY
|
|
159
|
+
end
|
|
160
|
+
},
|
|
161
|
+
)
|
|
162
|
+
end
|
|
183
163
|
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
164
|
+
before do
|
|
165
|
+
allow(server).to receive(:option_defined?).with(:custom_access_token_expires_in).and_return(true)
|
|
166
|
+
end
|
|
187
167
|
|
|
188
|
-
|
|
189
|
-
|
|
168
|
+
it "checks scopes" do
|
|
169
|
+
subject = described_class.new(server, client, owner, scope: "public")
|
|
170
|
+
allow(server).to receive(:scopes).and_return(Doorkeeper::OAuth::Scopes.from_string("public"))
|
|
171
|
+
|
|
172
|
+
expect do
|
|
173
|
+
subject.authorize
|
|
174
|
+
end.to change { Doorkeeper::AccessToken.count }.by(1)
|
|
175
|
+
|
|
176
|
+
expect(Doorkeeper::AccessToken.last.expires_in).to eq(222)
|
|
177
|
+
end
|
|
178
|
+
|
|
179
|
+
it "falls back to the default otherwise" do
|
|
180
|
+
subject = described_class.new(server, client, owner, scope: "private")
|
|
181
|
+
allow(server).to receive(:scopes).and_return(Doorkeeper::OAuth::Scopes.from_string("private"))
|
|
182
|
+
|
|
183
|
+
expect do
|
|
184
|
+
subject.authorize
|
|
185
|
+
end.to change { Doorkeeper::AccessToken.count }.by(1)
|
|
186
|
+
|
|
187
|
+
expect(Doorkeeper::AccessToken.last.expires_in).to eq(2.hours)
|
|
190
188
|
end
|
|
191
189
|
end
|
|
192
190
|
end
|