Merge pull request #103 from Virtual-Finland-Development/fix/todos-cleanup

Cleanups and adjustments

Author: lsipii

VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Activities/Productizer/Operations/User/GetUserProfile.cs

@@ -49,7 +49,6 @@ public async Task<User> Handle(Query request, CancellationToken cancellationToke
                 .Include(p => p.AdditionalInformation).ThenInclude(ai => ai!.Address)
                 .SingleAsync(p => p.Id == request.User.PersonId, cancellationToken);
 
-            // TODO - To be decided: This default search profile in the user API call can be possibly removed when requirement are more clear
             var dbUserDefaultSearchProfile = await _usersDbContext.SearchProfiles.FirstOrDefaultAsync(o => o.IsDefault && o.PersonId == dbUser.Id, cancellationToken);
 
             List<UserResponseOccupation>? occupations = null;

VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Activities/Productizer/Operations/User/UpdateUserProfile.cs

@@ -232,9 +232,6 @@ private async Task<List<ValidationErrorDetail>> ValidateCountryCodesLogic(Comman
             return validationErrors;
         }
 
-        /// <summary>
-        /// TODO - To be decided: This default search profile in the user API call can be possibly removed when requirement are more clear
-        /// </summary>
         /// <param name="dbUserDefaultSearchProfile"></param>
         /// <param name="dbUser"></param>
         /// <param name="request"></param>

VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Activities/User/Operations/GetUser.cs

@@ -47,7 +47,6 @@ public async Task<User> Handle(Query request, CancellationToken cancellationToke
                 .Include(u => u.AdditionalInformation).ThenInclude(ai => ai!.Address)
                 .SingleAsync(o => o.Id == request.User.PersonId, cancellationToken);
 
-            // TODO - To be decided: This default search profile in the user API call can be possibly removed when requirement are more clear
             var dbUserDefaultSearchProfile = await _usersDbContext.SearchProfiles.FirstOrDefaultAsync(o => o.IsDefault && o.PersonId == dbUser.Id, cancellationToken);
 
             List<UserResponseOccupation>? occupations = null;

VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Activities/User/Operations/UpdateUser.cs

@@ -294,11 +294,7 @@ private static ICollection<Occupation> GetUpdatedOccupations(
                         continue;
                     }
 
-                    var existingOccupation = dbUserOccupations.FirstOrDefault(o => o.Id == occupation.Id);
-
-                    // TODO: Return some error about invalid guid ?
-                    if (existingOccupation is null) continue;
-
+                    var existingOccupation = dbUserOccupations.FirstOrDefault(o => o.Id == occupation.Id) ?? throw new BadRequestException("Invalid occupation ID");
                     if (occupation.Delete is true)
                     {
                         dbUserOccupations.Remove(existingOccupation);
@@ -370,9 +366,6 @@ private async Task<List<ValidationErrorDetail>> ValidateCountryCodesLogic(Comman
             return validationErrors;
         }
 
-        /// <summary>
-        /// TODO - To be decided: This default search profile in the user API call can be possibly removed when requirement are more clear
-        /// </summary>
         /// <param name="dbUserDefaultSearchProfile"></param>
         /// <param name="dbUser"></param>
         /// <param name="request"></param>

VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Helpers/Extensions/EnvironmentExtensions.cs

@@ -5,7 +5,9 @@ public static class Environments
     public static readonly string Local = "local";
     public static readonly string Development = "dev";
     public static readonly string Staging = "staging";
-    public static readonly string Production = "prod";
+    public static readonly string Production = "production";
+    public static readonly string MvpStaging = "mvp-staging";
+    public static readonly string MvpProduction = "mvp-production";
 }
 
 public static class EnvironmentExtensions
@@ -34,19 +36,19 @@ public static bool IsStaging(this IHostEnvironment hostEnvironment)
     {
         if (hostEnvironment == null)
         {
-            throw new ArgumentException(nameof(hostEnvironment));
+            throw new ArgumentException(null, nameof(hostEnvironment));
         }
 
-        return hostEnvironment.IsEnvironment(Environments.Staging);
+        return hostEnvironment.IsEnvironment(Environments.MvpStaging) || hostEnvironment.IsEnvironment(Environments.Staging);
     }
 
     public static bool IsProduction(this IHostEnvironment hostEnvironment)
     {
         if (hostEnvironment == null)
         {
-            throw new ArgumentException(nameof(hostEnvironment));
+            throw new ArgumentException(null, nameof(hostEnvironment));
         }
 
-        return hostEnvironment.IsEnvironment(Environments.Production);
+        return hostEnvironment.IsEnvironment(Environments.MvpProduction) || hostEnvironment.IsEnvironment(Environments.Production);
     }
 }

VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Migrations/20230906150120_TermsOfService.cs

@@ -68,7 +68,6 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 column: "Version",
                 unique: true);
 
-            // @TODO Manage terms of service by some control mechanism and not by migrations
             migrationBuilder.InsertData(
                 table: "TermsOfServices",
                 columns: new[] { "Id", "Url", "Description", "Version", "Created", "Modified" },

VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Models/UsersDatabase/Auditable.cs

@@ -30,13 +30,13 @@ public void SetupAuditEvent(UsersDbContext dbContext, IRequestAuthenticationCand
 
     protected void SetupAuditAddition(IRequestAuthenticationCandinate user)
     {
-        Created = DateTime.Now;
+        Created = DateTime.UtcNow;
         SetupAuditUpdate(user);
     }
 
     protected void SetupAuditUpdate(IRequestAuthenticationCandinate user)
     {
-        Modified = DateTime.Now;
+        Modified = DateTime.UtcNow;
         Metadata = new AuditableMetadata(user);
     }
 }

VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Program.cs

@@ -118,7 +118,6 @@
             .UseQuerySplittingBehavior(QuerySplittingBehavior.SingleQuery)
         );
 });
-AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true); // @TODO: Resolve what changed in datetime inserting that causes this to be needed
 
 //
 // Redis connection
@@ -168,20 +167,19 @@
 //
 var app = builder.Build();
 
-// Use swagger only in non-production environments
-if (!EnvironmentExtensions.IsProduction(app.Environment))
+// Use swagger only in development
+if (EnvironmentExtensions.IsLocal(app.Environment) || EnvironmentExtensions.IsDevelopment(app.Environment))
 {
     app.UseSwagger();
     app.UseSwaggerUI();
 
-    // global cors policy
-    app.UseCors(x => x
+    // Direct cors requests used in dev-stages
+    app.UseCors(builder => builder
         .AllowAnyOrigin()
         .AllowAnyMethod()
         .AllowAnyHeader());
 }
 
-
 app.UseSerilogRequestLogging(options =>
 {
     options.EnrichDiagnosticContext = (diagnosticContext, httpContext) =>

VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Security/ApplicationSecurity.cs

@@ -9,6 +9,8 @@ public class ApplicationSecurity : IApplicationSecurity
 {
     private readonly ITermsOfServiceRepository _termsOfServiceRepository;
     private readonly SecuritySetup _setup;
+    private readonly int _initializationTimeoutInMilliseconds = 10000;
+
     public ApplicationSecurity(ITermsOfServiceRepository termsOfServiceRepository, SecuritySetup securitySetup)
     {
         _termsOfServiceRepository = termsOfServiceRepository;
@@ -27,7 +29,8 @@ public async Task<RequestAuthenticationCandinate> ParseJwtToken(string token)
         if (!tokenHandler.CanReadToken(token)) throw new NotAuthorizedException("The given token is not valid");
         var parsedToken = tokenHandler.ReadJwtToken(token);
 
-        // Resolve the security feature by token issuer (must be enabled) // @TODO: ensure the security feature is loaded before this
+        // Resolve the security feature by token issuer (must be enabled)
+        await EnsureSecurityInitializationCompleted();
         var tokenIssuer = parsedToken.Issuer;
         var securityFeature = _setup.Features.Find(o => o.Issuer == tokenIssuer) ?? throw new NotAuthorizedException("The given token issuer is not valid");
 
@@ -49,4 +52,17 @@ public async Task VerifyPersonTermsOfServiceAgreement(Guid personId)
         // Fetch person terms of service agreement
         _ = await _termsOfServiceRepository.GetTermsOfServiceAgreementOfTheLatestTermsByPersonId(personId) ?? throw new NotAuthorizedException("User has not accepted the latest terms of service.");
     }
+
+    /// <summary>
+    /// All the enabled security features must be initialized before the application can be used, verify that the initializations are completed
+    /// </summary>
+    private async Task EnsureSecurityInitializationCompleted()
+    {
+        var initializationTimeout = DateTime.Now.AddMilliseconds(_initializationTimeoutInMilliseconds);
+        while (_setup.Features.Any(o => !o.IsInitialized))
+        {
+            if (DateTime.Now > initializationTimeout) throw new NotAuthorizedException("Security initialization timeout");
+            await Task.Delay(100);
+        }
+    }
 }

VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Security/Features/ISecurityFeature.cs

@@ -13,4 +13,5 @@ public interface ISecurityFeature
     Task ValidateSecurityTokenAudience(string audience);
 
     public string Issuer { get; }
+    public bool IsInitialized { get; set; }
 }