Skip to content

[IMP] oauth_provider: get access_token from headers, remove werkzeug.wrappers.BaseResponse #1

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

Merged
merged 1 commit into from
Sep 24, 2025
Merged

[IMP] oauth_provider: get access_token from headers, remove werkzeug.wrappers.BaseResponse #1

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
14 changes: 11 additions & 3 deletions oauth_provider/controllers/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ def token(

# Retrieve needed arguments for oauthlib methods
uri, http_method, body, headers = self._get_request_information()
credentials = {"scope": scope}
credentials = {"scope": " ".join(client.scope_ids.mapped("code"))}

# Retrieve the authorization code, if any, to get Odoo's user id
existing_code = (
Expand Down Expand Up @@ -260,7 +260,7 @@ def token(
credentials=credentials,
)

return werkzeug.wrappers.BaseResponse(body, status=status, headers=headers)
return werkzeug.Response(body, status=status, headers=headers)

@http.route(
"/oauth2/tokeninfo", type="http", auth="none", methods=["GET"], website=True
Expand All @@ -271,6 +271,10 @@ def tokeninfo(self, access_token=None, *args, **kwargs):
Similar to Google's "tokeninfo" request
"""
ensure_db()
if not access_token:
auth_header = http.request.httprequest.headers.get("Authorization", "")
if auth_header.startswith("Bearer "):
access_token = auth_header[7:]
token = self._check_access_token(access_token)
if not token:
return self._json_response(
Expand Down Expand Up @@ -302,6 +306,10 @@ def userinfo(self, access_token=None, *args, **kwargs):
Similar to Google's "userinfo" request
"""
ensure_db()
if not access_token:
auth_header = http.request.httprequest.headers.get("Authorization", "")
if auth_header.startswith("Bearer "):
access_token = auth_header[7:]
token = self._check_access_token(access_token)
if not token:
return self._json_response(
Expand Down Expand Up @@ -504,4 +512,4 @@ def revoke_token(self, token=None, *args, **kwargs):
headers, body, status = oauth2_server.create_revocation_response(
uri, http_method=http_method, body=body, headers=headers
)
return werkzeug.wrappers.BaseResponse(body, status=status, headers=headers)
return werkzeug.Response(body, status=status, headers=headers)