Skip to content
Snippets Groups Projects
Commit 62e63cc5 authored by Arie Peterson's avatar Arie Peterson
Browse files

Improve ory API variable names for clarity

parent 2babd52c
No related branches found
No related tags found
No related merge requests found
......@@ -19,8 +19,8 @@ class AppsService:
apps = App.query.all()
kratos_admin_api_configuration = ory_kratos_client.Configuration(host=KRATOS_ADMIN_URL, discard_unknown_keys=True)
with ory_kratos_client.ApiClient(kratos_admin_api_configuration) as kratos_client:
kratos_identity_api = identity_api.IdentityApi(kratos_client)
with ory_kratos_client.ApiClient(kratos_admin_api_configuration) as kratos_admin_client:
kratos_identity_api = identity_api.IdentityApi(kratos_admin_client)
user_id = get_jwt()['user_id']
current_app.logger.info(f"user_id: {user_id}")
......
......@@ -15,8 +15,7 @@ from ory_hydra_client.api import admin_api
from ory_hydra_client.models import AcceptConsentRequest, AcceptLoginRequest, ConsentRequestSession
import ory_hydra_client.exceptions as hydra_exceptions
import ory_kratos_client
from ory_kratos_client.api import identity_api
from ory_kratos_client.api import frontend_api
from ory_kratos_client.api import frontend_api, identity_api
from flask import abort, redirect, render_template, request, current_app
from database import db
......@@ -51,7 +50,7 @@ admin_frontend_api = frontend_api.FrontendApi(kratos_admin_client)
kratos_public_api_configuration = \
ory_kratos_client.Configuration(host=KRATOS_PUBLIC_URL, discard_unknown_keys=True)
kratos_public_client = ory_kratos_client.ApiClient(kratos_public_api_configuration)
public_frontend_api = frontend_api.FrontendApi(kratos_public_client)
kratos_public_frontend_api = frontend_api.FrontendApi(kratos_public_client)
ADMIN_ROLE_ID = 1
NO_ACCESS_ROLE_ID = 3
......@@ -134,7 +133,7 @@ def login():
flow = request.args.get("flow")
if flow:
cookies = request.headers['cookie']
flow = public_frontend_api.get_login_flow(flow, cookie=cookies)
flow = kratos_public_frontend_api.get_login_flow(flow, cookie=cookies)
refresh = flow['refresh']
if identity and not refresh:
......@@ -412,7 +411,7 @@ def get_auth():
# Given a cookie, check if it is valid and get the profile
try:
api_response = public_frontend_api.to_session(cookie=cookie)
api_response = kratos_public_frontend_api.to_session(cookie=cookie)
# Get all traits from ID
return api_response.identity
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment