diff --git a/controller/user/manager.py b/controller/user/manager.py index dd804947..df1094b8 100644 --- a/controller/user/manager.py +++ b/controller/user/manager.py @@ -128,7 +128,8 @@ def __migrate_kratos_users(): for user_database in users_database: user_id = str(user_database.id) user_identity = users_kratos[user_id]["identity"] - + if users_kratos[user_id] is None: + continue if user_database.email != user_identity["traits"]["email"]: user_database.email = user_identity["traits"]["email"] if ( diff --git a/fast_api/routes/organization.py b/fast_api/routes/organization.py index 3cec77d4..322117cd 100644 --- a/fast_api/routes/organization.py +++ b/fast_api/routes/organization.py @@ -289,7 +289,7 @@ def get_mapped_sorted_paginated_users( "organization": user.organization_name, "email": user.email, "verified": user.verified, - "created_at": user.created_at.isoformat(), + "created_at": user.created_at.isoformat() if user.created_at else None, "metadata_public": user.metadata_public, "sso_provider": user.sso_provider, }