Remove _id from adapters

Add CollectionAttributeName and use ApplicationEnum for Agile

Core.Thalos.BuildingBlocks/Adapters/ModuleAdapter.cs

@@ -4,6 +4,7 @@
 // </copyright>
 // ***********************************************************************
 
+using Core.Blueprint.Mongo;
 using Core.Thalos.Adapters.Common.Enums;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
@@ -14,17 +15,9 @@ namespace Core.Thalos.Adapters
     /// <summary>
     /// Adapter for representing a module.
     /// </summary>
+    [CollectionAttributeName("Modules")]
     public class ModuleAdapter : Document
     {
-        /// <summary>
-        /// Gets or sets the ID of the module.
-        /// </summary>
-        [BsonId]
-        [BsonElement("_id")]
-        [BsonRepresentation(BsonType.ObjectId)]
-        [JsonPropertyName("id")]
-        public string Id { get; set; } = null!;
-
         /// <summary>
         /// Gets or sets the name of the module.
         /// </summary>

Core.Thalos.BuildingBlocks/Adapters/PermissionAdapter.cs

@@ -4,8 +4,8 @@
 // </copyright>
 // ***********************************************************************
 
+using Core.Blueprint.Mongo;
 using Core.Thalos.Adapters.Common.Constants;
-using Core.Thalos.Adapters.Common.Enums;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
 using System.Text.Json.Serialization;
@@ -15,17 +15,9 @@ namespace Core.Thalos.Adapters
     /// <summary>
     /// Adapter for representing a permission.
     /// </summary>
+    [CollectionAttributeName("Permissions")]
     public class PermissionAdapter : Document
     {
-        /// <summary>
-        /// Gets or sets the ID of the entity.
-        /// </summary>
-        [BsonId]
-        [BsonElement("_id")]
-        [BsonRepresentation(BsonType.ObjectId)]
-        [JsonPropertyName("id")]
-        public string Id { get; set; } = null!;
-
         /// <summary>
         /// Gets or sets the name of the entity.
         /// </summary>

Core.Thalos.BuildingBlocks/Adapters/RoleAdapter.cs

@@ -4,6 +4,7 @@
 // </copyright>
 // ***********************************************************************
 
+using Core.Blueprint.Mongo;
 using Core.Thalos.Adapters.Common.Enums;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
@@ -14,17 +15,9 @@ namespace Core.Thalos.Adapters
     /// <summary>
     /// Adapter representing a role.
     /// </summary>
+    [CollectionAttributeName("Roles")]
     public class RoleAdapter : Document
     {
-        /// <summary>
-        /// Gets or sets the unique identifier of the role.
-        /// </summary>
-        [BsonId]
-        [BsonElement("_id")]
-        [BsonRepresentation(BsonType.ObjectId)]
-        [JsonPropertyName("id")]
-        public string Id { get; set; } = null!;
-
         /// <summary>
         /// Gets or sets the name of the role.
         /// </summary>

Core.Thalos.BuildingBlocks/Adapters/UserAdapter.cs

@@ -3,7 +3,7 @@
 //     AgileWebs
 // </copyright>
 // ***********************************************************************
-using Core.Thalos.Adapters.Common.Enums;
+using Core.Blueprint.Mongo;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
 using System.Text.Json.Serialization;
@@ -13,17 +13,9 @@ namespace Core.Thalos.Adapters
     /// <summary>
     /// Adapter representing a user.
     /// </summary>
+    [CollectionAttributeName("Users")]
     public class UserAdapter : Document
     {
-        /// <summary>
-        /// Gets or sets the unique identifier of the user.
-        /// </summary>
-        [BsonId]
-        [BsonElement("_id")]
-        [BsonRepresentation(BsonType.ObjectId)]
-        [JsonPropertyName("id")]
-        public string Id { get; set; } = null!;
-
         /// <summary>
         /// Gets or sets the guid of the user.
         /// </summary>

Core.Thalos.BuildingBlocks/Common/Constants/Secrets.cs

@@ -53,7 +53,7 @@ namespace Core.Thalos.Adapters.Common.Constants
         public const string ThalosAppTokenUrl = "Swagger:TokenUri";
         public const string ThalosAppClientId = "Swagger:ClientId";
         public const string ThalosAppScope = "Swagger:Scope";
-        public const string PrivateKey = "B2C:JwtIssuerOptions:TokenPrivateKey";
+        public const string PrivateKey = "JwtTokenPrivateKey";
-        public const string PublicKey = "B2C:JwtIssuerOptions:TokenPublicKey";
+        public const string PublicKey = "JwtTokenPublicKey";
     }
 }

Core.Thalos.BuildingBlocks/Common/Enums/ApplicationsEnum.cs

@@ -15,28 +15,13 @@ namespace Core.Thalos.Adapters.Common.Enums
     public enum ApplicationsEnum
     {
         /// <summary>
-        /// LSA Web Portal application.
+        /// Thalos application.
         /// </summary>
-        LSAWebPortal = 0,
+        Thalos = 0,
 
         /// <summary>
-        /// Customer DashBoard application.
+        /// DreamViewer application.
         /// </summary>
-        CustomerDashboard = 1,
+        DreamViewer = 1,
-
-        /// <summary>
-        /// Discover application.
-        /// </summary>
-        Discover = 2,
-
-        /// <summary>
-        /// LSA Mobile application.
-        /// </summary>
-        LSAMobile = 3,
-
-        /// <summary>
-        /// BluePrint application.
-        /// </summary>
-        BluePrint = 4,
     }
 }

Core.Thalos.BuildingBlocks/Core.Thalos.BuildingBlocks.csproj

@@ -8,11 +8,13 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+	<VersionPrefix>1.0.2</VersionPrefix>
+	<VersionSuffix>$(Date:yyyyMMddHHmm)</VersionSuffix>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
-    <PackageReference Include="Blueprint.Mongo" Version="0.0.3" />
+    <PackageReference Include="Core.Blueprint.Mongo" Version="1.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
     <PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="8.2.0" />
     <PackageReference Include="Microsoft.Identity.Web" Version="3.9.1" />

Core.Thalos.BuildingBlocks/Helpers/AuthHelper.cs

@@ -17,22 +17,27 @@ namespace Core.Thalos.Adapters.Helpers
 
         public static AuthSettings GetAuthSettings(WebApplicationBuilder builder, string appConfigLabel)
         {
-            builder.Configuration.AddAzureAppConfiguration(options =>
+            var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? string.Empty;
+
+            if (environment != "Local")
             {
-                var endpoint = builder.Configuration.GetSection("Endpoints:AppConfigurationURI").Value;
+                builder.Configuration.AddAzureAppConfiguration(options =>
-
-                if (string.IsNullOrEmpty(endpoint))
-                    throw new ArgumentException("The app configuration is missing");
-
-                options.Connect(new Uri(endpoint), new DefaultAzureCredential())
-                       .Select(KeyFilter.Any, "thalos_common")
-                       .Select(KeyFilter.Any, appConfigLabel);
-
-                options.ConfigureKeyVault(keyVaultOptions =>
                 {
-                    keyVaultOptions.SetCredential(new DefaultAzureCredential());
+                    var endpoint = builder.Configuration.GetSection("Endpoints:AppConfigurationURI").Value;
+
+                    if (string.IsNullOrEmpty(endpoint))
+                        throw new ArgumentException("The app configuration is missing");
+
+                    options.Connect(new Uri(endpoint), new DefaultAzureCredential())
+                           .Select(KeyFilter.Any, "thalos_common")
+                           .Select(KeyFilter.Any, appConfigLabel);
+
+                    options.ConfigureKeyVault(keyVaultOptions =>
+                    {
+                        keyVaultOptions.SetCredential(new DefaultAzureCredential());
+                    });
                 });
-            });
+            }
 
             return new AuthSettings
             {