Skip to content

Fixes issue with API token auth #3606

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

Open
briri wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −2
Open

Fixes issue with API token auth #3606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## v5.0.3
- Patch API token auth to check user's status

## v5.0.2
- Bump Ruby to v3.1.4 and use `.ruby-version` in CI
- [#3566](https://github.com/DMPRoadmap/roadmap/pull/3566)
Expand Down
7 changes: 5 additions & 2 deletions app/services/api/v1/auth/jwt/authorization_service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def call

private

# Lookup the Client bassed on the client_id embedded in the JWT
# Lookup the Client based on the client_id embedded in the JWT
# rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
def client
return @api_client if @api_client.present?
Expand All @@ -33,7 +33,10 @@ def client
@api_client = ApiClient.where(client_id: token[:client_id]).first
return @api_client if @api_client.present?

@api_client = User.where(email: token[:client_id]).first
# Valid if User is active, has permission to use the API and
# the :client_secret matches the token
usr = User.where(email: token[:client_id], active: true, api_token: @client_secret).first
@api_client = usr.present? && usr.can_use_api? ? usr : nil
end
# rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity

Expand Down
Loading