Merge pull request #12 from eclipserporg/feature/add_fake_server

Restructure project, implement fake server

Apis/IServerDiscordApi.cs → DiscordBot.App/Apis/IServerDiscordApi.cs

@@ -1,7 +1,7 @@
-using app.Models;
+using DiscordBot.Models;
 using Refit;
 
-namespace app.Apis;
+namespace DiscordBot.Apis;
 
 public interface IServerDiscordApi
 {

Commands/GeneralCommands.cs → DiscordBot.App/Commands/GeneralCommands.cs

@@ -1,12 +1,12 @@
-using app.Apis;
-using app.Services;
+using DiscordBot.Apis;
+using DiscordBot.Services;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
 using DSharpPlus.Entities;
 using DSharpPlus.SlashCommands;
 using Serilog;
 
-namespace app.Commands;
+namespace DiscordBot.Commands;
 
 public class GeneralCommands : ApplicationCommandModule
 {

Commands/RestartCommands.cs → DiscordBot.App/Commands/RestartCommands.cs

@@ -1,9 +1,9 @@
-using app.Apis;
-using app.Services;
+using DiscordBot.Apis;
+using DiscordBot.Services;
 using DSharpPlus.Entities;
 using Serilog;
 
-namespace app.Commands;
+namespace DiscordBot.Commands;
 using DSharpPlus.SlashCommands;
 
 public class RestartCommands : ApplicationCommandModule

Controllers/DiscordController.cs → DiscordBot.App/Controllers/DiscordController.cs

@@ -1,10 +1,10 @@
-using app.Models;
-using app.Services;
+using DiscordBot.Models;
+using DiscordBot.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Serilog;
 
-namespace app.Controllers;
+namespace DiscordBot.Controllers;
 
 [ApiController]
 [Authorize]

Controllers/FeedsController.cs → DiscordBot.App/Controllers/FeedsController.cs

@@ -1,9 +1,9 @@
-using app.Services;
+using DiscordBot.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Serilog;
 
-namespace app.Controllers;
+namespace DiscordBot.Controllers;
 
 [ApiController]
 [Authorize]

Controllers/PresenceController.cs → DiscordBot.App/Controllers/PresenceController.cs

@@ -1,10 +1,10 @@
-using app.Services;
+using DiscordBot.Services;
 using DSharpPlus.Entities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Serilog;
 
-namespace app.Controllers;
+namespace DiscordBot.Controllers;
 
 [ApiController]
 [Authorize]

app.csproj → DiscordBot.App/DiscordBot.App.csproj

@@ -26,4 +26,8 @@
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\DiscordBot.Data\DiscordBot.Data.csproj" />
+  </ItemGroup>
+
 </Project>

Middlewares/BasicAuthenticationHandler.cs → DiscordBot.App/Middlewares/BasicAuthenticationHandler.cs

@@ -1,11 +1,11 @@
-using app.Models;
+using DiscordBot.Models;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Options;
 using System.Security.Claims;
 using System.Text;
 using System.Text.Encodings.Web;
 
-namespace app.Middlewares;
+namespace DiscordBot.Middlewares;
 
 public class BasicAuthenticationHandler : AuthenticationHandler<AuthenticationSchemeOptions>
 {

Program.cs → DiscordBot.App/Program.cs

@@ -1,8 +1,8 @@
-using app.Services;
-using app.Settings;
-using app;
-using app.Models;
-using app.Middlewares;
+using DiscordBot.Services;
+using DiscordBot.Settings;
+using DiscordBot;
+using DiscordBot.Models;
+using DiscordBot.Middlewares;
 using Microsoft.AspNetCore.Authentication;
 using Serilog;
 
@@ -17,8 +17,6 @@
 var serverApiSettings = new ServerApiSettings();
 builder.Configuration.GetSection(nameof(ServerApiSettings)).Bind(serverApiSettings);
 
-
-
 builder.Services.Configure<DiscordSettings>(options => builder.Configuration.GetSection(nameof(DiscordSettings)).Bind(options));
 builder.Services.Configure<ServerApiSettings>(options => builder.Configuration.GetSection(nameof(ServerApiSettings)).Bind(options));
 builder.Services.Configure<Credentials>(options => builder.Configuration.GetSection(nameof(Credentials)).Bind(options));
@@ -31,6 +29,7 @@
 builder.Services.AddSingleton<RunnerService>();
 builder.Services.AddSingleton<GuildJoinService>();
 builder.Services.AddHostedService(provider => provider.GetService<RunnerService>());
+
 builder.Services.AddAuthentication("BasicAuthentication")
         .AddScheme<AuthenticationSchemeOptions, BasicAuthenticationHandler>("BasicAuthentication", null);
 

ServiceExtensions.cs → DiscordBot.App/ServiceExtensions.cs

@@ -1,11 +1,11 @@
-using app.Apis;
-using app.Settings;
+using DiscordBot.Apis;
+using DiscordBot.Settings;
 using Microsoft.OpenApi.Models;
 using Refit;
 using System.Net.Http.Headers;
 using System.Text;
 
-namespace app;
+namespace DiscordBot;
 
 public static class ServiceExtensions
 {

Services/DiscordService.cs → DiscordBot.App/Services/DiscordService.cs

@@ -1,14 +1,14 @@
-using app.Settings;
+using DiscordBot.Settings;
 using DSharpPlus;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.Entities;
-using app.Commands;
+using DiscordBot.Commands;
 using Serilog;
 using DSharpPlus.EventArgs;
 using Microsoft.Extensions.Options;
 using DSharpPlus.SlashCommands;
 
-namespace app.Services;
+namespace DiscordBot.Services;
 
 public class DiscordService
 {

Services/GuildJoinService.cs → DiscordBot.App/Services/GuildJoinService.cs

@@ -1,8 +1,8 @@
-using app.Apis;
+using DiscordBot.Apis;
 using DSharpPlus;
 using DSharpPlus.EventArgs;
 
-namespace app.Services;
+namespace DiscordBot.Services;
 
 public class GuildJoinService
 {

Services/LoginService.cs → DiscordBot.App/Services/LoginService.cs

@@ -1,8 +1,8 @@
-using app.Apis;
+using DiscordBot.Apis;
 using DSharpPlus;
 using DSharpPlus.EventArgs;
 
-namespace app.Services;
+namespace DiscordBot.Services;
 
 public class LoginService
 {

Services/RunnerService.cs → DiscordBot.App/Services/RunnerService.cs

@@ -1,8 +1,8 @@
-using app.Apis;
+using DiscordBot.Apis;
 using DSharpPlus.Entities;
 using Serilog;
 
-namespace app.Services;
+namespace DiscordBot.Services;
 
 public class RunnerService : BackgroundService
 {

Settings/DiscordSettings.cs → DiscordBot.App/Settings/DiscordSettings.cs

@@ -1,4 +1,4 @@
-namespace app.Settings;
+namespace DiscordBot.Settings;
 
 public class Roles
 {

Settings/ServerApiSettings.cs → DiscordBot.App/Settings/ServerApiSettings.cs

@@ -1,4 +1,4 @@
-namespace app.Settings;
+namespace DiscordBot.Settings;
 
 public class ServerApiSettings
 {

appsettings.json → DiscordBot.App/appsettings.json

@@ -11,7 +11,7 @@
     "Password": "your_password"
   },
   "ServerApiSettings": {
-    "Url": "http://localhost:9696/api/",
+    "Url": "http://localhost:9697/",
     "Username": "admin",
     "Password": "test"
   },

DiscordBot.Data/DiscordBot.Data.csproj

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

Models/Credentials.cs → DiscordBot.Data/Models/Credentials.cs

@@ -1,4 +1,4 @@
-namespace app.Models;
+namespace DiscordBot.Models;
 
 public class Credentials
 {

Models/DiscordUserDto.cs → DiscordBot.Data/Models/DiscordUserDto.cs

@@ -1,4 +1,4 @@
-namespace app.Models;
+namespace DiscordBot.Models;
 
 public class DiscordUserDto
 {

Models/ResponsePairDto.cs → DiscordBot.Data/Models/ResponsePairDto.cs

@@ -1,4 +1,4 @@
-namespace app.Models;
+namespace DiscordBot.Models;
 
 public class ResponsePairDto
 {

DiscordBot.FakeServer/Controllers/ServerController.cs

@@ -0,0 +1,74 @@
+using DiscordBot.Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace DiscordBot.FakeServer.Controllers;
+
+[ApiController]
+[Authorize]
+[Route("[action]")]
+public class ServerController : ControllerBase
+{
+    [HttpPost("/remove-read-only")]
+    public bool PostRemoveReadOnly(string channel, ulong senderId, string senderName, ulong targetId, string targetName)
+    {
+        return true;
+    }
+
+    [HttpPost("/read-only")]
+    public bool PostReadOnly(string channel, ulong senderId, string senderName, ulong targetId, string targetName, string reason)
+    {
+        return true;
+    }
+
+    [HttpGet("/apps")]
+    public string GetApps()
+    {
+        return "Currently no apps...";
+    }
+
+    [HttpGet("/account-status")]
+    public string GetAccountStatus(ulong id)
+    {
+        return "[]";
+    }
+
+    [HttpPost("/announce")]
+    public void PostAnnouncement(string text)
+    {
+    }
+
+    [HttpPost("/save")]
+    public bool PostSave()
+    {
+        return true;
+    }
+
+    [HttpGet("/ping")]
+    public bool GetPing()
+    {
+        return true;
+    }
+
+    [HttpPost("/kick")]
+    public bool PostKick(string channel, ulong senderId, string senderName, ulong targetId, string targetName, string reason)
+    {
+        return true;
+    }
+
+    [HttpPost("/ban")]
+    public bool PostBan(string channel, ulong senderId, string senderName, ulong targetId, string targetName, string reason)
+    {
+        return true;
+    }
+
+    [HttpPost("/login")]
+    public ResponsePairDto PostLogin(string name, ulong id, string username, string discriminator, string avatarurl, string password)
+    {
+        return new ResponsePairDto()
+        {
+            Message = "Success",
+            Status = true
+        };
+    }
+}

DiscordBot.FakeServer/DiscordBot.FakeServer.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.13" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DiscordBot.Data\DiscordBot.Data.csproj" />
+  </ItemGroup>
+
+</Project>

DiscordBot.FakeServer/Middlewares/BasicAuthenticationHandler.cs

@@ -0,0 +1,51 @@
+using DiscordBot.Models;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.Extensions.Options;
+using System.Security.Claims;
+using System.Text;
+using System.Text.Encodings.Web;
+
+namespace DiscordBot.Middlewares;
+
+public class BasicAuthenticationHandler : AuthenticationHandler<AuthenticationSchemeOptions>
+{
+    private readonly IConfiguration _configuration;
+    private readonly Credentials _credentials;
+
+    public BasicAuthenticationHandler(
+        IOptionsMonitor<AuthenticationSchemeOptions> options,
+        ILoggerFactory logger,
+        UrlEncoder encoder,
+        ISystemClock clock,
+        IOptions<Credentials> credentials,
+        IConfiguration configuration) : base(options, logger, encoder, clock)
+    {
+        _configuration = configuration;
+        _credentials = credentials.Value;
+    }
+
+    protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
+    {
+        string authHeader = Request.Headers["Authorization"];
+        if (authHeader != null && authHeader.StartsWith("Basic", StringComparison.InvariantCultureIgnoreCase))
+        {
+
+            var authHeaderValue = authHeader.Replace("Basic ", "", StringComparison.InvariantCultureIgnoreCase);
+            var decodedAuthHeaderValue = Encoding.UTF8.GetString(Convert.FromBase64String(authHeaderValue));
+            var userPassArray = decodedAuthHeaderValue.Split(":");
+            var extractedUsername = userPassArray[0];
+            var extractedPassword = userPassArray[1];
+
+            if (string.Equals(_credentials.Username, extractedUsername) && string.Equals(extractedPassword, _credentials.Password))
+            {
+                var claims = new[] { new Claim(ClaimTypes.Name, _credentials.Username) };
+                var identity = new ClaimsIdentity(claims, Scheme.Name);
+                var principal = new ClaimsPrincipal(identity);
+                var ticket = new AuthenticationTicket(principal, Scheme.Name);
+
+                return AuthenticateResult.Success(ticket);
+            }
+        }
+        return AuthenticateResult.Fail("Failed to authenticate");
+    }
+}