sloved errors

This commit is contained in:
Mih4n
2023-10-16 19:17:13 +03:00
parent a1425e7e6e
commit dd711dd7c3
6 changed files with 51 additions and 16 deletions

View File

@@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v6.0", FrameworkDisplayName = ".NET 6.0")]

View File

@@ -0,0 +1,25 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using System;
using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Mih4n")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyDescriptionAttribute("данная библиотека предназначена для работы с сайтом spworlds. Ознакомиться с доку" +
"ментацией можно в гитхабе проекта")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.1.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.1")]
[assembly: System.Reflection.AssemblyProductAttribute("spworlds")]
[assembly: System.Reflection.AssemblyTitleAttribute("spworlds")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.1.0")]
[assembly: System.Reflection.AssemblyMetadataAttribute("RepositoryUrl", "https://github.com/Mih4n/spworlds")]
// Создано классом WriteCodeFragment MSBuild.

View File

@@ -0,0 +1 @@
3b79596e0f193799e87c2d642144700f8551bcf8

View File

@@ -0,0 +1,11 @@
is_global = true
build_property.TargetFramework = net6.0
build_property.TargetPlatformMinVersion =
build_property.UsingMicrosoftNETSdkWeb =
build_property.ProjectTypeGuids =
build_property.InvariantGlobalization =
build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = spworlds
build_property.ProjectDir = c:\Users\losev\OneDrive\Рабочий стол\spworlds\spworlds-csharp-library\src\

View File

@@ -0,0 +1,8 @@
// <auto-generated/>
global using global::System;
global using global::System.Collections.Generic;
global using global::System.IO;
global using global::System.Linq;
global using global::System.Net.Http;
global using global::System.Threading;
global using global::System.Threading.Tasks;

View File

@@ -24,26 +24,13 @@ public class SPWorlds
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", Base64BearerToken);
}
// Полностью бесполезная функция, вебхук, возвращающийся от сайта по факту невозможно валидировать.
private async Task<bool> ValidateWebHook(string webHook, string bodyHash)
{
// Если я правильно все понял, то вот
// Конвертим из string в bytes body_hash
byte[] body = Encoding.UTF8.GetBytes(bodyHash);
// потом конвертим вебхук
byte[] webhook = Encoding.UTF8.GetBytes(webHook);
// создаем объект с токеном(тоже encoded в bytes) для сопостовления
var key = new HMACSHA256(Encoding.UTF8.GetBytes(token));
// Переводим в Base64
string webhook64 = Convert.ToBase64String(key.ComputeHash(webhook));
return webhook64.Equals(body);
/**
* Тот же код, но на Python:
hmacData = hmac.new(token.encode('utf - 8'), webhook.encode('utf - 8'), sha256).digest()
base64Data = b64encode(hmacData)
return hmac.compare_digest(base64Data, bodyHash.encode('utf-8'))
**/
}
private async Task<string> SendRequest(string endpoint, Boolean getResult = true, Dictionary<string, object>? body = null)
@@ -93,9 +80,8 @@ public class SPWorlds
public async Task<User> GetUser(string discordId)
{
var userResponse = JsonObject.Parse(await SendRequest($"users/{discordId}"));
var userName = userResponse["username"];
User user = new() { Name = userName}
string userName = (string)JsonObject.Parse(await SendRequest($"users/{discordId}"))["username"];
User user = new(userName);
return (User)user;
}