From dd7b7e6de67afe7827962f2925ad278b084555e0 Mon Sep 17 00:00:00 2001 From: "derek.holloway" Date: Tue, 15 Jul 2025 11:02:30 -0700 Subject: [PATCH] Cleanup --- .../Controllers/AuthenticationController.cs | 2 +- src/Server/Controllers/PaymentController.cs | 23 +------------------ .../Controllers/PaymentMethods/IPayment.cs | 2 +- .../PaymentMethods/StripeIntents.cs | 3 +-- src/Server/Services/DatabaseService/Resume.cs | 1 - 5 files changed, 4 insertions(+), 27 deletions(-) diff --git a/src/Server/Controllers/AuthenticationController.cs b/src/Server/Controllers/AuthenticationController.cs index e5dfdbb..5eaf19e 100755 --- a/src/Server/Controllers/AuthenticationController.cs +++ b/src/Server/Controllers/AuthenticationController.cs @@ -8,7 +8,7 @@ using BoredCareers.Entities; namespace BoredCareers.Controllers { [ApiController] - [Route("api/account/[controller]")] + [Route("api/account/")] public class AuthenticationController : MistoxControllerBase { EmailService _emailContext; diff --git a/src/Server/Controllers/PaymentController.cs b/src/Server/Controllers/PaymentController.cs index 17917c7..0d9fdbf 100755 --- a/src/Server/Controllers/PaymentController.cs +++ b/src/Server/Controllers/PaymentController.cs @@ -1,11 +1,10 @@ using Microsoft.AspNetCore.Mvc; using BoredCareers.Controllers.Payment; using BoredCareers.Services.DatabaseService; -using BoredCareers.Entities; namespace BoredCareers.Controllers { [ApiController] - [Route("api/payment/[controller]")] + [Route("api/payment/")] public class PaymentController : MistoxControllerBase { IPayment _paymentService; @@ -20,26 +19,6 @@ namespace BoredCareers.Controllers { // Add new payment plugins here } - [Route("getcheckouttoken")] - [HttpPost] - public async Task GetCheckoutToken() { - string OrderNumber = Guid.NewGuid().ToString().Substring(0, 10); - if (isLoggedIn()) { - Cart[] carts = await _databaseService.GetCart(getLoggedInUserID()); - (bool, string) PaymentResponse = await _paymentService.TryGetCheckoutToken(OrderNumber, getLoggedInUserID(), carts); - if (PaymentResponse.Item1) { - // Returns client secret - return PaymentResponse.Item2; - } else { - Console.WriteLine("An error has occured in the payment plugin\n\n"); - Console.WriteLine(PaymentResponse.Item2); - Console.WriteLine("\n"); - return "An error has occured in the payment plugin"; - } - } - return "You must be logged in"; - } - [Route("getpublickey")] [HttpPost] public IActionResult GetPublicKey() { diff --git a/src/Server/Controllers/PaymentMethods/IPayment.cs b/src/Server/Controllers/PaymentMethods/IPayment.cs index 3ade142..5be09a3 100644 --- a/src/Server/Controllers/PaymentMethods/IPayment.cs +++ b/src/Server/Controllers/PaymentMethods/IPayment.cs @@ -8,7 +8,7 @@ namespace BoredCareers.Controllers.Payment { public static string _EndpointSecret = ""; public static string _PublicKey = ""; - public Task<(bool, string)> TryGetCheckoutToken(string OrderNumber, int userID, Cart[] cart); + public Task<(bool, string)> TryGetCheckoutToken(string OrderNumber, int userID); public Task ValidatePurchase(string WebHookData, string Headers); } diff --git a/src/Server/Controllers/PaymentMethods/StripeIntents.cs b/src/Server/Controllers/PaymentMethods/StripeIntents.cs index 2e5f12f..f6110da 100644 --- a/src/Server/Controllers/PaymentMethods/StripeIntents.cs +++ b/src/Server/Controllers/PaymentMethods/StripeIntents.cs @@ -1,6 +1,5 @@ using BoredCareers.Controllers.Payment; using BoredCareers.Services.DatabaseService; -using BoredCareers.Entities; namespace BoredCareers.Controllers { @@ -12,7 +11,7 @@ namespace BoredCareers.Controllers { _databaseService = databaseService; } - public async Task<(bool, string)> TryGetCheckoutToken(string OrderNumber, int userID, Cart[] cart) { + public async Task<(bool, string)> TryGetCheckoutToken(string OrderNumber, int userID) { try { // build Recipt and calculate Tax var options = new Stripe.Tax.CalculationCreateOptions { diff --git a/src/Server/Services/DatabaseService/Resume.cs b/src/Server/Services/DatabaseService/Resume.cs index f5e2895..5050a10 100644 --- a/src/Server/Services/DatabaseService/Resume.cs +++ b/src/Server/Services/DatabaseService/Resume.cs @@ -1,6 +1,5 @@ using BoredCareers.Entities; using MySql.Data.MySqlClient; -using Stripe.Terminal; using System.Data; using System.Data.Common;