Merge pull request #677 from TransactionProcessing/task/fix_codacy_issues

Refactor: cleanup and enforce authorization policies

Author: StuartFerguson

TransactionProcessorACL.BusinessLogic/Services/TransactionProcessorACLApplicationService.cs

@@ -379,27 +379,7 @@ public async Task<Result<RedeemVoucherResponse>> RedeemVoucher(Guid estateId,
                         },
                         TransactionFees = new()
                     };
-
-                    // Leave here but not used atm
-                    //foreach (TransactionProcessor.DataTransferObjects.Responses.Contract.ContractProductTransactionFee contractProductTransactionFee in contractResponseProduct.TransactionFees) {
-                    //    Logger.LogInformation($"Processing contract product fee {contractProductTransactionFee.Description}");
-                    //    ContractProductTransactionFee transactionFeeModel = new ContractProductTransactionFee {
-                    //        Value = contractProductTransactionFee.Value,
-                    //        Description = contractProductTransactionFee.Description,
-                    //        CalculationType = contractProductTransactionFee.CalculationType switch {
-                    //            TransactionProcessor.DataTransferObjects.Responses.Contract.CalculationType.Fixed => CalculationType.Fixed,
-                    //            _ => CalculationType.Percentage,
-                    //        },
-                    //        FeeType = contractProductTransactionFee.FeeType switch {
-                    //            TransactionProcessor.DataTransferObjects.Responses.Contract.FeeType.Merchant => FeeType.Merchant,
-                    //            _ => FeeType.ServiceProvider,
-                    //        },
-                    //        TransactionFeeId = contractProductTransactionFee.TransactionFeeId,
-                    //        TransactionFeeReportingId = contractProductTransactionFee.TransactionFeeReportingId
-                    //    };
-                    //    productModel.TransactionFees.Add(transactionFeeModel);
-                    //}
-
+                    
                     contractModel.Products.Add(productModel);
                 }
 

TransactionProcessorACL/Bootstrapper/MiddlewareRegistry.cs

@@ -97,15 +97,7 @@ private void ConfigureAuthentication()
         private void ConfigureControllers()
         {
             this.AddControllers();
-            //.AddNewtonsoftJson(options =>
-            //                                        {
-            //                                            options.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
-            //                                            options.SerializerSettings.TypeNameHandling = TypeNameHandling.Auto;
-            //                                            options.SerializerSettings.Formatting = Formatting.Indented;
-            //                                            options.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.Utc;
-            //                                            options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
-            //                                        });
-
+            
             Assembly assembly = this.GetType().GetTypeInfo().Assembly;
             this.AddMvcCore().AddApplicationPart(assembly).AddControllersAsServices();
         }

TransactionProcessorACL/Endpoints/MerchantEndpoints.cs

@@ -16,8 +16,8 @@ public static class MerchantEndpoints
         private const string BaseRoute = "/api/merchants";
 
         public static IEndpointRouteBuilder MapMerchantEndpoints(this IEndpointRouteBuilder app) {
-            var group = app.MapGroup(BaseRoute).RequireAuthorization();
-                           //.RequireAuthorization(AuthorizationExtensions.PolicyNames.PasswordTokenOnlyPolicy);
+            var group = app.MapGroup(BaseRoute).RequireAuthorization()
+                           .RequireAuthorization(AuthorizationExtensions.PolicyNames.PasswordTokenOnlyPolicy);
 
             group.MapGet("", MerchantHandlers.GetMerchant).WithName("GetMerchant");
 

TransactionProcessorACL/Endpoints/TransactionEndpoints.cs

@@ -20,17 +20,17 @@ public static class TransactionEndpoints
 
         public static IEndpointRouteBuilder MapTransactionEndpoints(this IEndpointRouteBuilder app)
         {
-            var saleGroup = app.MapGroup(SaleBaseRoute).RequireAuthorization();//.RequireAuthorization(AuthorizationExtensions.PolicyNames.PasswordTokenOnlyPolicy);
+            var saleGroup = app.MapGroup(SaleBaseRoute).RequireAuthorization().RequireAuthorization(AuthorizationExtensions.PolicyNames.PasswordTokenOnlyPolicy);
 
             // POST /api/saletransactions
             saleGroup.MapPost("", TransactionHandlers.PerformSaleTransaction);
 
-            var logonGroup = app.MapGroup(LogonBaseRoute).RequireAuthorization();//.RequireAuthorization(AuthorizationExtensions.PolicyNames.PasswordTokenOnlyPolicy);
+            var logonGroup = app.MapGroup(LogonBaseRoute).RequireAuthorization().RequireAuthorization(AuthorizationExtensions.PolicyNames.PasswordTokenOnlyPolicy);
 
             // POST /api/logontransactions
             logonGroup.MapPost("", TransactionHandlers.PerformLogonTransaction);
 
-            var reconciliationGroup = app.MapGroup(ReconciliationBaseRoute).RequireAuthorization();//.RequireAuthorization(AuthorizationExtensions.PolicyNames.PasswordTokenOnlyPolicy);
+            var reconciliationGroup = app.MapGroup(ReconciliationBaseRoute).RequireAuthorization().RequireAuthorization(AuthorizationExtensions.PolicyNames.PasswordTokenOnlyPolicy);
 
             // POST /api/reconciliationtransactions
             reconciliationGroup.MapPost("", TransactionHandlers.PerformReconciliationTransaction);