Skip to content
Draft
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
6 changes: 4 additions & 2 deletions backend/app/routers/keycloak.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,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, client_id: str, auth_redirect_uri: str):
return await get_token(
code, client_id=client_id, auth_redirect_uri=auth_redirect_uri
)


@router.get("/refresh_token")
Expand Down
24 changes: 21 additions & 3 deletions backend/app/routers/utils.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import mimetypes
from typing import Optional

from keycloak import KeycloakOpenID

from app.config import settings
from app.keycloak_auth import keycloak_openid
from app.models.files import ContentType
from app.models.tokens import TokenDB
from app.models.users import UserDB
Expand Down Expand Up @@ -40,12 +41,29 @@ 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,
*,
server_url=settings.auth_server_url,
client_id=settings.auth_client_id,
realm_name=settings.auth_realm,
client_secret_key=settings.auth_client_secret,
auth_redirect_uri=settings.auth_redirect_uri,
verify=True,
):
keycloak_openid = KeycloakOpenID(
server_url=server_url,
client_id=client_id,
realm_name=realm_name,
client_secret_key=client_secret_key,
verify=verify,
)

# get token from Keycloak
token_body = keycloak_openid.token(
grant_type="authorization_code",
code=code,
redirect_uri=settings.auth_redirect_uri,
redirect_uri=auth_redirect_uri,
)

access_token = token_body["access_token"]
Expand Down
6 changes: 6 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,23 @@ export class AuthService {
/**
* Token
* @param code
* @param clientId
* @param authRedirectUri
* @returns any Successful Response
* @throws ApiError
*/
public static tokenApiV2AuthTokenGet(
code: string,
clientId: string,
authRedirectUri: string,
): CancelablePromise<any> {
return __request({
method: 'GET',
path: `/api/v2/auth/token`,
query: {
'code': code,
'client_id': clientId,
'auth_redirect_uri': authRedirectUri,
},
errors: {
422: `Validation Error`,
Expand Down
18 changes: 18 additions & 0 deletions openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -12074,6 +12074,24 @@
},
"name": "code",
"in": "query"
},
{
"required": true,
"schema": {
"title": "Client Id",
"type": "string"
},
"name": "client_id",
"in": "query"
},
{
"required": true,
"schema": {
"title": "Auth Redirect Uri",
"type": "string"
},
"name": "auth_redirect_uri",
"in": "query"
}
],
"responses": {
Expand Down