Migration to new MP Payments API + new authentication

coffeecard/CoffeeCard.Common/Configuration/MobilePaySettingsV2.cs

@@ -13,7 +13,16 @@ public class MobilePaySettingsV2 : IValidatable
         public string ApiKey { get; set; }
 
         [Required]
-        public Guid PaymentPointId { get; set; }
+        public string ClientId { get; set; }
+
+        [Required]
+        public string ClientSecret { get; set; }
+
+        [Required]
+        public string MerchantSerialNumber { get; set; }
+
+        [Required]
+        public string OcpApimSubscriptionKey { get; set; }
 
         [Required]
         public string WebhookUrl { get; set; }

coffeecard/CoffeeCard.Common/Configuration/MobilePaySettingsV3.cs

@@ -0,0 +1,45 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using NetEscapades.Configuration.Validation;
+
+namespace CoffeeCard.Common.Configuration
+{
+    public class MobilePaySettingsV3 : IValidatable
+    {
+        [Required]
+        public Uri ApiUrl { get; set; }
+
+        [Required]
+        public Guid ClientId { get; set; }
+
+        [Required]
+        public string ClientSecret { get; set; }
+
+        [Required]
+        public string MerchantSerialNumber { get; set; }
+
+        [Required]
+        public string WebhookUrl { get; set; }
+
+        [Required]
+        public string OcpApimSubscriptionKey { get; set; }
+
+        [Required]
+        public string VippsSystemName { get; set; }
+
+        [Required]
+        public string VippsSystemVersion { get; set; }
+
+        [Required]
+        public string VippsSystemPluginName { get; set; }
+
+        [Required]
+        public string VippsSystemPluginVersion { get; set; }
+
+
+        public void Validate()
+        {
+            Validator.ValidateObject(this, new ValidationContext(this), true);
+        }
+    }
+}

coffeecard/CoffeeCard.Library/Services/v2/IPurchaseService.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using CoffeeCard.MobilePay.Generated.Api.PaymentsApi;
 using CoffeeCard.Models.DataTransferObjects.v2.MobilePay;
 using CoffeeCard.Models.DataTransferObjects.v2.Purchase;
 using CoffeeCard.Models.Entities;

coffeecard/CoffeeCard.Library/Services/v2/PurchaseService.cs

@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using CoffeeCard.Common.Errors;
 using CoffeeCard.Library.Persistence;
-using CoffeeCard.MobilePay.Generated.Api.PaymentsApi;
 using CoffeeCard.MobilePay.Service.v2;
 using CoffeeCard.Models.DataTransferObjects.v2.MobilePay;
 using CoffeeCard.Models.DataTransferObjects.v2.Products;
@@ -133,7 +132,7 @@ private static void CheckUserIsAllowedToPurchaseProduct(User user, InitiatePurch
                 Price = product.Price,
                 NumberOfTickets = product.NumberOfTickets,
                 DateCreated = DateTime.UtcNow,
-                OrderId = paymentDetails.OrderId,
+                OrderId = orderId.ToString(),
                 ExternalTransactionId = transactionId,
                 PurchasedBy = user,
                 Status = purchaseStatus,

coffeecard/CoffeeCard.Library/Services/v2/WebhookService.cs

@@ -24,11 +24,11 @@ public class WebhookService : IWebhookService
 
         private readonly CoffeeCardContext _context;
         private readonly IMobilePayWebhooksService _mobilePayWebhooksService;
-        private readonly MobilePaySettingsV2 _mobilePaySettings;
+        private readonly MobilePaySettingsV3 _mobilePaySettings;
         private readonly IMemoryCache _memoryCache;
 
         public WebhookService(CoffeeCardContext context, IMobilePayWebhooksService mobilePayWebhooksService,
-            MobilePaySettingsV2 mobilePaySettings, IMemoryCache memoryCache)
+            MobilePaySettingsV3 mobilePaySettings, IMemoryCache memoryCache)
         {
             _context = context;
             _mobilePayWebhooksService = mobilePayWebhooksService;