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
data/CONTRIBUTING.md
CHANGED
|
@@ -1,14 +1,19 @@
|
|
|
1
1
|
# Contributing
|
|
2
2
|
|
|
3
3
|
We love pull requests from everyone. By participating in this project, you agree
|
|
4
|
-
to abide by the
|
|
5
|
-
|
|
6
|
-
[code of conduct]: https://thoughtbot.com/open-source-code-of-conduct
|
|
4
|
+
to abide by the [code of conduct](CODE_OF_CONDUCT.md).
|
|
7
5
|
|
|
8
6
|
Fork, then clone the repo:
|
|
9
7
|
|
|
10
8
|
git clone git@github.com:your-username/doorkeeper.git
|
|
11
9
|
|
|
10
|
+
### Docker Setup
|
|
11
|
+
|
|
12
|
+
Build the container image with: `docker build --pull -t doorkeeper:test .`
|
|
13
|
+
Run the tests with: `docker run -it --rm doorkeeper:test`
|
|
14
|
+
|
|
15
|
+
### Local Setup
|
|
16
|
+
|
|
12
17
|
Set up Ruby dependencies via Bundler
|
|
13
18
|
|
|
14
19
|
bundle install
|
|
@@ -19,14 +24,12 @@ Make sure the tests pass:
|
|
|
19
24
|
|
|
20
25
|
Make your change.
|
|
21
26
|
Write tests.
|
|
22
|
-
Follow our [style guide]
|
|
27
|
+
Follow our [style guide](.rubocop.yml).
|
|
23
28
|
Make the tests pass:
|
|
24
29
|
|
|
25
|
-
[style]: https://github.com/thoughtbot/guides/tree/master/style
|
|
26
|
-
|
|
27
30
|
rake
|
|
28
31
|
|
|
29
|
-
Add notes on your change to the `
|
|
32
|
+
Add notes on your change to the `CHANGELOG.md` file.
|
|
30
33
|
|
|
31
34
|
Write a [good commit message][commit].
|
|
32
35
|
Push to your fork.
|
|
@@ -35,8 +38,7 @@ Push to your fork.
|
|
|
35
38
|
[commit]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
|
|
36
39
|
[pr]: https://github.com/doorkeeper-gem/doorkeeper/compare/
|
|
37
40
|
|
|
38
|
-
If [Hound] catches style violations,
|
|
39
|
-
fix them.
|
|
41
|
+
If [Hound] catches style violations, fix them.
|
|
40
42
|
|
|
41
43
|
[hound]: https://houndci.com
|
|
42
44
|
|
data/Dangerfile
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
CHANGELOG_FILE = '
|
|
1
|
+
CHANGELOG_FILE = 'CHANGELOG.md'
|
|
2
2
|
GITHUB_REPO = 'https://github.com/doorkeeper-gem/doorkeeper'
|
|
3
3
|
|
|
4
4
|
def changelog_changed?
|
|
@@ -11,7 +11,7 @@ def changelog_entry_example
|
|
|
11
11
|
.sub(/[?.!,;]?$/, '')
|
|
12
12
|
.capitalize
|
|
13
13
|
|
|
14
|
-
"- [##{pr_number}]
|
|
14
|
+
"- [##{pr_number}] #{pr_title}."
|
|
15
15
|
end
|
|
16
16
|
|
|
17
17
|
# --------------------------------------------------------------------------------------------------------------------
|
data/Dockerfile
ADDED
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
FROM ruby:2.6.3-alpine3.9
|
|
2
|
+
|
|
3
|
+
RUN apk add --no-cache \
|
|
4
|
+
ca-certificates \
|
|
5
|
+
wget \
|
|
6
|
+
openssl \
|
|
7
|
+
bash \
|
|
8
|
+
build-base \
|
|
9
|
+
git \
|
|
10
|
+
sqlite-dev \
|
|
11
|
+
tzdata
|
|
12
|
+
|
|
13
|
+
ENV LANG en_US.UTF-8
|
|
14
|
+
ENV LANGUAGE en_US:en
|
|
15
|
+
ENV LC_ALL en_US.UTF-8
|
|
16
|
+
|
|
17
|
+
ENV BUNDLER_VERSION 2.0.1
|
|
18
|
+
RUN gem install bundler -v ${BUNDLER_VERSION} -i /usr/local/lib/ruby/gems/$(ls /usr/local/lib/ruby/gems) --force
|
|
19
|
+
|
|
20
|
+
WORKDIR /srv
|
|
21
|
+
|
|
22
|
+
COPY Gemfile doorkeeper.gemspec /srv/
|
|
23
|
+
COPY lib/doorkeeper/version.rb /srv/lib/doorkeeper/version.rb
|
|
24
|
+
|
|
25
|
+
RUN bundle install
|
|
26
|
+
|
|
27
|
+
COPY . /srv/
|
|
28
|
+
|
|
29
|
+
CMD ["rake"]
|
data/Gemfile
CHANGED
|
@@ -5,16 +5,17 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
|
|
|
5
5
|
|
|
6
6
|
gemspec
|
|
7
7
|
|
|
8
|
-
gem "rails", "~> 6.0.0
|
|
8
|
+
gem "rails", "~> 6.0.0"
|
|
9
9
|
|
|
10
10
|
# TODO: Remove when rspec-rails 4.0 released
|
|
11
11
|
gem "rspec-core", github: "rspec/rspec-core"
|
|
12
12
|
gem "rspec-expectations", github: "rspec/rspec-expectations"
|
|
13
13
|
gem "rspec-mocks", github: "rspec/rspec-mocks"
|
|
14
|
-
gem "rspec-rails",
|
|
14
|
+
gem "rspec-rails", "4.0.0.beta3"
|
|
15
15
|
gem "rspec-support", github: "rspec/rspec-support"
|
|
16
16
|
|
|
17
|
-
gem "rubocop", "~> 0.
|
|
17
|
+
gem "rubocop", "~> 0.75"
|
|
18
|
+
gem "rubocop-performance"
|
|
18
19
|
|
|
19
20
|
gem "bcrypt", "~> 3.1", require: false
|
|
20
21
|
|