Merge pull request #1 from yawaflua/yawaflua-patch-1

Change .NET version from 8 to 7

README.md

@@ -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:
 

SPWorldsWrapper/SPWorldsWrapper.csproj

@@ -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>

SPWorldsWrapper/SPWrapper.cs

@@ -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 async Task spwLogin()
+        public async Task<bool> spwLogin()
         {
             var content = new StringContent(@"{}");
             var responseMessage = await client.PostAsync("auth/refresh_token", content);
-            await Console.Out.WriteLineAsync(await responseMessage.Content.ReadAsStringAsync());
+            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>
         /// Получение данных пользователя по юзернейму.
@@ -54,12 +80,11 @@ namespace SPWorldsWrapper
         /// </summary>
         /// <param name="userName">Никнейм пользователя(из майнкрафта)</param>
         /// <example> var a = "a";</example>
-        /// <returns><see cref="SPUser" /> пользователь от сайта, или ошибку.</returns>
-        public async Task<SPUser> getUserData(string userName)
+        /// <returns><see cref="SPUser" /> пользователь от сайта, или null.</returns>
+        public async Task<SPUser?> getUserData(string userName)
         {
             var request = await client.GetAsync($"pl/accounts/{userName}");
-            await Console.Out.WriteLineAsync(request.Content.ReadAsStringAsync().Result);
-            SPUser response = JsonConvert.DeserializeObject<SPUser>(request.Content.ReadAsStringAsync().Result.ToString());
+            SPUser? response = JsonConvert.DeserializeObject<SPUser>(request.Content.ReadAsStringAsync().Result.ToString());
             return response;
         }
         /// <summary>