Compare commits
	
		
			4 Commits
		
	
	
		
			feature/ad
			...
			feature/fi
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 33c0cd2642 | ||
| 8ac0eb0bf0 | |||
| 8d954c9a09 | |||
| f82ebb5e69 | 
| @@ -18,15 +18,6 @@ namespace Core.Thalos.Adapters | ||||
|     [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> | ||||
|   | ||||
| @@ -18,15 +18,6 @@ namespace Core.Thalos.Adapters | ||||
|     [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> | ||||
|   | ||||
| @@ -18,15 +18,6 @@ namespace Core.Thalos.Adapters | ||||
|     [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> | ||||
|   | ||||
| @@ -16,15 +16,6 @@ namespace Core.Thalos.Adapters | ||||
|     [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> | ||||
|   | ||||
| @@ -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 PublicKey = "B2C:JwtIssuerOptions:TokenPublicKey"; | ||||
|         public const string PrivateKey = "JwtTokenPrivateKey"; | ||||
|         public const string PublicKey = "JwtTokenPublicKey"; | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -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" /> | ||||
|   | ||||
| @@ -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; | ||||
|  | ||||
|                 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 => | ||||
|                 builder.Configuration.AddAzureAppConfiguration(options => | ||||
|                 { | ||||
|                     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 | ||||
|             { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user