diff --git a/LaDOSE.Src/LaDOSE.Api/Helpers/NpgsqlSqlGenerationLowercaseHelper.cs b/LaDOSE.Src/LaDOSE.Api/Helpers/NpgsqlSqlGenerationLowercaseHelper.cs new file mode 100644 index 0000000..024a343 --- /dev/null +++ b/LaDOSE.Src/LaDOSE.Api/Helpers/NpgsqlSqlGenerationLowercaseHelper.cs @@ -0,0 +1,17 @@ +using System.Text; +using Microsoft.EntityFrameworkCore.Storage; +using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal; + +namespace LaDOSE.Api; + +public class NpgsqlSqlGenerationLowercaseHelper : NpgsqlSqlGenerationHelper +{ + + static string ToLowerCase(string input) => input.ToLower(); + public NpgsqlSqlGenerationLowercaseHelper(RelationalSqlGenerationHelperDependencies dependencies) + : base(dependencies) { } + public override string DelimitIdentifier(string identifier) + => base.DelimitIdentifier(ToLowerCase(identifier)); + public override void DelimitIdentifier(StringBuilder builder, string identifier) + => base.DelimitIdentifier(builder, ToLowerCase(identifier)); +} \ No newline at end of file diff --git a/LaDOSE.Src/LaDOSE.Api/LaDOSE.Api.csproj b/LaDOSE.Src/LaDOSE.Api/LaDOSE.Api.csproj index 310fa0f..8d02db7 100644 --- a/LaDOSE.Src/LaDOSE.Api/LaDOSE.Api.csproj +++ b/LaDOSE.Src/LaDOSE.Api/LaDOSE.Api.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/LaDOSE.Src/LaDOSE.Api/Startup.cs b/LaDOSE.Src/LaDOSE.Api/Startup.cs index 09b1c77..0b700ce 100644 --- a/LaDOSE.Src/LaDOSE.Api/Startup.cs +++ b/LaDOSE.Src/LaDOSE.Api/Startup.cs @@ -1,28 +1,19 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Reflection; using System.Text; using System.Threading.Tasks; using LaDOSE.Business.Interface; -using LaDOSE.Business.Provider; using LaDOSE.Business.Service; using LaDOSE.Entity; using LaDOSE.Entity.Context; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -//using Microsoft.AspNetCore.HttpsPolicy; -using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; using Microsoft.IdentityModel.Tokens; -using Pomelo.EntityFrameworkCore.MySql; -using Pomelo.EntityFrameworkCore.MySql.Infrastructure; using AutoMapper; using LaDOSE.Api.Helpers; using LaDOSE.Business.Helper; @@ -32,6 +23,7 @@ using LaDOSE.Entity.Challonge; using LaDOSE.Entity.Wordpress; using Result = LaDOSE.Entity.Challonge.Result; using LaDOSE.Entity.BotEvent; +using Microsoft.EntityFrameworkCore.Storage; namespace LaDOSE.Api { @@ -82,9 +74,7 @@ namespace LaDOSE.Api // )); services.AddDbContextPool(options => { - options.UseMySql( - $"Server={MySqlServer};Database={MySqlDatabase};User={MySqlUser};Password={MySqlPassword};", - new MariaDbServerVersion(new Version(10, 1))); + options.UseNpgsql(Configuration.GetConnectionString("DbContext")).ReplaceService(); }); var key = Encoding.ASCII.GetBytes(this.Configuration["JWTTokenSecret"]); diff --git a/LaDOSE.Src/LaDOSE.Api/appsettings.json b/LaDOSE.Src/LaDOSE.Api/appsettings.json index 4a73694..9175c1e 100644 --- a/LaDOSE.Src/LaDOSE.Api/appsettings.json +++ b/LaDOSE.Src/LaDOSE.Api/appsettings.json @@ -4,20 +4,24 @@ "Default": "Warning" } }, + "ConnectionStrings": { + "DbContext":"Host=descartes.local;Username=tom;Password=tom;Database=ladoseapi" + }, "CertificateSettings": { "fileName": "localhost.pfx", "password": "YourSecurePassword" }, "MySql": { - "Server": "host", - "Database": "database", - "User": "User", - "Password": "Password" + "Server": "localhost", + "Database": "ladoseapi", + "User": "dev", + "Password": "dev" }, "ApiKey": { - "ChallongeApiKey": "Challonge ApiKey" + "ChallongeApiKey": "Challonge ApiKey", + "SmashApiKey": "Smash" }, - "AllowedHosts": "*", + "AllowedHosts": "0.0.0.0", "Port": 5000, "JWTTokenSecret": "here goes the custom Secret key for authnetication" } diff --git a/LaDOSE.Src/LaDOSE.DTO/LaDOSE.DTO.csproj b/LaDOSE.Src/LaDOSE.DTO/LaDOSE.DTO.csproj index 9e8bc4a..71b992e 100644 --- a/LaDOSE.Src/LaDOSE.DTO/LaDOSE.DTO.csproj +++ b/LaDOSE.Src/LaDOSE.DTO/LaDOSE.DTO.csproj @@ -5,4 +5,8 @@ AnyCPU;x64 + + + + diff --git a/LaDOSE.Src/LaDOSE.DiscordBot/LaDOSE.DiscordBot.csproj b/LaDOSE.Src/LaDOSE.DiscordBot/LaDOSE.DiscordBot.csproj index 16bc461..990f4ef 100644 --- a/LaDOSE.Src/LaDOSE.DiscordBot/LaDOSE.DiscordBot.csproj +++ b/LaDOSE.Src/LaDOSE.DiscordBot/LaDOSE.DiscordBot.csproj @@ -12,6 +12,7 @@ + diff --git a/LaDOSE.Src/LaDOSE.DiscordBot/Service/WebService.cs b/LaDOSE.Src/LaDOSE.DiscordBot/Service/WebService.cs index 6826817..2684efa 100644 --- a/LaDOSE.Src/LaDOSE.DiscordBot/Service/WebService.cs +++ b/LaDOSE.Src/LaDOSE.DiscordBot/Service/WebService.cs @@ -34,13 +34,6 @@ namespace LaDOSE.DiscordBot.Service } - private void CheckToken() - { - - - } - - public String GetInscrits() { diff --git a/LaDOSE.Src/LaDOSE.Entity/Context/LaDOSEDbContext.cs b/LaDOSE.Src/LaDOSE.Entity/Context/LaDOSEDbContext.cs index 570816b..3572ed7 100644 --- a/LaDOSE.Src/LaDOSE.Entity/Context/LaDOSEDbContext.cs +++ b/LaDOSE.Src/LaDOSE.Entity/Context/LaDOSEDbContext.cs @@ -39,6 +39,8 @@ namespace LaDOSE.Entity.Context public LaDOSEDbContext(DbContextOptions options) : base(options) { } + + protected override void OnModelCreating(ModelBuilder modelBuilder) { diff --git a/LaDOSE.Src/LaDOSE.Entity/LaDOSE.Entity.csproj b/LaDOSE.Src/LaDOSE.Entity/LaDOSE.Entity.csproj index 765e488..d3b942f 100644 --- a/LaDOSE.Src/LaDOSE.Entity/LaDOSE.Entity.csproj +++ b/LaDOSE.Src/LaDOSE.Entity/LaDOSE.Entity.csproj @@ -6,6 +6,7 @@ + diff --git a/LaDOSE.Src/LaDOSE.REST/LaDOSE.REST.csproj b/LaDOSE.Src/LaDOSE.REST/LaDOSE.REST.csproj index f045f2c..e7a3342 100644 --- a/LaDOSE.Src/LaDOSE.REST/LaDOSE.REST.csproj +++ b/LaDOSE.Src/LaDOSE.REST/LaDOSE.REST.csproj @@ -6,7 +6,8 @@ - + + diff --git a/LaDOSE.Src/LaDOSE.REST/RestService.cs b/LaDOSE.Src/LaDOSE.REST/RestService.cs index d2e9118..e801c50 100644 --- a/LaDOSE.Src/LaDOSE.REST/RestService.cs +++ b/LaDOSE.Src/LaDOSE.REST/RestService.cs @@ -2,9 +2,10 @@ using System.Collections.Generic; using LaDOSE.DTO; using LaDOSE.REST.Event; +using Newtonsoft.Json; using RestSharp; using RestSharp.Authenticators; -using RestSharp.Serialization.Json; + namespace LaDOSE.REST { @@ -29,33 +30,29 @@ namespace LaDOSE.REST public void Connect(Uri url, string user, string password) { Client = new RestClient(url); + string token = GetToken(user, password); + Client = new RestClient(url, options => + { #if DEBUG - Client.Timeout = 999*1000; + options.MaxTimeout = Int32.MaxValue; #endif + options.Authenticator = new JwtAuthenticator("token"); + }); + this.username = user; this.password = password; - GetToken(user, password); + } - private void GetToken(string user, string password) + private string GetToken(string user, string password) { - var restRequest = new RestRequest("users/auth", Method.POST); + var restRequest = new RestRequest("users/auth", Method.Post); restRequest.AddJsonBody(new {username = user, password = password}); - - var response = Client.Post(restRequest); - if (response.IsSuccessful) - { - JsonDeserializer d = new JsonDeserializer(); - var applicationUser = d.Deserialize(response); - this.Auth = applicationUser; - Client.Authenticator = new JwtAuthenticator($"{applicationUser.Token}"); - RaiseUpdatedJwtEvent(new UpdatedJwtEventHandler(this.Auth)); - } - else - { - - throw new Exception("unable to contact services"); - } + + var response = Client.Post(restRequest); + //var applicationUser = JsonConvert.DeserializeObject(response.Content); + this.Auth = response; + return response.Token; } private void RaiseUpdatedJwtEvent(UpdatedJwtEventHandler auth) @@ -75,120 +72,122 @@ namespace LaDOSE.REST } } -#region PostFix - - private T Post(string resource,T entity) - { - var json = new RestSharp.Serialization.Json.JsonSerializer(); - var jsonD = new RestSharp.Serialization.Json.JsonDeserializer(); - var request = new RestRequest(); - request.Method = Method.POST; - request.Resource = resource; - request.AddHeader("Accept", "application/json"); - request.AddHeader("Content-type", "application/json"); - request.Parameters.Clear(); - request.AddParameter("application/json; charset=utf-8", json.Serialize(entity), ParameterType.RequestBody); - request.AddObject(entity); - var response = Client.Execute(request); - //var content = response.Content; // raw content as string - try - { - return jsonD.Deserialize(response); - } - catch (Exception) - { - return default(T); - } - - - } - private R Post(string resource, P entity) - { - var json = new RestSharp.Serialization.Json.JsonSerializer(); - var jsonD = new RestSharp.Serialization.Json.JsonDeserializer(); - var request = new RestRequest(); - request.Method = Method.POST; - request.Resource = resource; - request.AddHeader("Accept", "application/json"); - request.AddHeader("Content-type", "application/json"); - request.Parameters.Clear(); - request.AddParameter("application/json; charset=utf-8", json.Serialize(entity), ParameterType.RequestBody); - //request.AddObject(entity); - var response = Client.Execute(request); - //var content = response.Content; // raw content as string - try - { - return jsonD.Deserialize(response); - } - catch (Exception) - { - return default(R); - } - - - } - -#endregion +// #region PostFix +// +// private T Post(string resource,T entity) +// { +// var json = new RestSharp.Serialization.Json.JsonSerializer(); +// var jsonD = new RestSharp.Serialization.Json.JsonDeserializer(); +// var request = new RestRequest(); +// request.Method = Method.Post; +// request.Resource = resource; +// request.AddHeader("Accept", "application/json"); +// request.AddHeader("Content-type", "application/json"); +// request.Parameters.Clear(); +// request.AddParameter("application/json; charset=utf-8", json.Serialize(entity), ParameterType.RequestBody); +// request.AddObject(entity); +// var response = Client.Execute(request); +// //var content = response.Content; // raw content as string +// try +// { +// return jsonD.Deserialize(response); +// } +// catch (Exception) +// { +// return default(T); +// } +// +// +// } +// private R Post(string resource, P entity) +// { +// var json = new RestSharp.Serialization.Json.JsonSerializer(); +// var jsonD = new RestSharp.Serialization.Json.JsonDeserializer(); +// var request = new RestRequest(); +// request.Method = Method.Post; +// request.Resource = resource; +// request.AddHeader("Accept", "application/json"); +// request.AddHeader("Content-type", "application/json"); +// request.Parameters.Clear(); +// request.AddParameter("application/json; charset=utf-8", json.Serialize(entity), ParameterType.RequestBody); +// //request.AddObject(entity); +// var response = Client.Execute(request); +// //var content = response.Content; // raw content as string +// try +// { +// return jsonD.Deserialize(response); +// } +// catch (Exception) +// { +// return default(R); +// } +// +// +// } +// +// #endregion #region WordPress public List GetEvents() { CheckToken(); - var restRequest = new RestRequest("/api/wordpress/WPEvent", Method.GET); + var restRequest = new RestRequest("/api/wordpress/WPEvent", Method.Get); var restResponse = Client.Get>(restRequest); - return restResponse.Data; + return restResponse; } public WPEventDTO GetNextEvent() { CheckToken(); - var restRequest = new RestRequest("/api/wordpress/NextEvent", Method.GET); + var restRequest = new RestRequest("/api/wordpress/NextEvent", Method.Get); var restResponse = Client.Get(restRequest); - return restResponse.Data; + return restResponse; } public string GetLastChallonge() { CheckToken(); - var restRequest = new RestRequest($"/api/wordpress/GetLastChallonge/", Method.GET); + var restRequest = new RestRequest($"/api/wordpress/GetLastChallonge/", Method.Get); var restResponse = Client.Get(restRequest); return restResponse.Content; } public string CreateChallonge(int gameId, int eventId) { CheckToken(); - var restRequest = new RestRequest($"/api/wordpress/CreateChallonge/{gameId}/{eventId}", Method.GET); + var restRequest = new RestRequest($"/api/wordpress/CreateChallonge/{gameId}/{eventId}", Method.Get); var restResponse = Client.Get(restRequest); return restResponse.Content; } public string CreateChallonge2(int gameId, int eventId, List optionalPlayers) { CheckToken(); - var restResponse = Post,string>($"/api/wordpress/CreateChallonge/{gameId}/{eventId}",optionalPlayers); + RestRequest r = + new RestRequest($"/api/wordpress/CreateChallonge/{gameId}/{eventId}").AddJsonBody(optionalPlayers); + var restResponse = Client.Post(r); return restResponse; } public bool RefreshDb() { CheckToken(); - var restRequest = new RestRequest("/api/Wordpress/UpdateDb", Method.GET); + var restRequest = new RestRequest("/api/Wordpress/UpdateDb", Method.Get); var restResponse = Client.Get(restRequest); - return restResponse.Data; + return restResponse; } public List GetUsers(int wpEventId, int gameId) { CheckToken(); - var restRequest = new RestRequest($"/api/Wordpress/GetUsers/{wpEventId}/{gameId}", Method.GET); + var restRequest = new RestRequest($"/api/Wordpress/GetUsers/{wpEventId}/{gameId}", Method.Get); var restResponse = Client.Get>(restRequest); - return restResponse.Data; + return restResponse; } public List GetUsersOptions(int wpEventId, int gameId) { CheckToken(); - var restRequest = new RestRequest($"/api/Wordpress/GetUsersOptions/{wpEventId}/{gameId}", Method.GET); + var restRequest = new RestRequest($"/api/Wordpress/GetUsersOptions/{wpEventId}/{gameId}", Method.Get); var restResponse = Client.Get>(restRequest); - return restResponse.Data; + return restResponse; } @@ -198,20 +197,21 @@ namespace LaDOSE.REST public List GetGames() { CheckToken(); - var restRequest = new RestRequest("/api/Game", Method.GET); + var restRequest = new RestRequest("/api/Game", Method.Get); var restResponse = Client.Get>(restRequest); - return restResponse.Data; + return restResponse; } public GameDTO UpdateGame(GameDTO game) { CheckToken(); - return Post("Api/Game", game); + RestRequest r = new RestRequest("Api/Game").AddJsonBody(game); + return Client.Post(r); } public bool DeleteGame(int gameId) { CheckToken(); - var restRequest = new RestRequest($"/api/Game/{gameId}", Method.DELETE); + var restRequest = new RestRequest($"/api/Game/{gameId}", Method.Delete); var restResponse = Client.Execute(restRequest); return restResponse.IsSuccessful; } @@ -227,26 +227,27 @@ namespace LaDOSE.REST public List GetTodos() { CheckToken(); - var restRequest = new RestRequest("/api/Todo", Method.GET); + var restRequest = new RestRequest("/api/Todo", Method.Get); var restResponse = Client.Get>(restRequest); - return restResponse.Data; + return restResponse; } public TodoDTO GetTodoById(int id) { CheckToken(); - var restRequest = new RestRequest($"/api/Todo/{id}", Method.GET); + var restRequest = new RestRequest($"/api/Todo/{id}", Method.Get); var restResponse = Client.Get(restRequest); - return restResponse.Data; + return restResponse; } public TodoDTO UpdateTodo(TodoDTO Todo) { CheckToken(); - return Post("Api/Todo", Todo); + var restRequest = new RestRequest($"/api/Todo/", Method.Post).AddJsonBody(Todo); + return Client.Post(restRequest); } public bool DeleteTodo(int todoId) { CheckToken(); - var restRequest = new RestRequest($"/api/Todo/{todoId}", Method.DELETE); + var restRequest = new RestRequest($"/api/Todo/{todoId}", Method.Delete); var restResponse = Client.Execute(restRequest); return restResponse.IsSuccessful; } @@ -258,9 +259,9 @@ namespace LaDOSE.REST public TournamentsResultDTO Test(string test) { CheckToken(); - var restRequest = new RestRequest($"Api/Test/Test/{test}", Method.GET); + var restRequest = new RestRequest($"Api/Test/Test/{test}", Method.Get); var restResponse = Client.Get(restRequest); - return restResponse.Data; + return restResponse; } @@ -270,14 +271,17 @@ namespace LaDOSE.REST public List GetTournaments(TimeRangeDTO timeRange) { CheckToken(); - List tournamentDtos = Post>("/api/Tournament/GetTournaments",timeRange); + RestRequest r = new RestRequest("/api/Tournament/GetTournaments").AddJsonBody(timeRange); + List tournamentDtos = Client.Post>(r); return tournamentDtos; } public TournamentsResultDTO GetResults(List ids) { + CheckToken(); - return Post,TournamentsResultDTO>("Api/Tournament/GetResults", ids); + var restRequest = new RestRequest("Api/Tournament/GetResults", Method.Post).AddJsonBody(ids); + return Client.Post(restRequest); } @@ -285,33 +289,34 @@ namespace LaDOSE.REST public bool ParseSmash(string slug) { CheckToken(); - var restRequest = new RestRequest($"Api/Tournament/ParseSmash/{slug}", Method.GET); + var restRequest = new RestRequest($"Api/Tournament/ParseSmash/{slug}", Method.Get); var restResponse = Client.Get(restRequest); - return restResponse.Data; + return restResponse; } public bool ParseChallonge(List ids) { CheckToken(); - return Post, bool>("Api/Tournament/ParseChallonge", ids); + var restRequest = new RestRequest("Api/Tournament/ParseChallonge", Method.Post).AddJsonBody(ids); + return Client.Post(restRequest); } #endregion #region Tournamenet Event / Player public List GetAllEvents() { CheckToken(); - var restRequest = new RestRequest("/api/Event", Method.GET); + var restRequest = new RestRequest("/api/Event", Method.Get); var restResponse = Client.Get>(restRequest); - return restResponse.Data; + return restResponse; } public List GetPlayers(string slug) { CheckToken(); - var restRequest = new RestRequest($"/api/Tournament/GetPLayers/{slug}", Method.GET); + var restRequest = new RestRequest($"/api/Tournament/GetPLayers/{slug}", Method.Get); var restResponse = Client.Get>(restRequest); - return restResponse.Data; + return restResponse; } #endregion @@ -321,23 +326,24 @@ namespace LaDOSE.REST public bool CreateBotEvent(string eventName) { CheckToken(); - var restRequest = new RestRequest($"/api/BotEvent/CreateBotEvent/{eventName}", Method.GET); + var restRequest = new RestRequest($"/api/BotEvent/CreateBotEvent/{eventName}", Method.Get); var restResponse = Client.Get(restRequest); - return restResponse.Data; + return restResponse; } public BotEventDTO GetLastBotEvent() { CheckToken(); - var restRequest = new RestRequest($"/api/BotEvent/GetLastBotEvent/", Method.GET); + var restRequest = new RestRequest($"/api/BotEvent/GetLastBotEvent/", Method.Get); var restResponse = Client.Post(restRequest); - return restResponse.Data; + return restResponse; } public bool ResultBotEvent(BotEventSendDTO result) { CheckToken(); - return Post("/api/BotEvent/ResultBotEvent", result); + var restRequest = new RestRequest("/api/BotEvent/ResultBotEvent", Method.Post).AddJsonBody(result); + return Client.Post(restRequest); } #endregion diff --git a/LaDOSE.Src/LaDOSE.Service/LaDOSE.Business.csproj b/LaDOSE.Src/LaDOSE.Service/LaDOSE.Business.csproj index c8bc3a1..da5cda1 100644 --- a/LaDOSE.Src/LaDOSE.Service/LaDOSE.Business.csproj +++ b/LaDOSE.Src/LaDOSE.Service/LaDOSE.Business.csproj @@ -10,6 +10,7 @@ + diff --git a/LaDOSE.Src/LaDOSE.Service/Provider/SmashProvider/Tournament.cs b/LaDOSE.Src/LaDOSE.Service/Provider/SmashProvider/Tournament.cs index 4881687..738eb10 100644 --- a/LaDOSE.Src/LaDOSE.Service/Provider/SmashProvider/Tournament.cs +++ b/LaDOSE.Src/LaDOSE.Service/Provider/SmashProvider/Tournament.cs @@ -1,4 +1,5 @@ -using System; +#nullable enable +using System; using System.Collections.Generic; using Newtonsoft.Json; using Newtonsoft.Json.Converters; diff --git a/LaDOSE.Src/LaDOSE.Service/Service/ExternalProviderService.cs b/LaDOSE.Src/LaDOSE.Service/Service/ExternalProviderService.cs index 0bf0b6e..1266a34 100644 --- a/LaDOSE.Src/LaDOSE.Service/Service/ExternalProviderService.cs +++ b/LaDOSE.Src/LaDOSE.Service/Service/ExternalProviderService.cs @@ -96,7 +96,7 @@ namespace LaDOSE.Business.Service //POKEMON. catch (Exception e) { - throw new Exception("FUCK !"); + throw new Exception($"FUCK ! {e.Message}"); } return currentEvent; } diff --git a/LaDOSE.Src/LaDOSE.Service/Service/UserService.cs b/LaDOSE.Src/LaDOSE.Service/Service/UserService.cs index 8dd39bf..a174c08 100644 --- a/LaDOSE.Src/LaDOSE.Service/Service/UserService.cs +++ b/LaDOSE.Src/LaDOSE.Service/Service/UserService.cs @@ -20,6 +20,7 @@ namespace LaDOSE.Business.Service { if (string.IsNullOrEmpty(username) || string.IsNullOrEmpty(password)) return null; + var p = _context.ApplicationUser.ToList(); var user = _context.ApplicationUser.SingleOrDefault(x => x.Username == username); // check if username exists diff --git a/LaDOSE.Src/LaDOSE.Service/Service/WordPressService.cs b/LaDOSE.Src/LaDOSE.Service/Service/WordPressService.cs index ceb6d57..9c0d473 100644 --- a/LaDOSE.Src/LaDOSE.Service/Service/WordPressService.cs +++ b/LaDOSE.Src/LaDOSE.Service/Service/WordPressService.cs @@ -46,7 +46,7 @@ namespace LaDOSE.Business.Service public bool UpdateBooking() { _context.Database.SetCommandTimeout(60); - _context.Database.ExecuteSqlCommand("call ladoseapi.ImportEvent();"); + _context.Database.ExecuteSqlRaw("call ladoseapi.ImportEvent();"); _context.Database.SetCommandTimeout(30); return true; } diff --git a/LaDOSE.Src/LaDOSE.linux.sln b/LaDOSE.Src/LaDOSE.linux.sln index 82fdfe3..96c4984 100644 --- a/LaDOSE.Src/LaDOSE.linux.sln +++ b/LaDOSE.Src/LaDOSE.linux.sln @@ -21,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{2A0E1491 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LaDOSE.REST", "LaDOSE.REST\LaDOSE.REST.csproj", "{692C2A72-AB7E-4502-BED8-AA2AFA1761CB}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LinuxTest", "LinuxTest\LinuxTest.csproj", "{0EFA533F-9657-40CE-A3A5-F4E3C6E649B1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -51,6 +53,10 @@ Global {692C2A72-AB7E-4502-BED8-AA2AFA1761CB}.Debug|Any CPU.Build.0 = Debug|Any CPU {692C2A72-AB7E-4502-BED8-AA2AFA1761CB}.Release|Any CPU.ActiveCfg = Release|Any CPU {692C2A72-AB7E-4502-BED8-AA2AFA1761CB}.Release|Any CPU.Build.0 = Release|Any CPU + {0EFA533F-9657-40CE-A3A5-F4E3C6E649B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0EFA533F-9657-40CE-A3A5-F4E3C6E649B1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0EFA533F-9657-40CE-A3A5-F4E3C6E649B1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0EFA533F-9657-40CE-A3A5-F4E3C6E649B1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -62,6 +68,7 @@ Global {952DE665-70B5-492B-BE91-D0111E3BD907} = {6FC9438E-D93E-4E63-9342-F8A966EE2D06} {61201DA6-1BC9-4BA1-AC45-70104D391ECD} = {6FC9438E-D93E-4E63-9342-F8A966EE2D06} {692C2A72-AB7E-4502-BED8-AA2AFA1761CB} = {2A0E1491-8E15-4062-ABE7-C04AE9655515} + {0EFA533F-9657-40CE-A3A5-F4E3C6E649B1} = {2A0E1491-8E15-4062-ABE7-C04AE9655515} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D47DEDD0-C906-439D-81E4-D86BBE723B8C} diff --git a/LaDOSE.Src/LinuxTest/LinuxTest.csproj b/LaDOSE.Src/LinuxTest/LinuxTest.csproj new file mode 100644 index 0000000..d8cc1c0 --- /dev/null +++ b/LaDOSE.Src/LinuxTest/LinuxTest.csproj @@ -0,0 +1,14 @@ + + + + Exe + net6.0 + enable + enable + + + + + + + diff --git a/LaDOSE.Src/LinuxTest/Program.cs b/LaDOSE.Src/LinuxTest/Program.cs new file mode 100644 index 0000000..42fd272 --- /dev/null +++ b/LaDOSE.Src/LinuxTest/Program.cs @@ -0,0 +1,19 @@ +using LaDOSE.REST; +internal class Program +{ + public static void Main(string[] args) + { + Console.WriteLine("Rest Test"); + var p = new LaDOSE.REST.RestService(); + Console.WriteLine("[+] Connect"); + + p.Connect(new Uri("http://localhost:5000/"),"dev","dev"); + Console.WriteLine("[+] Test"); + var games = p.GetGames(); + foreach (var ga in games) + { + Console.WriteLine(ga.Name); + } + + } +} \ No newline at end of file