Lightless-Sync/LightlessServer
8
0
Fork 0
Code Issues 3 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Banner Support for profiles, Some cleanup/refactoring. Country for metrics. #22

Merged
defnotken merged 13 commits from server-changes into master 2025-10-21 20:50:55 +00:00
Conversation 1 Commits 13 Files Changed 25 +4 -8
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e61e0db36b - Show all commits

6
LightlessSyncServer/LightlessSyncAuthService/Controllers/AuthControllerBase.cs
View File

@@ -100,15 +100,15 @@ public abstract class AuthControllerBase : Controller
protected async Task<IActionResult> CreateJwtFromId(string uid, string charaIdent, string alias)
{
var token = CreateJwt(new List<Claim>()
{
var token = CreateJwt(
[
new Claim(LightlessClaimTypes.Uid, uid),
new Claim(LightlessClaimTypes.CharaIdent, charaIdent),
new Claim(LightlessClaimTypes.Alias, alias),
new Claim(LightlessClaimTypes.Expires, DateTime.UtcNow.AddHours(6).Ticks.ToString(CultureInfo.InvariantCulture)),
new Claim(LightlessClaimTypes.Continent, await _geoIPProvider.GetContinentFromIP(HttpAccessor)),
new Claim(LightlessClaimTypes.Country, await _geoIPProvider.GetCountryFromIP(HttpAccessor)),
});
]);
return Content(token.RawData);
}

6
LightlessSyncServer/LightlessSyncAuthService/Services/GeoIPService.cs
View File

@@ -162,12 +162,8 @@ public class GeoIPService : IHostedService
if (_dbReader!.TryCity(ip, out var response))
{
_logger.LogWarning(ip.ToString());
_logger.LogWarning(response?.Country?.ToString());
_logger.LogWarning(response?.Country?.IsoCode);
var country = response?.Country?.IsoCode;
return !string.IsNullOrEmpty(country) ? country : "*";
return country ?? "*";
}
return "*";