Merge branch 'main' into revert-63-revert-56-update-expo-packages

QuantozTechnology · Jun 25, 2024 · a558858 · a558858
2 parents 022153e + 5df70eb
commit a558858
Show file tree

Hide file tree

Showing 93 changed files with 5,246 additions and 3,184 deletions.
diff --git a/backend/core/src/Core.API/Core.API.csproj b/backend/core/src/Core.API/Core.API.csproj
@@ -11,19 +11,19 @@
 
   <ItemGroup>
     <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.9.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.2">
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.2">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
-    <PackageReference Include="Quantoz.Nexus.Sdk.Shared" Version="1.4.0" />
-    <PackageReference Include="Quantoz.Nexus.Sdk.Token" Version="1.4.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
+    <PackageReference Include="Quantoz.Nexus.Sdk.Shared" Version="1.10.0" />
+    <PackageReference Include="Quantoz.Nexus.Sdk.Token" Version="1.10.0" />
     <PackageReference Include="Quartz.Extensions.DependencyInjection" Version="3.8.1" />
     <PackageReference Include="Quartz.Extensions.Hosting" Version="3.8.1" />
     <PackageReference Include="ReHackt.Extensions.Options.Validation" Version="8.0.2" />

diff --git a/backend/core/src/Core.API/DependencyInjection/InfrastructureInjection.cs b/backend/core/src/Core.API/DependencyInjection/InfrastructureInjection.cs
@@ -4,6 +4,7 @@
 
 using Core.Domain.Abstractions;
 using Core.Domain.Repositories;
+using Core.Infrastructure.AzureB2CGraphService;
 using Core.Infrastructure.Compliance;
 using Core.Infrastructure.Compliance.IPLocator;
 using Core.Infrastructure.Compliance.Sanctionlist;
@@ -14,6 +15,7 @@
 using Core.Infrastructure.Nexus.Repositories;
 using Core.Infrastructure.Nexus.SigningService;
 using Microsoft.Extensions.Options;
+using Microsoft.Graph;
 using Nexus.Sdk.Shared.Http;
 using Nexus.Sdk.Token.Extensions;
 using Quartz;
@@ -25,6 +27,7 @@ public static class InfrastructureInjection
         public static IServiceCollection AddInfrastructure(this IServiceCollection services, IConfiguration configuration)
         {
             services
+                .AddB2CGraphService(configuration)
                 .AddNexus(configuration)
                 .AddIPLocator(configuration)
                 .AddSanctionlist(configuration)
@@ -83,6 +86,23 @@ private static IServiceCollection AddIPLocator(this IServiceCollection services,
             return services;
         }
 
+        public static IServiceCollection AddB2CGraphService(this IServiceCollection services, IConfiguration configuration)
+        {
+            services.AddOptions<B2CServiceOptions>()
+                .Bind(configuration.GetSection("B2CServiceOptions"))
+                .ValidateDataAnnotationsRecursively()
+                .ValidateOnStart();
+
+            services.AddSingleton(sp => sp.GetRequiredService<IOptions<B2CServiceOptions>>().Value);
+
+            services.AddHttpClient<IB2CGraphService, B2CGraphService>();
+
+            services.AddScoped<IB2CGraphService, B2CGraphService>();
+            services.AddScoped<GraphServiceClient>();
+
+            return services;
+        }
+
         private static IServiceCollection AddSanctionlist(this IServiceCollection services, IConfiguration configuration)
         {
             services.AddOptions<SanctionlistOptions>()

diff --git a/backend/core/src/Core.API/Program.cs b/backend/core/src/Core.API/Program.cs
@@ -41,12 +41,12 @@
 
 app.ConfigureCustomAuthenticationMiddleware();
 app.ConfigureCustomExceptionMiddleware();
-app.ConfigureSignatureVerificationMiddleware();
 
 app.UseAuthentication();
 app.UseRouting();
 app.UseAuthorization();
 
+app.ConfigureSignatureVerificationMiddleware();
 app.UseMiddleware<PublicKeyLinkedMiddleware>();
 
 app.MapControllers();

diff --git a/backend/core/src/Core.API/ResponseHandling/PublicKeyLinkedMiddleware.cs b/backend/core/src/Core.API/ResponseHandling/PublicKeyLinkedMiddleware.cs
@@ -17,21 +17,18 @@ namespace Core.API.ResponseHandling;
 /// </summary>
 public class PublicKeyLinkedMiddleware
 {
-    private readonly ICustomerDeviceRepository _customerDeviceRepository;
     private readonly RequestDelegate _next;
     private readonly ILogger<PublicKeyLinkedMiddleware> _logger;
 
     public PublicKeyLinkedMiddleware(
-        ICustomerDeviceRepository customerDeviceRepository,
         RequestDelegate next,
         ILogger<PublicKeyLinkedMiddleware> logger)
     {
-        _customerDeviceRepository = customerDeviceRepository;
         _next = next;
         _logger = logger;
     }
 
-    public async Task Invoke(HttpContext context)
+    public async Task Invoke(HttpContext context, ICustomerDeviceRepository customerDeviceRepository)
     {
         // skip the middleware for specific endpoints
         if (!SkipEndpoint(context))
@@ -40,7 +37,7 @@ public async Task Invoke(HttpContext context)
             var pubKey = context.Request.Headers["x-public-key"];
 
             // get all public keys linked to the user
-            var customerDevices = await _customerDeviceRepository.GetAsync(userId, context.RequestAborted);
+            var customerDevices = await customerDeviceRepository.GetAsync(userId, context.RequestAborted);
 
             // if the user does not have any public keys or the public key is not linked to the user, return forbidden
             if (customerDevices is null
@@ -82,7 +79,7 @@ private static bool SkipEndpoint(HttpContext context)
         var endpoint = context.GetEndpoint();
         var endpointName = endpoint?.Metadata.GetMetadata<EndpointNameMetadata>()?.EndpointName;
 
-        var excludeList = new[] { "DeviceAuthentication" };
+        var excludeList = new[] { "DeviceAuthentication", "SendOTPCodeEmail" };
 
         return context.Request.Path.StartsWithSegments("/health")
                || excludeList.Contains(endpointName);

diff --git a/backend/core/src/Core.API/appsettings.json b/backend/core/src/Core.API/appsettings.json
@@ -12,6 +12,11 @@
       "Audience": ""
     }
   ],
+  "B2CServiceOptions": {
+    "ClientId": "",
+    "ClientSecret": "",
+    "Tenant": ""
+  },
   "NexusOptions": {
     "ApiUrl": "",
     "PaymentMethodOptions": {
@@ -60,12 +65,13 @@
     "StorageConnectionString": "",
     "ContainerName": ""
   },
-    "SendGridMailServiceOptions": {
+  "SendGridMailServiceOptions": {
     "ApiKey": "",
     "Sender": "",
     "Templates": {
       "WithdrawalTemplateID": "",
-      "FundingtemplateID": ""
+      "FundingtemplateID": "",
+      "OTPCodeTemplateID": ""
     }
   },
   "ConnectionStrings": {

diff --git a/backend/core/src/Core.Application/Commands/CustomerCommands/DeleteCustomerCommand.cs b/backend/core/src/Core.Application/Commands/CustomerCommands/DeleteCustomerCommand.cs
@@ -0,0 +1,40 @@
+// Copyright 2023 Quantoz Technology B.V. and contributors. Licensed
+// under the Apache License, Version 2.0. See the NOTICE file at the root
+// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
+
+using Core.Domain.Repositories;
+using MediatR;
+
+namespace Core.Application.Commands.CustomerCommands
+{
+    public class DeleteCustomerCommand : IRequest
+    {
+        public string CustomerCode { get; set; }
+
+        public string IP { get; set; }
+
+        public DeleteCustomerCommand(string customerCode, string iP)
+        {
+            CustomerCode = customerCode;
+            IP = iP;
+        }
+    }
+
+    public class DeleteCustomerCommandHandler : IRequestHandler<DeleteCustomerCommand>
+    {
+        private readonly ICustomerRepository _customerRepository;
+
+        public DeleteCustomerCommandHandler(
+            ICustomerRepository customerRepository)
+        {
+            _customerRepository = customerRepository;
+        }
+
+        public async Task Handle(DeleteCustomerCommand request, CancellationToken cancellationToken)
+        {
+            var customer = await _customerRepository.GetAsync(request.CustomerCode, cancellationToken);
+
+            await _customerRepository.DeleteAsync(customer, request.IP);
+        }
+    }
+}
diff --git a/backend/core/src/Core.Application/Commands/CustomerCommands/OTPCodeByEmailCommand.cs b/backend/core/src/Core.Application/Commands/CustomerCommands/OTPCodeByEmailCommand.cs
@@ -0,0 +1,79 @@
+// Copyright 2023 Quantoz Technology B.V. and contributors. Licensed
+// under the Apache License, Version 2.0. See the NOTICE file at the root
+// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
+
+using Core.Domain;
+using Core.Domain.Abstractions;
+using Core.Domain.Exceptions;
+using Core.Domain.Repositories;
+using MediatR;
+
+namespace Core.Application.Commands.CustomerCommands
+{
+    public class OTPCodeByEmailCommand : IRequest
+    {
+        public string CustomerCode { get; set; }
+
+        public string IP { get; set; }
+
+        public OTPCodeByEmailCommand(string customerCode, string ip)
+        {
+            CustomerCode = customerCode;
+            IP = ip;
+        }
+    }
+
+    public class OTPCodeByEmailCommandHandler : IRequestHandler<OTPCodeByEmailCommand>
+    {
+        private readonly ICustomerRepository _customerRepository;
+        private readonly ICustomerDeviceRepository _customerDeviceRepository;
+        private readonly ICustomerOTPGenerator _otpGenerator;
+        private readonly ISendGridMailService _sendGridMailService;
+        private readonly IUnitOfWork _unitOfWork;
+
+        public OTPCodeByEmailCommandHandler(
+            ICustomerRepository customerRepository,
+            ICustomerDeviceRepository customerDeviceRepository,
+            ICustomerOTPGenerator otpGenerator,
+            ISendGridMailService sendGridMailService,
+            IUnitOfWork unitOfWork)
+        {
+            _customerRepository = customerRepository;
+            _customerDeviceRepository = customerDeviceRepository;
+            _otpGenerator = otpGenerator;
+            _sendGridMailService = sendGridMailService;
+            _unitOfWork = unitOfWork;
+        }
+
+        public async Task Handle(OTPCodeByEmailCommand request, CancellationToken cancellationToken)
+        {
+            var customer = await _customerRepository.GetAsync(request.CustomerCode, cancellationToken);
+
+            if (customer == null)
+            {
+                throw new CustomErrorsException(DomainErrorCode.CustomerNotFoundError.ToString(), request.CustomerCode, "Customer not found.");
+            }
+
+            if (customer.Status != CustomerStatus.ACTIVE.ToString())
+            {
+                throw new CustomErrorsException(DomainErrorCode.CustomerNotActiveError.ToString(), request.CustomerCode, "Customer is not ACTIVE.");
+            }
+
+            var customerDevice = await _customerDeviceRepository.GetAsync(request.CustomerCode, cancellationToken);
+
+            // rare case of exception
+            if (customerDevice == null || string.IsNullOrEmpty(customerDevice.OTPKey))
+            {
+                throw new CustomErrorsException(DomainErrorCode.CustomerNotFoundError.ToString(), request.CustomerCode, "Customer device key not found.");
+            }
+
+            // Generate OTPCode
+            var otpCode = _otpGenerator.GenerateOTPCode(customerDevice.OTPKey);
+
+            // Send OTPCode to customer email
+            await _sendGridMailService.SendOTPCodeMailAsync(customer, otpCode);
+
+            await _unitOfWork.SaveChangesAsync(cancellationToken);
+        }
+    }
+}
diff --git a/backend/core/src/Core.Application/Core.Application.csproj b/backend/core/src/Core.Application/Core.Application.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="FluentValidation" Version="11.9.0" />
     <PackageReference Include="MediatR" Version="12.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/backend/core/src/Core.Application/Enums.cs b/backend/core/src/Core.Application/Enums.cs
@@ -8,6 +8,7 @@ public enum ApplicationErrorCode
     {
         InvalidStatusError,
         InvalidPropertyError,
-        ExistingPropertyError
+        ExistingPropertyError,
+        NotFoundError
     }
 }
diff --git a/backend/core/src/Core.Application/Queries/CustomerQueries/GetCustomerQuery.cs b/backend/core/src/Core.Application/Queries/CustomerQueries/GetCustomerQuery.cs
@@ -2,9 +2,7 @@
 // under the Apache License, Version 2.0. See the NOTICE file at the root
 // of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
 
-using Core.Domain;
 using Core.Domain.Entities.CustomerAggregate;
-using Core.Domain.Exceptions;
 using Core.Domain.Repositories;
 using MediatR;
 
@@ -33,11 +31,6 @@ public async Task<Customer> Handle(GetCustomerQuery request, CancellationToken c
         {
             var customer = await _customerRepository.GetAsync(request.CustomerCode);
 
-            if (customer.Status != CustomerStatus.ACTIVE.ToString() && customer.Status != CustomerStatus.UNDERREVIEW.ToString())
-            {
-                throw new CustomErrorsException(ApplicationErrorCode.InvalidStatusError.ToString(), request.CustomerCode, "Customer status with this reference is not valid");
-            }
-
             return customer;
         }
     }

diff --git a/backend/core/src/Core.Domain/Abstractions/ISendGridMailService.cs b/backend/core/src/Core.Domain/Abstractions/ISendGridMailService.cs
@@ -11,5 +11,7 @@ namespace Core.Domain.Abstractions
     public interface ISendGridMailService
     {
         public Task SendMailAsync(Mail mail, Customer customer, Transaction transaction);
+
+        public Task SendOTPCodeMailAsync(Customer customer, string otpCode);
     }
 }
diff --git a/backend/core/src/Core.Domain/Enums.cs b/backend/core/src/Core.Domain/Enums.cs
@@ -43,7 +43,9 @@ public enum DomainErrorCode
         InvalidStatusError,
         InvalidPropertyError,
         ExistingKeyError,
-        SecurityCheckError
+        SecurityCheckError,
+        CustomerNotFoundError,
+        CustomerNotActiveError,
     }
 
     public enum PaymentRequestStatus

diff --git a/backend/core/src/Core.Domain/Repositories/ICustomerRepository.cs b/backend/core/src/Core.Domain/Repositories/ICustomerRepository.cs
@@ -15,5 +15,7 @@ public interface ICustomerRepository
         public Task<IEnumerable<CustomerLimit>> GetLimitsAsync(string customerCode, CancellationToken cancellationToken = default);
 
         public Task UpdateAsync(Customer customer, CancellationToken cancellationToken = default);
+
+        public Task DeleteAsync(Customer customer, string? ip = null, CancellationToken cancellationToken = default);
     }
 }
diff --git a/backend/core/src/Core.Domain/Repositories/ITransactionRepository.cs b/backend/core/src/Core.Domain/Repositories/ITransactionRepository.cs
@@ -15,7 +15,7 @@ public interface ITransactionRepository
 
         public Task<Paged<Transaction>> GetAsync(string publicKey, int page, int pageSize, CancellationToken cancellationToken = default);
 
-        public Task<Paged<Transaction>> GetByCodeAsync(string code, CancellationToken cancellationToken = default);
+        public Task<Paged<Transaction>> GetAsync(Dictionary<string, string> parameters, int page, int pageSize, CancellationToken cancellationToken = default);
 
         public Task<WithdrawFees> GetWithdrawFeesAsync(Withdraw withdraw, CancellationToken cancellationToken = default);
     }