Skip to content

Commit 4b4e55a

Browse files
committed
fix: Fix refresh and retry logic
1 parent f4c5641 commit 4b4e55a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Runtime/Client/LootLockerHTTPClient.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ private HTTPExecutionQueueProcessingResult ProcessOngoingRequest(LootLockerHTTPE
459459

460460
var playerData = LootLockerStateData.GetStateForPlayerOrDefaultStateOrEmpty(executionItem.RequestData.ForPlayerWithUlid);
461461

462-
if (ShouldRetryRequest(executionItem.WebRequest.responseCode, executionItem.RequestData.TimesRetried, playerData == null ? LL_AuthPlatforms.None : playerData.CurrentPlatform.Platform) && !(executionItem.WebRequest.responseCode == 401 && !IsAuthorizedRequest(executionItem)))
462+
if (ShouldRetryRequest(executionItem.WebRequest.responseCode, executionItem.RequestData.TimesRetried) && !(executionItem.WebRequest.responseCode == 401 && !IsAuthorizedRequest(executionItem)))
463463
{
464464
if (ShouldRefreshSession(executionItem.WebRequest.responseCode, playerData == null ? LL_AuthPlatforms.None : playerData.CurrentPlatform.Platform) && (CanRefreshUsingRefreshToken(executionItem.RequestData) || CanStartNewSessionUsingCachedAuthData(executionItem.RequestData.ForPlayerWithUlid)))
465465
{
@@ -723,14 +723,14 @@ private void HandleSessionRefreshResult(LootLockerResponse newSessionResponse, s
723723

724724
#region Session Refresh Helper Methods
725725

726-
private static bool ShouldRetryRequest(long statusCode, int timesRetried, LL_AuthPlatforms platform)
726+
private static bool ShouldRetryRequest(long statusCode, int timesRetried)
727727
{
728-
return (statusCode == 401 || statusCode == 403 || statusCode == 502 || statusCode == 500 || statusCode == 503) && LootLockerConfig.current.allowTokenRefresh && platform != LL_AuthPlatforms.Steam && timesRetried < configuration.MaxRetries;
728+
return (statusCode == 401 || statusCode == 403 || statusCode == 502 || statusCode == 500 || statusCode == 503) && timesRetried < configuration.MaxRetries;
729729
}
730730

731731
private static bool ShouldRefreshSession(long statusCode, LL_AuthPlatforms platform)
732732
{
733-
return (statusCode == 401 || statusCode == 403) && LootLockerConfig.current.allowTokenRefresh && platform != LL_AuthPlatforms.Steam;
733+
return (statusCode == 401 || statusCode == 403) && LootLockerConfig.current.allowTokenRefresh && !new List<LL_AuthPlatforms>{ LL_AuthPlatforms.Steam, LL_AuthPlatforms.NintendoSwitch, LL_AuthPlatforms.None }.Contains(platform);
734734
}
735735

736736
private static bool IsAuthorizedRequest(LootLockerHTTPExecutionQueueItem request)

0 commit comments

Comments
 (0)