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))