5 Commits

Author SHA1 Message Date
Dima yawaflua Andreev
8b0043e1ab Update nuget.yml 2024-01-19 20:07:44 +03:00
Dima yawaflua Andreev
46f184d775 Merge pull request #1 from yawaflua/yawaflua-patch-1
Change .NET version from 8 to 7
2024-01-19 20:02:04 +03:00
Dima yawaflua Andreev
85c4d5e099 Update SPWorldsWrapper.csproj 2024-01-19 20:00:58 +03:00
Dima yawaflua Andreev
1f81fd5cbd Update README.md 2024-01-19 19:59:45 +03:00
Дмитрий Шиманский
1201e16caa Add auth exception class for better readibility 2023-12-27 23:15:39 +03:00
4 changed files with 34 additions and 8 deletions

View File

@@ -12,7 +12,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: '8.x.x'
dotnet-version: '7.x.x'
- name: Set output
id: vars
run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
@@ -22,7 +22,7 @@ jobs:
PROJECT_FILE_PATH: SPWorldsWrapper/SPWorldsWrapper.csproj
VERSION_STATIC: ${{ steps.vars.outputs.tags }}
TAG_COMMIT: true
TAG_FORMAT: '*'
TAG_FORMAT: ${{ steps.meta.outputs.tags }}
NUGET_KEY: ${{secrets.NUGET_API_KEY}}
NUGET_SOURCE: https://api.nuget.org
INCLUDE_SYMBOLS: false

View File

@@ -1,5 +1,5 @@
# SPWorldsWrapper
![](https://img.shields.io/badge/dotnet-.NET_8-green)
![](https://img.shields.io/badge/dotnet-.NET_7-green)
Actions pass:

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PackageId>SPWorldsWrapper</PackageId>

View File

@@ -2,13 +2,22 @@
using SPWorldsWrapper.Types;
using System.Net;
using System.Net.Http.Json;
using System.Reflection.Metadata.Ecma335;
using System.Text.Json.Nodes;
namespace SPWorldsWrapper
{
public class AuthentificationError : Exception
{
public AuthentificationError(string? message, Exception? innerException) : base(message, innerException) { }
public AuthentificationError() : base() { }
public AuthentificationError(string? message) : base(message) { }
}
public class SPWrapper
{
public readonly HttpClient client;
/// <summary>
/// Асинхронный wrapper для работы напрямую с сайтом, а не с API SPWorlds.ru
@@ -21,7 +30,11 @@ namespace SPWorldsWrapper
client = new(handler);
client.BaseAddress = new Uri("https://spworlds.ru/api/");
cookieContainer.Add(client.BaseAddress, new Cookie("jeff", token));
spwLogin();
var spwLoginMethod = spwLogin();
if (!spwLoginMethod.Result)
{
throw new AuthentificationError("Ошибка парсинга данных от сайта. Проверьте токен, IP сервера и статус сайта SPWORLDS.RU");
}
}
/// <summary>
@@ -30,11 +43,24 @@ namespace SPWorldsWrapper
/// Если иное - токен слетел!
/// </summary>
/// <returns>Ничего</returns>
public void spwLogin()
public async Task<bool> spwLogin()
{
var content = new StringContent(@"{}");
var responseMessage = client.PostAsync("auth/refresh_token", content).Result;
Console.WriteLine(responseMessage.Content.ReadAsStringAsync().Result);
var responseMessage = await client.PostAsync("auth/refresh_token", content);
var bodyFromSPW = await responseMessage.Content.ReadAsStringAsync();
var serializedBody = JsonNode.Parse(bodyFromSPW);
if (serializedBody == null)
{
Console.Error.WriteLine("error: Some error returned from site.");
Console.WriteLine("debug: please, check your authorization token");
}
else
{
Console.WriteLine(await responseMessage.Content.ReadAsStringAsync());
}
return serializedBody != null;
}
/// <summary>
/// Получение данных пользователя по юзернейму.