cuqmbr/auto.bus_api
1
0
Fork 0
Code Issues Pull Requests Activity

Small fixes

Browse Source
This commit is contained in:
KazanskiyMaks 2023-05-17 18:25:47 +03:00
parent bdb1378868
commit d6eded539d
9 changed files with 377 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
LiqPayIntegration/LiqPay.cs
View File

@ -1,4 +1,5 @@
using System.Buffers.Text;
using System.Dynamic;
using System.Net.Http.Json;
using System.Security.Cryptography;
using System.Text;
@ -14,24 +15,33 @@ namespace LiqPayIntegration
private readonly HttpClient _http;
public const string API_URL = "https://www.liqpay.ua/api/request";
public string PublicKey { get; init; }
public string PrivateKey { get; init; }
public string PublicKey { get; private set; }
public string PrivateKey { get; private set; }
public string CallbackUrl { get; private set; }
public LiqPay(string publicKey, string privateKey)
{
_http = new HttpClient();
PublicKey = publicKey;
PrivateKey = privateKey;
}
public LiqPay(string publicKey, string privateKey, string callbackUrl) : this (publicKey, privateKey)
{
CallbackUrl = callbackUrl;
}
public async ValueTask<PaymentResponse[]> PaymentArchive(DateTime from, DateTime to)
public async ValueTask<PaymentResponse[]> PaymentArchive(DateTimeOffset from, DateTimeOffset to)
{
var json = JsonContent.Create(new
{
action = "reports",
version = 3,
public_key = PublicKey,
date_from = (long)from.Subtract(new DateTime(1970, 1, 1)).TotalMilliseconds,
date_to = (long)to.Subtract(new DateTime(1970, 1, 1)).TotalMilliseconds
date_from = from.ToUnixTimeMilliseconds(),
date_to = to.ToUnixTimeMilliseconds(),
//server_url = CallbackUrl
/*date_from = (long)from.Subtract(new DateTime(1970, 1, 1)).TotalMilliseconds,
date_to = (long)to.Subtract(new DateTime(1970, 1, 1)).TotalMilliseconds*/
});
var data = Convert.ToBase64String(await json.ReadAsByteArrayAsync());
var signString = PrivateKey + data + PrivateKey;
@ -51,5 +61,48 @@ namespace LiqPayIntegration
var paymentResponses = jsonResponse["data"].Deserialize<PaymentResponse[]>();
return paymentResponses;
}
public async ValueTask<(string data, string signature)> GetCheckout(double amount, string description, string order_id)
{
var json = JsonContent.Create(new
{
action = "pay",
version = 3,
public_key = PublicKey,
amount = amount,
currency = "UAH",
description = description,
order_id = order_id,
server_url = CallbackUrl
});
var data = Convert.ToBase64String(await json.ReadAsByteArrayAsync());
var signString = PrivateKey + data + PrivateKey;
var signature = Convert.ToBase64String(SHA1.HashData(Encoding.UTF8.GetBytes(signString)));
return (data, signature);
}
public string GetPaymentUrl(string data, string signature)
{
return "https://www.liqpay.ua/api/3/checkout?data=" + data + "&signature=" + signature;
}
public async ValueTask<string> GetPaymentUrl(double amount, string description, string order_id)
{
var vars = await GetCheckout(amount, description, order_id);
return "https://www.liqpay.ua/api/3/checkout?data=" + vars.data + "&signature=" + vars.signature;
}
/*public async void ReceiptOfReceipt(string orderId, string email)
{
var json = JsonContent.Create(new
{
action = "reports",
version = 3,
public_key = PublicKey,
date_from = (long)from.Subtract(new DateTime(1970, 1, 1)).TotalMilliseconds,
date_to = (long)to.Subtract(new DateTime(1970, 1, 1)).TotalMilliseconds
});
}*/
}
}

27
Server/Controllers/PaymentsController.cs Normal file
View File

@ -0,0 +1,27 @@
using Microsoft.AspNetCore.Mvc;
using Server.Services;
using SharedModels.DataTransferObjects;
[Route("api/payment")]
[ApiController]
public class PaymentController : ControllerBase
{
private readonly IPaymentsService _paymentsService;
public PaymentController(IPaymentsService paymentsService)
{
_paymentsService = paymentsService;
}
[HttpGet]
public async Task<IActionResult> GetPaymentLink([FromQuery] PaymentDto payment)
{
var result = await _paymentsService.GetPaymentUrl(payment);
if (!result.isSucceed)
{
return result.actionResult;
}
return Ok(result.url);
}
}

2
Server/Program.cs
View File

@ -149,6 +149,8 @@ services.AddScoped<VehicleEnrollmentSearchService>();
services.AddScoped<IReportService, ReportService>();
services.AddScoped<IStatisticsService, StatisticsService>();
builder.Services.AddScoped<IPaymentsService, PaymentsService>();
// Adding DB Context with PostgreSQL
var connectionString = configuration.GetConnectionString("DefaultConnection");
services.AddDbContext<ApplicationDbContext>(options =>

3
Server/Server.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
@ -36,6 +36,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\LiqPayIntegration\LiqPayIntegration.csproj" />
<ProjectReference Include="..\SharedModels\SharedModels.csproj" />
<ProjectReference Include="..\Utils\Utils.csproj" />
</ItemGroup>

12
Server/Services/IPaymentsService.cs Normal file
View File

@ -0,0 +1,12 @@
using LiqPayIntegration;
using Microsoft.AspNetCore.Mvc;
using SharedModels.DataTransferObjects;
using System.Dynamic;
namespace Server.Services;
public interface IPaymentsService
{
Task<(bool isSucceed, IActionResult? actionResult, IEnumerable<PaymentResponse> payments)> GetPayments(DateTime from, DateTime to);
Task<(bool isSucceed, IActionResult? actionResult, string url)> GetPaymentUrl(PaymentDto payment);
}

23
Server/Services/PaymentsService.cs Normal file
View File

@ -0,0 +1,23 @@
using LiqPayIntegration;
using Microsoft.AspNetCore.Mvc;
using SharedModels.DataTransferObjects;
namespace Server.Services;
public class PaymentsService : IPaymentsService
{
// LiqpayIntegration
LiqPay liqPay = new LiqPay("sandbox_i23432845039", "sandbox_gymL9PdryqdfAznNQbb7ynLvASDQ5SJCCNJvF2iV");
public async Task<(bool isSucceed, IActionResult? actionResult, IEnumerable<PaymentResponse> payments)> GetPayments(DateTime from, DateTime to)
{
return(true, null, (await liqPay.PaymentArchive(from, to)).AsEnumerable());
}
public async Task<(bool isSucceed, IActionResult? actionResult, string url)> GetPaymentUrl(PaymentDto payment)
{
return (true, null, (await liqPay.GetPaymentUrl(payment.Amount, payment.Description, payment.OrderId)));
}
}

14
SharedModels/DataTransferObjects/PaymentDto.cs Normal file
View File

@ -0,0 +1,14 @@
using System.ComponentModel.DataAnnotations;
namespace SharedModels.DataTransferObjects;
public class PaymentDto
{
[Required]
public double Amount { get; set; }
[Required]
public string Description { get; set; }
[Required]
[StringLength(maximumLength: 255, ErrorMessage = "Order Id is too long")]
public string OrderId { get; set; }
}

26
auto.bus API.sln
View File

@ -1,8 +1,14 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{0DCB2130-10E7-4C98-AB94-5F8D68032B9F}"
# Visual Studio Version 17
VisualStudioVersion = 17.5.33516.290
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "Server\Server.csproj", "{0DCB2130-10E7-4C98-AB94-5F8D68032B9F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedModels", "SharedModels\SharedModels.csproj", "{34E01155-5DA4-45DA-8F58-63AEFCC56B4B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedModels", "SharedModels\SharedModels.csproj", "{34E01155-5DA4-45DA-8F58-63AEFCC56B4B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LiqPayIntegration", "LiqPayIntegration\LiqPayIntegration.csproj", "{D1DE3296-E918-4702-997D-A10B755FF2CB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils", "..\auto.bus_api\Utils\Utils.csproj", "{B1AC0E7C-E77C-4F2F-82A0-A2AB2D126B71}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -18,5 +24,19 @@ Global
{34E01155-5DA4-45DA-8F58-63AEFCC56B4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{34E01155-5DA4-45DA-8F58-63AEFCC56B4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{34E01155-5DA4-45DA-8F58-63AEFCC56B4B}.Release|Any CPU.Build.0 = Release|Any CPU
{D1DE3296-E918-4702-997D-A10B755FF2CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D1DE3296-E918-4702-997D-A10B755FF2CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1DE3296-E918-4702-997D-A10B755FF2CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1DE3296-E918-4702-997D-A10B755FF2CB}.Release|Any CPU.Build.0 = Release|Any CPU
{B1AC0E7C-E77C-4F2F-82A0-A2AB2D126B71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B1AC0E7C-E77C-4F2F-82A0-A2AB2D126B71}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B1AC0E7C-E77C-4F2F-82A0-A2AB2D126B71}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B1AC0E7C-E77C-4F2F-82A0-A2AB2D126B71}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {067793F9-205E-4946-A13B-5C70752D57A3}
EndGlobalSection
EndGlobal