Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Memoize nil doorkeeper_token #1465

Merged
merged 2 commits into from
Jan 6, 2021
Merged

Memoize nil doorkeeper_token #1465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28d093a
Memoize nil doorkeeper_token
kitop Dec 29, 2020
675966b
Add changelog entry
kitop Dec 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ User-visible changes worth mentioning.
## master

- [#PR ID] Add your PR description here.
- [#1465] Memoize nil doorkeeper_token
- [#1457] Make owner_id a bigint for newly-generated owner migrations
- [#1452] Empty previous_refresh_token only if present
- [#1440] Validate empty host in redirect_uri
Expand Down
2 changes: 2 additions & 0 deletions lib/doorkeeper/helpers/controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ def server

# :doc:
def doorkeeper_token
return @doorkeeper_token if defined?(@doorkeeper_token)

@doorkeeper_token ||= OAuth::Token.authenticate(request, *config_methods)
end

Expand Down