Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-05-31 13:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Game now relies on external auth to connect properly

Browse source
This commit is contained in:
jvyden 2021-11-21 21:39:34 -05:00
parent d33670060b
commit 787f9f7362
No known key found for this signature in database
GPG key ID: 18BCF2BE0262B278
6 changed files with 70 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ProjectLighthouse/Database.cs
View file

@ -89,36 +89,46 @@ namespace LBPUnion.ProjectLighthouse
#region Game Token Shenanigans
public async Task<User?> UserFromMMAuth(string authToken)
public async Task<User?> UserFromMMAuth(string authToken, bool allowUnapproved = false)
{
GameToken? token = await this.GameTokens.FirstOrDefaultAsync(t => t.UserToken == authToken);
if (token == null) return null;
if (!allowUnapproved && !token.Approved) return null;
return await this.Users.Include(u => u.Location).FirstOrDefaultAsync(u => u.UserId == token.UserId);
}
public async Task<User?> UserFromGameToken(GameToken gameToken) => await this.UserFromMMAuth(gameToken.UserToken);
public async Task<User?> UserFromGameToken
(GameToken gameToken, bool allowUnapproved = false)
=> await this.UserFromMMAuth(gameToken.UserToken, allowUnapproved);
public async Task<User?> UserFromGameRequest(HttpRequest request)
public async Task<User?> UserFromGameRequest(HttpRequest request, bool allowUnapproved = false)
{
if (!request.Cookies.TryGetValue("MM_AUTH", out string? mmAuth) || mmAuth == null) return null;
return await this.UserFromMMAuth(mmAuth);
return await this.UserFromMMAuth(mmAuth, allowUnapproved);
}
public async Task<GameToken?> GameTokenFromRequest(HttpRequest request)
public async Task<GameToken?> GameTokenFromRequest(HttpRequest request, bool allowUnapproved = false)
{
if (!request.Cookies.TryGetValue("MM_AUTH", out string? mmAuth) || mmAuth == null) return null;
return await this.GameTokens.FirstOrDefaultAsync(t => t.UserToken == mmAuth);
GameToken? token = await this.GameTokens.FirstOrDefaultAsync(t => t.UserToken == mmAuth);
if (token == null) return null;
if (!allowUnapproved && !token.Approved) return null;
return token;
}
public async Task<(User, GameToken)?> UserAndGameTokenFromRequest(HttpRequest request)
public async Task<(User, GameToken)?> UserAndGameTokenFromRequest(HttpRequest request, bool allowUnapproved = false)
{
if (!request.Cookies.TryGetValue("MM_AUTH", out string? mmAuth) || mmAuth == null) return null;
GameToken? token = await this.GameTokens.FirstOrDefaultAsync(t => t.UserToken == mmAuth);
if (token == null) return null;
if (!allowUnapproved && !token.Approved) return null;
User? user = await this.UserFromGameToken(token);