Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions backend/app/routers/keycloak.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import json
import logging
from secrets import token_urlsafe
from typing import Optional

import requests
from app.config import settings
Expand Down Expand Up @@ -123,8 +124,10 @@ async def auth(code: str) -> RedirectResponse:


@router.get("/token")
async def token(code: str):
return await get_token(code)
async def token(code: str, redirect_uri: Optional[str] = None):
return await get_token(
code, redirect_uri=redirect_uri or settings.auth_redirect_uri
)


@router.get("/refresh_token")
Expand Down
4 changes: 2 additions & 2 deletions backend/app/routers/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ async def save_refresh_token(refresh_token: str, email: str):
await token_created.insert()


async def get_token(code: str):
async def get_token(code: str, *, redirect_uri: str = settings.auth_redirect_uri):
# get token from Keycloak
token_body = keycloak_openid.token(
grant_type="authorization_code",
code=code,
redirect_uri=settings.auth_redirect_uri,
redirect_uri=redirect_uri,
)

access_token = token_body["access_token"]
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/openapi/v2/services/AuthService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,17 +91,20 @@ export class AuthService {
/**
* Token
* @param code
* @param redirectUri
* @returns any Successful Response
* @throws ApiError
*/
public static tokenApiV2AuthTokenGet(
code: string,
redirectUri?: string,
): CancelablePromise<any> {
return __request({
method: 'GET',
path: `/api/v2/auth/token`,
query: {
'code': code,
'redirect_uri': redirectUri,
},
errors: {
422: `Validation Error`,
Expand Down
9 changes: 9 additions & 0 deletions openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -12074,6 +12074,15 @@
},
"name": "code",
"in": "query"
},
{
"required": false,
"schema": {
"title": "Redirect Uri",
"type": "string"
},
"name": "redirect_uri",
"in": "query"
}
],
"responses": {
Expand Down
Loading