Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-07-29 16:38:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Small fixup and fix unit test conflicts

Browse source
This commit is contained in:
FeTetra 2025-02-17 22:06:23 -05:00
commit 3fb1441ac1
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ProjectLighthouse.Servers.GameServer/Controllers/MessageController.cs
View file

@ -57,7 +57,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.";
UserEntity? user = await this.database.UserFromGameToken(token); UserEntity? user = await this.database.UserFromGameToken(token);
StringBuilder announceText = new(ServerConfiguration.Instance.AnnounceText + "\n\n"); StringBuilder announceText = new(ServerConfiguration.Instance.AnnounceText);
announceText.Replace("%user", user.Username); announceText.Replace("%user", user.Username);
announceText.Replace("%id", token.UserId.ToString()); announceText.Replace("%id", token.UserId.ToString());
@ -69,7 +69,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.";
if (EmailEnforcementConfiguration.Instance.EnableEmailEnforcement) if (EmailEnforcementConfiguration.Instance.EnableEmailEnforcement)
{ {
announceText.Append(BaseLayoutStrings.EmailEnforcementWarnMain.Translate(LocalizationManager.DefaultLang) + "\n\n"); announceText.Append("\n\n" + BaseLayoutStrings.EmailEnforcementWarnMain.Translate(LocalizationManager.DefaultLang) + "\n\n");
if (user.EmailAddress == null) if (user.EmailAddress == null)
{ {
@ -148,7 +148,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.";
if (!SMTPHelper.IsValidEmail(this.database, email)) return this.BadRequest(); if (!SMTPHelper.IsValidEmail(this.database, email)) return this.BadRequest();
UserEntity? user = await this.database.UserFromGameToken(token); UserEntity? user = await this.database.UserFromGameToken(token);
if (user == null || user.EmailAddressVerified) return this.Ok(); if (user == null || user.EmailAddressVerified) return this.BadRequest();
user.EmailAddress = email; user.EmailAddress = email;
await SMTPHelper.SendVerificationEmail(this.database, mailService, user); await SMTPHelper.SendVerificationEmail(this.database, mailService, user);

6
ProjectLighthouse.Servers.GameServer/Middlewares/EmailEnforcementMiddleware.cs
View file

@ -14,13 +14,13 @@ public class EmailEnforcementMiddleware : MiddlewareDBContext
{ } { }
public override async Task InvokeAsync(HttpContext context, DatabaseContext database) public override async Task InvokeAsync(HttpContext context, DatabaseContext database)
{
if (EmailEnforcementConfiguration.Instance.EnableEmailEnforcement)
{ {
// Split path into segments // Split path into segments
string[] pathSegments = context.Request.Path.ToString().Split("/", StringSplitOptions.RemoveEmptyEntries); string[] pathSegments = context.Request.Path.ToString().Split("/", StringSplitOptions.RemoveEmptyEntries);
if (pathSegments[0] == "LITTLEBIGPLANETPS3_XML") if (pathSegments[0] == "LITTLEBIGPLANETPS3_XML")
{
if (EmailEnforcementConfiguration.Instance.EnableEmailEnforcement)
{ {
// Get user via GameToken // Get user via GameToken
GameTokenEntity? token = await database.GameTokenFromRequest(context.Request); GameTokenEntity? token = await database.GameTokenFromRequest(context.Request);
@ -35,7 +35,7 @@ public class EmailEnforcementMiddleware : MiddlewareDBContext
if (user == null) if (user == null)
{ {
// Send bad request status // Send bad request status
context.Response.StatusCode = StatusCodes.Status400BadRequest; context.Response.StatusCode = StatusCodes.Status403Forbidden;
await context.Response.WriteAsync("Not a valid user"); await context.Response.WriteAsync("Not a valid user");
// Don't go to next in pipeline // Don't go to next in pipeline

6
ProjectLighthouse.Tests.GameApiTests/Unit/Controllers/MessageControllerTests.cs
View file

@ -224,7 +224,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>." + "\nuni
IActionResult result = await messageController.Filter(mailMock.Object); IActionResult result = await messageController.Filter(mailMock.Object);
Assert.IsType<OkResult>(result); Assert.IsType<BadRequestResult>(result);
mailMock.Verify(x => x.SendEmailAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()), Times.Never); mailMock.Verify(x => x.SendEmailAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()), Times.Never);
} }
@ -249,7 +249,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>." + "\nuni
IActionResult result = await messageController.Filter(mailMock.Object); IActionResult result = await messageController.Filter(mailMock.Object);
Assert.IsType<OkResult>(result); Assert.IsType<BadRequestResult>(result);
mailMock.Verify(x => x.SendEmailAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()), Times.Never); mailMock.Verify(x => x.SendEmailAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()), Times.Never);
} }
@ -271,7 +271,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>." + "\nuni
IActionResult result = await messageController.Filter(mailMock.Object); IActionResult result = await messageController.Filter(mailMock.Object);
Assert.IsType<OkResult>(result); Assert.IsType<BadRequestResult>(result);
mailMock.Verify(x => x.SendEmailAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()), Times.Never); mailMock.Verify(x => x.SendEmailAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()), Times.Never);
} }
} }