Moonlight-Panel/Moonlight
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Merge pull request #106 from Moonlight-Panel/DiscordBot"

Browse Source 
This reverts commit f71fcc0f5d, reversing
changes made to e0bea9b61c.
This commit is contained in:
Marcel Baumgartner
2023-04-29 23:37:03 +02:00
parent f71fcc0f5d
commit ca64184faf
152 changed files with 9159 additions and 3251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Moonlight/App/Http/Controllers/Api/Moonlight/OAuth2Controller.cs
View File

@@ -18,17 +18,19 @@ public class OAuth2Controller : Controller
private readonly DiscordOAuth2Service DiscordOAuth2Service;
private readonly UserRepository UserRepository;
private readonly UserService UserService;
private readonly DateTimeService DateTimeService;
public OAuth2Controller(
GoogleOAuth2Service googleOAuth2Service,
UserRepository userRepository,
UserService userService,
DiscordOAuth2Service discordOAuth2Service)
DiscordOAuth2Service discordOAuth2Service, DateTimeService dateTimeService)
{
GoogleOAuth2Service = googleOAuth2Service;
UserRepository = userRepository;
UserService = userService;
DiscordOAuth2Service = discordOAuth2Service;
DateTimeService = dateTimeService;
}
[HttpGet("google")]
@@ -63,7 +65,7 @@ public class OAuth2Controller : Controller
Response.Cookies.Append("token", token, new ()
{
Expires = new DateTimeOffset(DateTime.UtcNow.AddDays(10))
Expires = new DateTimeOffset(DateTimeService.GetCurrent().AddDays(10))
});
return Redirect("/");
@@ -121,7 +123,7 @@ public class OAuth2Controller : Controller
Response.Cookies.Append("token", token, new ()
{
Expires = new DateTimeOffset(DateTime.UtcNow.AddDays(10))
Expires = new DateTimeOffset(DateTimeService.GetCurrent().AddDays(10))
});
return Redirect("/");

13
Moonlight/App/Http/Controllers/Api/Remote/BackupController.cs
View File

@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using Moonlight.App.Events;
using Moonlight.App.Http.Requests.Wings;
using Moonlight.App.Repositories;
using Moonlight.App.Repositories.Servers;
@@ -11,17 +12,17 @@ namespace Moonlight.App.Http.Controllers.Api.Remote;
public class BackupController : Controller
{
private readonly ServerBackupRepository ServerBackupRepository;
private readonly MessageService MessageService;
private readonly EventSystem Event;
private readonly NodeRepository NodeRepository;
public BackupController(
ServerBackupRepository serverBackupRepository,
NodeRepository nodeRepository,
MessageService messageService)
EventSystem eventSystem)
{
ServerBackupRepository = serverBackupRepository;
NodeRepository = nodeRepository;
MessageService = messageService;
Event = eventSystem;
}
[HttpGet("{uuid}")]
@@ -57,11 +58,11 @@ public class BackupController : Controller
ServerBackupRepository.Update(backup);
await MessageService.Emit($"wings.backups.create", backup);
await Event.Emit($"wings.backups.create", backup);
}
else
{
await MessageService.Emit($"wings.backups.createfailed", backup);
await Event.Emit($"wings.backups.createFailed", backup);
ServerBackupRepository.Delete(backup);
}
@@ -88,7 +89,7 @@ public class BackupController : Controller
if (backup == null)
return NotFound();
await MessageService.Emit($"wings.backups.restore", backup);
await Event.Emit($"wings.backups.restore", backup);
return NoContent();
}

9
Moonlight/App/Http/Controllers/Api/Remote/DdosController.cs
View File

@@ -1,6 +1,7 @@
using Logging.Net;
using Microsoft.AspNetCore.Mvc;
using Moonlight.App.Database.Entities;
using Moonlight.App.Events;
using Moonlight.App.Http.Requests.Daemon;
using Moonlight.App.Repositories;
using Moonlight.App.Services;
@@ -12,13 +13,13 @@ namespace Moonlight.App.Http.Controllers.Api.Remote;
public class DdosController : Controller
{
private readonly NodeRepository NodeRepository;
private readonly MessageService MessageService;
private readonly EventSystem Event;
private readonly DdosAttackRepository DdosAttackRepository;
public DdosController(NodeRepository nodeRepository, MessageService messageService, DdosAttackRepository ddosAttackRepository)
public DdosController(NodeRepository nodeRepository, EventSystem eventSystem, DdosAttackRepository ddosAttackRepository)
{
NodeRepository = nodeRepository;
MessageService = messageService;
Event = eventSystem;
DdosAttackRepository = ddosAttackRepository;
}
@@ -47,7 +48,7 @@ public class DdosController : Controller
ddosAttack = DdosAttackRepository.Add(ddosAttack);
await MessageService.Emit("node.ddos", ddosAttack);
await Event.Emit("node.ddos", ddosAttack);
return Ok();
}

19
Moonlight/App/Http/Controllers/Api/Remote/ServersController.cs
View File

@@ -1,5 +1,6 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using Moonlight.App.Events;
using Moonlight.App.Helpers;
using Moonlight.App.Http.Resources.Wings;
using Moonlight.App.Repositories;
@@ -15,18 +16,18 @@ public class ServersController : Controller
private readonly WingsServerConverter Converter;
private readonly ServerRepository ServerRepository;
private readonly NodeRepository NodeRepository;
private readonly MessageService MessageService;
private readonly EventSystem Event;
public ServersController(
WingsServerConverter converter,
ServerRepository serverRepository,
NodeRepository nodeRepository,
MessageService messageService)
EventSystem eventSystem)
{
Converter = converter;
ServerRepository = serverRepository;
NodeRepository = nodeRepository;
MessageService = messageService;
Event = eventSystem;
}
[HttpGet]
@@ -68,7 +69,7 @@ public class ServersController : Controller
totalPages = slice.Length - 1;
}
await MessageService.Emit($"wings.{node.Id}.serverlist", node);
await Event.Emit($"wings.{node.Id}.serverList", node);
//Logger.Debug($"[BRIDGE] Node '{node.Name}' is requesting server list page {page} with {perPage} items per page");
@@ -97,7 +98,7 @@ public class ServersController : Controller
if (token != node.Token)
return Unauthorized();
await MessageService.Emit($"wings.{node.Id}.statereset", node);
await Event.Emit($"wings.{node.Id}.stateReset", node);
foreach (var server in ServerRepository
.Get()
@@ -136,7 +137,7 @@ public class ServersController : Controller
if (server == null)
return NotFound();
await MessageService.Emit($"wings.{node.Id}.serverfetch", server);
await Event.Emit($"wings.{node.Id}.serverFetch", server);
try //TODO: Remove
{
@@ -169,7 +170,7 @@ public class ServersController : Controller
if (server == null)
return NotFound();
await MessageService.Emit($"wings.{node.Id}.serverinstallfetch", server);
await Event.Emit($"wings.{node.Id}.serverInstallFetch", server);
return new WingsServerInstall()
{
@@ -202,8 +203,8 @@ public class ServersController : Controller
server.Installing = false;
ServerRepository.Update(server);
await MessageService.Emit($"wings.{node.Id}.serverinstallcomplete", server);
await MessageService.Emit($"server.{server.Uuid}.installcomplete", server);
await Event.Emit($"wings.{node.Id}.serverInstallComplete", server);
await Event.Emit($"server.{server.Uuid}.installComplete", server);
return Ok();
}