From a2a2b6ef8db9eff10b5b4bb3a5c4fd22d8c08267 Mon Sep 17 00:00:00 2001 From: Sergio Matias Date: Fri, 8 Aug 2025 23:58:42 -0600 Subject: [PATCH] Remove GUID property and add modules in get token adapter service --- Core.Thalos.Domain/Core.Thalos.Domain.csproj | 2 +- .../Core.Thalos.Provider.csproj | 2 +- .../Providers/Onboarding/UserProvider.cs | 103 +++++++++++++++++- 3 files changed, 102 insertions(+), 5 deletions(-) diff --git a/Core.Thalos.Domain/Core.Thalos.Domain.csproj b/Core.Thalos.Domain/Core.Thalos.Domain.csproj index 710df0c..86ba731 100644 --- a/Core.Thalos.Domain/Core.Thalos.Domain.csproj +++ b/Core.Thalos.Domain/Core.Thalos.Domain.csproj @@ -8,7 +8,7 @@ - + diff --git a/Core.Thalos.Provider/Core.Thalos.Provider.csproj b/Core.Thalos.Provider/Core.Thalos.Provider.csproj index b5c0c23..23ec797 100644 --- a/Core.Thalos.Provider/Core.Thalos.Provider.csproj +++ b/Core.Thalos.Provider/Core.Thalos.Provider.csproj @@ -11,7 +11,7 @@ - + diff --git a/Core.Thalos.Provider/Providers/Onboarding/UserProvider.cs b/Core.Thalos.Provider/Providers/Onboarding/UserProvider.cs index 3f28857..8c8bf7f 100644 --- a/Core.Thalos.Provider/Providers/Onboarding/UserProvider.cs +++ b/Core.Thalos.Provider/Providers/Onboarding/UserProvider.cs @@ -241,6 +241,16 @@ namespace Core.Thalos.Provider.Providers.Onboarding new BsonDocument("$unwind", "$role"), new BsonDocument("$match", new BsonDocument("role.status", Core.Blueprint.Mongo.StatusEnum.Active.ToString())), + // Tenant lookup + new BsonDocument("$lookup", new BsonDocument + { + { "from", "Tenants" }, + { "localField", "tenantId" }, + { "foreignField", "_id" }, + { "as", "tenant" } + }), + new BsonDocument("$unwind", "$tenant"), + new BsonDocument("$addFields", new BsonDocument { { "role.permissions", new BsonDocument("$map", new BsonDocument @@ -303,6 +313,25 @@ namespace Core.Thalos.Provider.Providers.Onboarding { "role.updatedAt", 1 }, { "role.createdBy", 1 }, { "role.updatedBy", 1 }, + { "tenant._id", 1 }, + { "tenant.name", 1 }, + { "tenant.taxIdentifier", 1 }, + { "tenant.addressLine1", 1 }, + { "tenant.addressLine2", 1 }, + { "tenant.city", 1 }, + { "tenant.state", 1 }, + { "tenant.country", 1 }, + { "tenant.postalCode", 1 }, + { "tenant.contactEmail", 1 }, + { "tenant.contactPhone", 1 }, + { "tenant.website", 1 }, + { "tenant.connectionString", 1 }, + { "tenant.isolated", 1 }, + { "tenant.status", 1 }, + { "tenant.createdAt", 1 }, + { "tenant.updatedAt", 1 }, + { "tenant.createdBy", 1 }, + { "tenant.updatedBy", 1 }, { "permissions", 1 }, { "modules", 1 } }) @@ -316,8 +345,7 @@ namespace Core.Thalos.Provider.Providers.Onboarding { User = new UserAdapter { - Id = result["_id"]?.ToString() ?? "", - Guid = result.Contains("guid") && !result["guid"].IsBsonNull ? result["guid"].AsString : string.Empty, + _Id = result["_id"]?.ToString() ?? "", Email = result.Contains("email") && !result["email"].IsBsonNull ? result["email"].AsString : string.Empty, Name = result.Contains("name") && !result["name"].IsBsonNull ? result["name"].AsString : string.Empty, MiddleName = result.Contains("middleName") && !result["middleName"].IsBsonNull ? result["middleName"].AsString : string.Empty, @@ -395,13 +423,82 @@ namespace Core.Thalos.Provider.Providers.Onboarding ? result["role"]["updatedBy"].AsString : string.Empty }, + Tenant = result.Contains("tenant") && result["tenant"].IsBsonDocument + ? new TenantAdapter + { + Id = result.Contains("tenant") && result["tenant"].IsBsonDocument && result["tenant"].AsBsonDocument.Contains("_id") + ? result["tenant"]["_id"]?.ToString() ?? "" + : string.Empty, + Name = result["tenant"].AsBsonDocument.Contains("name") && !result["tenant"]["name"].IsBsonNull + ? result["tenant"]["name"].AsString + : string.Empty, + TaxIdentifier = result["tenant"].AsBsonDocument.Contains("taxIdentifier") && !result["tenant"]["taxIdentifier"].IsBsonNull + ? result["tenant"]["taxIdentifier"].AsString + : string.Empty, + AddressLine1 = result["tenant"].AsBsonDocument.Contains("addressLine1") && !result["tenant"]["addressLine1"].IsBsonNull + ? result["tenant"]["addressLine1"].AsString + : string.Empty, + AddressLine2 = result["tenant"].AsBsonDocument.Contains("addressLine2") && !result["tenant"]["addressLine2"].IsBsonNull + ? result["tenant"]["addressLine2"].AsString + : null, + City = result["tenant"].AsBsonDocument.Contains("city") && !result["tenant"]["city"].IsBsonNull + ? result["tenant"]["city"].AsString + : string.Empty, + State = result["tenant"].AsBsonDocument.Contains("state") && !result["tenant"]["state"].IsBsonNull + ? result["tenant"]["state"].AsString + : string.Empty, + Country = result["tenant"].AsBsonDocument.Contains("country") && !result["tenant"]["country"].IsBsonNull + ? result["tenant"]["country"].AsString + : string.Empty, + PostalCode = result["tenant"].AsBsonDocument.Contains("postalCode") && !result["tenant"]["postalCode"].IsBsonNull + ? result["tenant"]["postalCode"].AsString + : string.Empty, + ContactEmail = result["tenant"].AsBsonDocument.Contains("contactEmail") && !result["tenant"]["contactEmail"].IsBsonNull + ? result["tenant"]["contactEmail"].AsString + : string.Empty, + ContactPhone = result["tenant"].AsBsonDocument.Contains("contactPhone") && !result["tenant"]["contactPhone"].IsBsonNull + ? result["tenant"]["contactPhone"].AsString + : string.Empty, + Website = result["tenant"].AsBsonDocument.Contains("website") && !result["tenant"]["website"].IsBsonNull + ? result["tenant"]["website"].AsString + : null, + ConnectionString = result["tenant"].AsBsonDocument.Contains("connectionString") && !result["tenant"]["connectionString"].IsBsonNull + ? result["tenant"]["connectionString"].AsString + : null, + Isolated = result["tenant"].AsBsonDocument.Contains("isolated") && !result["tenant"]["isolated"].IsBsonNull + ? result["tenant"]["isolated"].ToBoolean() + : false, + CreatedAt = result["tenant"].AsBsonDocument.Contains("createdAt") && !result["tenant"]["createdAt"].IsBsonNull + ? result["tenant"]["createdAt"].ToUniversalTime() + : DateTime.MinValue, + UpdatedAt = result["tenant"].AsBsonDocument.Contains("updatedAt") && !result["tenant"]["updatedAt"].IsBsonNull + ? result["tenant"]["updatedAt"].ToUniversalTime() + : DateTime.MinValue, + CreatedBy = result["tenant"].AsBsonDocument.Contains("createdBy") && !result["tenant"]["createdBy"].IsBsonNull + ? result["tenant"]["createdBy"].AsString + : string.Empty, + UpdatedBy = result["tenant"].AsBsonDocument.Contains("updatedBy") && !result["tenant"]["updatedBy"].IsBsonNull + ? result["tenant"]["updatedBy"].AsString + : string.Empty, + Status = result["tenant"].AsBsonDocument.Contains("status") && !result["tenant"]["status"].IsBsonNull + ? (Core.Blueprint.Mongo.StatusEnum)Enum.Parse(typeof(Core.Blueprint.Mongo.StatusEnum), result["tenant"]["status"].AsString) + : Core.Blueprint.Mongo.StatusEnum.Active + } + : null, Permissions = result.Contains("permissions") && result["permissions"].IsBsonArray ? result["permissions"].AsBsonArray .Where(p => p != null && p.IsBsonDocument) .Select(p => BsonSerializer.Deserialize(p.AsBsonDocument)) .Where(p => p.Status == Core.Blueprint.Mongo.StatusEnum.Active) .ToList() - : new List() + : new List(), + Modules = result.Contains("modules") && result["modules"].IsBsonArray + ? result["modules"].AsBsonArray + .Where(p => p != null && p.IsBsonDocument) + .Select(p => BsonSerializer.Deserialize(p.AsBsonDocument)) + .Where(p => p.Status == Core.Blueprint.Mongo.StatusEnum.Active) + .ToList() + : new List() };