Merge pull request #13 from LootLocker/refresh-token-fix

Fix for Token refresh

Author: TobiasBerg

Runtime/Client/LootLockerBaseServerAPI.cs

@@ -156,11 +156,8 @@ IEnumerator coroutine()
                                 break;
                         }
 
-                        LootLockerSDKManager.DebugMessage("Response code: " + webRequest.responseCode);
-
-              
-                        if ((webRequest.responseCode == 401 || webRequest.responseCode == 403) && LootLockerConfig.current.allowTokenRefresh && LootLockerConfig.current.platform != LootLockerConfig.platformType.Steam
-                            && tries < maxRetry) 
+                        bool isSteam = LootLockerSDKManager.GetCurrentPlatform() == "steam";
+                        if ((webRequest.responseCode == 401 || webRequest.responseCode == 403) && LootLockerConfig.current.allowTokenRefresh && !isSteam && tries < maxRetry) 
                         {
                             tries++;
                             LootLockerSDKManager.DebugMessage("Refreshing Token, Since we could not find one. If you do not want this please turn off in the lootlocker config settings");

Runtime/Game/LootLockerGameServerAPI.cs

@@ -7,9 +7,6 @@
 
 namespace LootLocker
 {
-    /// <summary>
-    /// made for user, relay on playtime coroutines
-    /// </summary>
     public class LootLockerGameServerAPI : LootLockerBaseServerAPI
     {
         public new static LootLockerGameServerAPI I;
@@ -28,9 +25,22 @@ public static void Init(LootLockerServerManager serverManager)
 
         protected override void RefreshTokenAndCompleteCall(LootLockerServerRequest cacheServerRequest, Action<LootLockerResponse> OnServerResponse)
         {
-            if (LootLockerConfig.current.platform == LootLockerConfig.platformType.Steam)
+            string platform = LootLockerSDKManager.GetCurrentPlatform();
+
+            if (platform == Platforms.Steam)
+            {
+                LootLockerSDKManager.DebugMessage("Token has expired and token refresh is not supported for Steam", true);
+                LootLockerResponse res = new LootLockerResponse();
+                res.statusCode = 401;
+                res.Error = "Token Expired";
+                res.hasError = true;
+                OnServerResponse?.Invoke(res);
+                return;
+            }
+
+            if (platform == Platforms.NintendoSwitch)
             {
-                LootLockerSDKManager.DebugMessage("Token has expired, And token refresh not supported in Steam calls", true);
+                LootLockerSDKManager.DebugMessage("Token has expired and token refresh is not supported for Nintendo Switch", true);
                 LootLockerResponse res = new LootLockerResponse();
                 res.statusCode = 401;
                 res.Error = "Token Expired";
@@ -39,9 +49,30 @@ protected override void RefreshTokenAndCompleteCall(LootLockerServerRequest cach
                 return;
             }
 
-            var sessionRequest = new LootLockerSessionRequest(LootLockerConfig.current.deviceID);
+            if (platform == Platforms.Guest)
+            {
+                LootLockerSDKManager.StartGuestSession(response =>
+                {
+                    CompleteCall(cacheServerRequest, OnServerResponse, response);
+                });
+                return;
+            } else if (platform == Platforms.WhiteLabel)
+            {
+                LootLockerSDKManager.StartWhiteLabelSession(response =>
+                {
+                    CompleteCall(cacheServerRequest, OnServerResponse, response);
+                });
 
-            LootLockerAPIManager.Session(sessionRequest, (response) =>
+                return;
+            } else {
+                var sessionRequest = new LootLockerSessionRequest(LootLockerConfig.current.deviceID);
+                LootLockerAPIManager.Session(sessionRequest, (response) =>
+                {
+                    CompleteCall(cacheServerRequest, OnServerResponse, response);
+                });
+            }
+
+            void CompleteCall(LootLockerServerRequest cacheServerRequest, Action<LootLockerResponse> OnServerResponse, LootLockerSessionResponse response)
             {
                 if (response.success)
                 {
@@ -72,7 +103,7 @@ protected override void RefreshTokenAndCompleteCall(LootLockerServerRequest cach
                     res.hasError = true;
                     OnServerResponse?.Invoke(res);
                 }
-            });
+            }
         }
     }
 }