diff --git a/backend/areas/users/user_service.py b/backend/areas/users/user_service.py index d899e3ea5de3150f79e6387106340160462aa790..b5e7681e86340108734bb43c3f0a08b1568ba109 100644 --- a/backend/areas/users/user_service.py +++ b/backend/areas/users/user_service.py @@ -22,10 +22,13 @@ kratos_identity_api = identity_api.IdentityApi(kratos_client) class UserService: @staticmethod def get_users(): - page = 1 + page = 0 userList = [] - while page > 0: - res = KratosApi.get("/admin/identities?per_page=1000&page={}".format(page)).json() + while page >= 0: + if page == 0: + res = KratosApi.get("/admin/identities?per_page=1000").json() + else: + res = KratosApi.get("/admin/identities?per_page=1000&page={}".format(page)).json() for r in res: # removed the app role assignment function, passing simple user data # userList.append(UserService.__insertAppRoleToUser(r["id"], r)) diff --git a/backend/helpers/kratos_user.py b/backend/helpers/kratos_user.py index d5f50d1120713a85c2444cb4892c7c4e8fc8398b..13a10e3a2f703cf86ac21c156154c98709236c47 100644 --- a/backend/helpers/kratos_user.py +++ b/backend/helpers/kratos_user.py @@ -133,9 +133,12 @@ class KratosUser(): kratos_id = None # Get out user ID by iterating over all available IDs - page = 1 - while page > 0: - data = api.list_identities(per_page=1000, page=page) + page = 0 + while page >= 0: + if page == 0: + data = api.list_identities(per_page=1000) + else: + data = api.list_identities(per_page=1000, page=page) for kratos_obj in data: # Unique identifier we use if kratos_obj.traits['email'] == email: @@ -158,9 +161,12 @@ class KratosUser(): kratos_id = None return_list = [] # Get out user ID by iterating over all available ID - page = 1 - while page > 0: - data = api.list_identities(per_page=1000, page=page) + page = 0 + while page >= 0: + if page == 0: + data = api.list_identities(per_page=1000) + else: + data = api.list_identities(per_page=1000, page=page) for kratos_obj in data: kratos_id = str(kratos_obj.id) return_list.append(KratosUser(api, kratos_id)) diff --git a/backend/requirements.txt b/backend/requirements.txt index fc2836ad096a8f50d217569cc0a9b8eccdc5db34..246dcc78d94c34198ec9ed1448b638a08be62280 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -23,7 +23,7 @@ MarkupSafe==2.1.1 mypy-extensions==0.4.3 NamedAtomicLock==1.1.3 oauthlib==3.2.0 -ory-kratos-client==0.11.0 +ory-kratos-client==1.0.0 ory-hydra-client==1.11.8 pathspec==0.9.0 platformdirs==2.5.1 diff --git a/deployment/helmchart/Chart.yaml b/deployment/helmchart/Chart.yaml index 3e603f9912eedf2569267bb57af9061f0f1e82f3..2a2110f17f9379de596057352be954b092192459 100644 --- a/deployment/helmchart/Chart.yaml +++ b/deployment/helmchart/Chart.yaml @@ -23,4 +23,4 @@ name: stackspin-dashboard sources: - https://open.greenhost.net/stackspin/dashboard/ - https://open.greenhost.net/stackspin/dashboard-backend/ -version: 1.8.2 +version: 1.8.3-kratos1 diff --git a/deployment/helmchart/values.yaml b/deployment/helmchart/values.yaml index 324e62aa794d2c1036ff2b595d7b979b5cc59de3..a4a3af32cd5558cd922bd8b8b8758dbfbee92c25 100644 --- a/deployment/helmchart/values.yaml +++ b/deployment/helmchart/values.yaml @@ -68,7 +68,7 @@ dashboard: image: registry: open.greenhost.net:4567 repository: stackspin/dashboard/dashboard - tag: 0.8.2 + tag: 178-upgrade-kratos-api-client-library digest: "" ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -236,7 +236,7 @@ backend: image: registry: open.greenhost.net:4567 repository: stackspin/dashboard/dashboard-backend - tag: 0.8.2 + tag: 178-upgrade-kratos-api-client-library digest: "" ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -723,7 +723,7 @@ tests: image: registry: open.greenhost.net:4567 repository: stackspin/dashboard/cypress-test - tag: 0.8.2 + tag: 178-upgrade-kratos-api-client-library pullPolicy: IfNotPresent credentials: user: ""