Fixed file naming issue and getsingleplayer storage, added a config value to let sdk refresh token or not

eomene · eomene · commit 14bddd1bb206 · 2020-12-11T15:04:08.000+01:00
diff --git a/Assets/LootLocker/Common/BaseServerAPI.cs b/Assets/LootLocker/Common/BaseServerAPI.cs
@@ -154,7 +154,7 @@ IEnumerator coroutine()
 #if UNITY_EDITOR
                         LootLockerSDKManager.DebugMessage("Response code: " + webRequest.responseCode);
 #endif
-                        if (webRequest.responseCode != 401)
+                        if (webRequest.responseCode != 401 || !activeConfig.allowTokenRefresh)
                         {
                             response.Error += " " + webRequest.downloadHandler.text;
                             response.text = webRequest.downloadHandler.text;
diff --git a/Assets/LootLocker/Common/LootLockerGenericConfig.cs b/Assets/LootLocker/Common/LootLockerGenericConfig.cs
@@ -40,6 +40,7 @@ public enum DebugLevel { All, ErrorOnly, NormalOnly, Off}
 
     public DebugLevel currentDebugLevel;
 
+    public bool allowTokenRefresh = true;
 
     public void UpdateToken(string token, string deviceid)
     {
diff --git a/Assets/LootLocker/Common/ServerRequest.cs b/Assets/LootLocker/Common/ServerRequest.cs
@@ -176,7 +176,7 @@ public ServerRequest(string endpoint, HTTPMethod httpMethod = HTTPMethod.GET, by
                 this.form.AddField(kvp.Key, kvp.Value);
             }
 
-            this.form.AddBinaryData("file", upload, "file");
+            this.form.AddBinaryData("file", upload, uploadName);
 
             bool isNonPayloadMethod = (this.httpMethod == HTTPMethod.GET || this.httpMethod == HTTPMethod.HEAD || this.httpMethod == HTTPMethod.OPTIONS);
 
diff --git a/Assets/LootLocker/Game/LootLockerSDKManager.cs b/Assets/LootLocker/Game/LootLockerSDKManager.cs
@@ -319,10 +319,12 @@ public static void GetEntirePersistentStorage(Action<GetPersistentStoragResponse
             LootLockerAPIManager.GetEntirePersistentStorage(onComplete);
         }
 
-        public static void GetSingleKeyPersistentStorage(Action<GetPersistentSingle> onComplete)
+        public static void GetSingleKeyPersistentStorage(string key, Action<GetPersistentSingle> onComplete)
         {
             if (!CheckInitialized()) return;
-            LootLockerAPIManager.GetSingleKeyPersistentStorage(onComplete);
+            LootLockerGetRequest data = new LootLockerGetRequest();
+            data.getRequests.Add(key);
+            LootLockerAPIManager.GetSingleKeyPersistentStorage(data,onComplete);
         }
 
         public static void UpdateOrCreateKeyValue(string key, string value, Action<GetPersistentStoragResponse> onComplete)
diff --git a/Assets/LootLocker/Game/Requests/PersitentPlayerStorageRequest.cs b/Assets/LootLocker/Game/Requests/PersitentPlayerStorageRequest.cs
@@ -68,10 +68,12 @@ public static void GetEntirePersistentStorage(Action<GetPersistentStoragResponse
             }, true);
         }
 
-        public static void GetSingleKeyPersistentStorage(Action<GetPersistentSingle> onComplete)
+        public static void GetSingleKeyPersistentStorage(LootLockerGetRequest data, Action<GetPersistentSingle> onComplete)
         {
             EndPointClass endPoint = LootLockerEndPoints.current.getSingleKeyFromPersitenctStorage;
 
+            string getVariable = string.Format(endPoint.endPoint, data.getRequests[0]);
+
             ServerRequest.CallAPI(endPoint.endPoint, endPoint.httpMethod, null, onComplete: (serverResponse) =>
             {
                 GetPersistentSingle response = new GetPersistentSingle();
diff --git a/Assets/LootLocker/Game/Requests/PlayerRequest.cs b/Assets/LootLocker/Game/Requests/PlayerRequest.cs
@@ -12,9 +12,9 @@ namespace LootLockerRequests
     public class GetPlayerInfoResponse : LootLockerResponse
     {
         public bool success { get; set; }
-        public int account_balance { get; set; }
-        public int xp { get; set; }
-        public int level { get; set; }
+        public int? account_balance { get; set; }
+        public int? xp { get; set; }
+        public int? level { get; set; }
         public Level_Thresholds level_thresholds { get; set; }
     }
 
@@ -50,7 +50,7 @@ public class DeactivatedObjects
     public class BalanceResponse : LootLockerResponse
     {
         public bool success { get; set; }
-        public int balance { get; set; }
+        public int? balance { get; set; }
     }
 
     [System.Serializable]
@@ -66,20 +66,20 @@ public class XpSubmitResponse : LootLockerResponse
     public class XpResponse : LootLockerResponse
     {
         public bool success { get; set; }
-        public int xp { get; set; }
-        public int level { get; set; }
+        public int? xp { get; set; }
+        public int? level { get; set; }
     }
     [System.Serializable]
     public class Xp
     {
-        public int previous { get; set; }
-        public int current { get; set; }
+        public int? previous { get; set; }
+        public int? current { get; set; }
     }
     [System.Serializable]
     public class Level
     {
-        public int level { get; set; }
-        public int xp_threshold { get; set; }
+        public int? level { get; set; }
+        public int? xp_threshold { get; set; }
     }
 
     [System.Serializable]
@@ -120,7 +120,7 @@ public class Rental
     [System.Serializable]
     public class XpSubmitRequest
     {
-        public int points;
+        public int? points;
 
         public XpSubmitRequest(int points)
         {
diff --git a/Assets/LootLocker/Game/Samples/Scripts/PersistentPlayerStorageTest.cs b/Assets/LootLocker/Game/Samples/Scripts/PersistentPlayerStorageTest.cs
@@ -12,6 +12,8 @@ public class PersistentPlayerStorageTest : MonoBehaviour
     public List<Payload> dataToSave;
     [Header("Delete Data")]
     public string keyToDelete;
+    [Header("single key Data")]
+    public string keyToGet;
     public string labelText;
     Vector2 scrollPosition, scrollPosition2;
     public string otherPlayerId;
@@ -188,7 +190,7 @@ public void GetEntirePersistentStorage()
     [ContextMenu("GetSingleKeyPersistentStorage")]
     public void GetSingleKeyPersistentStorage()
     {
-        LootLockerSDKManager.GetSingleKeyPersistentStorage((getPersistentStoragResponse) =>
+        LootLockerSDKManager.GetSingleKeyPersistentStorage(keyToGet,(getPersistentStoragResponse) =>
         {
             if (getPersistentStoragResponse.success)
             {

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ IEnumerator coroutine()`
`154`	`154`	`#if UNITY_EDITOR`
`155`	`155`	`LootLockerSDKManager.DebugMessage("Response code: " + webRequest.responseCode);`
`156`	`156`	`#endif`
`157`		`- if (webRequest.responseCode != 401)`
	`157`	`+ if (webRequest.responseCode != 401 \|\| !activeConfig.allowTokenRefresh)`
`158`	`158`	`{`
`159`	`159`	`response.Error += " " + webRequest.downloadHandler.text;`
`160`	`160`	`response.text = webRequest.downloadHandler.text;`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ public enum DebugLevel { All, ErrorOnly, NormalOnly, Off}`
`40`	`40`
`41`	`41`	`public DebugLevel currentDebugLevel;`
`42`	`42`
	`43`	`+ public bool allowTokenRefresh = true;`
`43`	`44`
`44`	`45`	`public void UpdateToken(string token, string deviceid)`
`45`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public ServerRequest(string endpoint, HTTPMethod httpMethod = HTTPMethod.GET, by`
`176`	`176`	`this.form.AddField(kvp.Key, kvp.Value);`
`177`	`177`	`}`
`178`	`178`
`179`		`- this.form.AddBinaryData("file", upload, "file");`
	`179`	`+ this.form.AddBinaryData("file", upload, uploadName);`
`180`	`180`
`181`	`181`	`bool isNonPayloadMethod = (this.httpMethod == HTTPMethod.GET \|\| this.httpMethod == HTTPMethod.HEAD \|\| this.httpMethod == HTTPMethod.OPTIONS);`
`182`	`182`
Original file line number	Diff line number	Diff line change
`@@ -319,10 +319,12 @@ public static void GetEntirePersistentStorage(Action<GetPersistentStoragResponse`
`319`	`319`	`LootLockerAPIManager.GetEntirePersistentStorage(onComplete);`
`320`	`320`	`}`
`321`	`321`
`322`		`- public static void GetSingleKeyPersistentStorage(Action<GetPersistentSingle> onComplete)`
	`322`	`+ public static void GetSingleKeyPersistentStorage(string key, Action<GetPersistentSingle> onComplete)`
`323`	`323`	`{`
`324`	`324`	`if (!CheckInitialized()) return;`
`325`		`- LootLockerAPIManager.GetSingleKeyPersistentStorage(onComplete);`
	`325`	`+ LootLockerGetRequest data = new LootLockerGetRequest();`
	`326`	`+ data.getRequests.Add(key);`
	`327`	`+ LootLockerAPIManager.GetSingleKeyPersistentStorage(data,onComplete);`
`326`	`328`	`}`
`327`	`329`
`328`	`330`	`public static void UpdateOrCreateKeyValue(string key, string value, Action<GetPersistentStoragResponse> onComplete)`
Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,12 @@ public static void GetEntirePersistentStorage(Action<GetPersistentStoragResponse`
`68`	`68`	`}, true);`
`69`	`69`	`}`
`70`	`70`
`71`		`- public static void GetSingleKeyPersistentStorage(Action<GetPersistentSingle> onComplete)`
	`71`	`+ public static void GetSingleKeyPersistentStorage(LootLockerGetRequest data, Action<GetPersistentSingle> onComplete)`
`72`	`72`	`{`
`73`	`73`	`EndPointClass endPoint = LootLockerEndPoints.current.getSingleKeyFromPersitenctStorage;`
`74`	`74`
	`75`	`+ string getVariable = string.Format(endPoint.endPoint, data.getRequests[0]);`
	`76`	`+`
`75`	`77`	`ServerRequest.CallAPI(endPoint.endPoint, endPoint.httpMethod, null, onComplete: (serverResponse) =>`
`76`	`78`	`{`
`77`	`79`	`GetPersistentSingle response = new GetPersistentSingle();`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ namespace LootLockerRequests`
`12`	`12`	`public class GetPlayerInfoResponse : LootLockerResponse`
`13`	`13`	`{`
`14`	`14`	`public bool success { get; set; }`
`15`		`- public int account_balance { get; set; }`
`16`		`- public int xp { get; set; }`
`17`		`- public int level { get; set; }`
	`15`	`+ public int? account_balance { get; set; }`
	`16`	`+ public int? xp { get; set; }`
	`17`	`+ public int? level { get; set; }`
`18`	`18`	`public Level_Thresholds level_thresholds { get; set; }`
`19`	`19`	`}`
`20`	`20`
`@@ -50,7 +50,7 @@ public class DeactivatedObjects`
`50`	`50`	`public class BalanceResponse : LootLockerResponse`
`51`	`51`	`{`
`52`	`52`	`public bool success { get; set; }`
`53`		`- public int balance { get; set; }`
	`53`	`+ public int? balance { get; set; }`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`[System.Serializable]`
`@@ -66,20 +66,20 @@ public class XpSubmitResponse : LootLockerResponse`
`66`	`66`	`public class XpResponse : LootLockerResponse`
`67`	`67`	`{`
`68`	`68`	`public bool success { get; set; }`
`69`		`- public int xp { get; set; }`
`70`		`- public int level { get; set; }`
	`69`	`+ public int? xp { get; set; }`
	`70`	`+ public int? level { get; set; }`
`71`	`71`	`}`
`72`	`72`	`[System.Serializable]`
`73`	`73`	`public class Xp`
`74`	`74`	`{`
`75`		`- public int previous { get; set; }`
`76`		`- public int current { get; set; }`
	`75`	`+ public int? previous { get; set; }`
	`76`	`+ public int? current { get; set; }`
`77`	`77`	`}`
`78`	`78`	`[System.Serializable]`
`79`	`79`	`public class Level`
`80`	`80`	`{`
`81`		`- public int level { get; set; }`
`82`		`- public int xp_threshold { get; set; }`
	`81`	`+ public int? level { get; set; }`
	`82`	`+ public int? xp_threshold { get; set; }`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`[System.Serializable]`
`@@ -120,7 +120,7 @@ public class Rental`
`120`	`120`	`[System.Serializable]`
`121`	`121`	`public class XpSubmitRequest`
`122`	`122`	`{`
`123`		`- public int points;`
	`123`	`+ public int? points;`
`124`	`124`
`125`	`125`	`public XpSubmitRequest(int points)`
`126`	`126`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ public class PersistentPlayerStorageTest : MonoBehaviour`
`12`	`12`	`public List<Payload> dataToSave;`
`13`	`13`	`[Header("Delete Data")]`
`14`	`14`	`public string keyToDelete;`
	`15`	`+ [Header("single key Data")]`
	`16`	`+ public string keyToGet;`
`15`	`17`	`public string labelText;`
`16`	`18`	`Vector2 scrollPosition, scrollPosition2;`
`17`	`19`	`public string otherPlayerId;`
`@@ -188,7 +190,7 @@ public void GetEntirePersistentStorage()`
`188`	`190`	`[ContextMenu("GetSingleKeyPersistentStorage")]`
`189`	`191`	`public void GetSingleKeyPersistentStorage()`
`190`	`192`	`{`
`191`		`- LootLockerSDKManager.GetSingleKeyPersistentStorage((getPersistentStoragResponse) =>`
	`193`	`+ LootLockerSDKManager.GetSingleKeyPersistentStorage(keyToGet,(getPersistentStoragResponse) =>`
`192`	`194`	`{`
`193`	`195`	`if (getPersistentStoragResponse.success)`
`194`	`196`	`{`