diff --git a/.gitignore b/.gitignore index 76523bb..572969d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ src/mods/ src/assets-cache/ src/Properties __pycache__/ +src/assets/conf/WIN/3.31.0/DWADragonsMain.xml diff --git a/src/Controllers/Common/AuthenticationController.cs b/src/Controllers/Common/AuthenticationController.cs index 11e7902..c1df62e 100644 --- a/src/Controllers/Common/AuthenticationController.cs +++ b/src/Controllers/Common/AuthenticationController.cs @@ -62,7 +62,7 @@ public class AuthenticationController : Controller { if(userBan is not null) { if (userBan.BanType != UserBanType.IndefiniteSuspension && DateTime.Compare(DateTime.UtcNow, userBan.EndsAt!.Value) >= 0) { moderationService.RemoveBanFromUser(user, userBan); userBan.EndsAt = DateTime.UtcNow; } // remove ban if its up and set retreived userban to have an end date of now if (userBan.BanType == UserBanType.IndefiniteSuspension || (userBan.BanType == UserBanType.TemporarySuspension && DateTime.Compare(DateTime.UtcNow, userBan.EndsAt!.Value) < 0)) { - if (gameVersion <= ClientVersion.Max_OldJS) return Ok(new ParentLoginInfo{ Status = MembershipUserStatus.ProviderError }); + if (gameVersion <= ClientVersion.Max_OldJS) return Ok(new ParentLoginInfo{ Status = MembershipUserStatus.ProviderError }); // everything 'OldJS' doesn't have 'UserIsBanned', so we use 'ProviderError' i else return Ok(new ParentLoginInfo{ Status = MembershipUserStatus.UserIsBanned }); }; } @@ -162,6 +162,7 @@ public class AuthenticationController : Controller { Viking? viking = ctx.Sessions.FirstOrDefault(e => e.ApiToken == apiToken)?.Viking; if (user is null && viking is null) return Ok(false); + return Ok(true); } @@ -175,6 +176,7 @@ public class AuthenticationController : Controller { Viking? viking = ctx.Sessions.FirstOrDefault(e => e.ApiToken == apiToken)?.Viking; if (user is null && viking is null) return Ok(ApiTokenStatus.TokenNotFound); + return Ok(ApiTokenStatus.TokenValid); } diff --git a/src/assets/conf/WIN/3.31.0/DWADragonsMain.xml b/src/assets/conf/WIN/3.31.0/DWADragonsMain.xml index fa60723..c8848c7 100644 --- a/src/assets/conf/WIN/3.31.0/DWADragonsMain.xml +++ b/src/assets/conf/WIN/3.31.0/DWADragonsMain.xml @@ -67,13 +67,13 @@ - http://localhost:5001/.com/DWADragonsUnity/WIN/{Version}/Mid/ - http://localhost:5001/.com/DWADragonsUnity/WIN/{Version}/Mid/contentdata - http://localhost:5001/.com/DWADragonsUnity/WIN/{Version}/Mid/data - http://localhost:5001/.com/DWADragonsUnity/WIN/{Version}/Mid/scene - http://localhost:5001/.com/DWADragonsUnity/WIN/{Version}/Mid/shareddata - http://localhost:5001/.com/DWADragonsUnity/WIN/{Version}/Mid/sound - http://localhost:5001/.com/DWADragonsUnity/WIN/{Version}/Mid/movies + https://sodoff.com/DWADragonsUnity/WIN/{Version}/Mid/ + https://sodoff.com/DWADragonsUnity/WIN/{Version}/Mid/contentdata + https://sodoff.com/DWADragonsUnity/WIN/{Version}/Mid/data + https://sodoff.com/DWADragonsUnity/WIN/{Version}/Mid/scene + https://sodoff.com/DWADragonsUnity/WIN/{Version}/Mid/shareddata + https://sodoff.com/DWADragonsUnity/WIN/{Version}/Mid/sound + https://sodoff.com/DWADragonsUnity/WIN/{Version}/Mid/movies . ./contentdata