Merge pull request #15 from LootLocker/fix/Unity2019

TobiasBerg · web-flow · commit 846b7f5feff8 · 2022-01-26T10:43:16.000+01:00
Removal of C#8 features to get it to work with Unity 2019
diff --git a/Runtime/Game/LootLockerGameServerAPI.cs b/Runtime/Game/LootLockerGameServerAPI.cs
@@ -72,17 +72,17 @@ protected override void RefreshTokenAndCompleteCall(LootLockerServerRequest cach
                 });
             }
 
-            void CompleteCall(LootLockerServerRequest cacheServerRequest, Action<LootLockerResponse> OnServerResponse, LootLockerSessionResponse response)
+            void CompleteCall(LootLockerServerRequest newcacheServerRequest, Action<LootLockerResponse> newOnServerResponse, LootLockerSessionResponse response)
             {
                 if (response.success)
                 {
                     Dictionary<string, string> headers = new Dictionary<string, string>();
                     headers.Add("x-session-token", LootLockerConfig.current.token);
-                    cacheServerRequest.extraHeaders = headers;
-                    if (cacheServerRequest.retryCount < 4)
+                    newcacheServerRequest.extraHeaders = headers;
+                    if (newcacheServerRequest.retryCount < 4)
                     {
-                        SendRequest(cacheServerRequest, OnServerResponse);
-                        cacheServerRequest.retryCount++;
+                        SendRequest(newcacheServerRequest, newOnServerResponse);
+                        newcacheServerRequest.retryCount++;
                     }
                     else
                     {
@@ -91,7 +91,7 @@ void CompleteCall(LootLockerServerRequest cacheServerRequest, Action<LootLockerR
                         res.statusCode = 401;
                         res.Error = "Token Expired";
                         res.hasError = true;
-                        OnServerResponse?.Invoke(res);
+                        newOnServerResponse?.Invoke(res);
                     }
                 }
                 else
@@ -101,7 +101,7 @@ void CompleteCall(LootLockerServerRequest cacheServerRequest, Action<LootLockerR
                     res.statusCode = 401;
                     res.Error = "Token Expired";
                     res.hasError = true;
-                    OnServerResponse?.Invoke(res);
+                    newOnServerResponse?.Invoke(res);
                 }
             }
         }
diff --git a/Runtime/Game/Requests/WhiteLabelRequest.cs b/Runtime/Game/Requests/WhiteLabelRequest.cs
@@ -35,17 +35,17 @@ public class LootLockerWhiteLabelSignupResponse : LootLockerResponse
         public int GameID { get; set; }
         public string Email { get; set; }
         public string CreatedAt { get; set; }
-        #nullable enable
-        public string? UpdatedAt { get; set; }
-        #nullable enable
-        public string? DeletedAt { get; set; }
-        #nullable enable
-        public string? ValidatedAt { get; set; }
+
+        public string UpdatedAt { get; set; }
+
+        public string DeletedAt { get; set; }
+
+        public string ValidatedAt { get; set; }
     }
 
     public class LootLockerWhiteLabelLoginResponse : LootLockerWhiteLabelSignupResponse
     {
-        public string? SessionToken { get; set; }
+        public string SessionToken { get; set; }
     }
 }
 
@@ -70,7 +70,7 @@ public static void WhiteLabelLogin(LootLockerWhiteLabelUserRequest input, Action
 
             LootLockerServerRequest.CallDomainAuthAPI(endPoint.endPoint, endPoint.httpMethod, json, ((serverResponse) =>
             {
-                LootLockerWhiteLabelLoginResponse? response = new LootLockerWhiteLabelLoginResponse();
+                LootLockerWhiteLabelLoginResponse response = new LootLockerWhiteLabelLoginResponse();
                 if (string.IsNullOrEmpty(serverResponse.Error) && serverResponse.text != null)
                 {
                     DefaultContractResolver contractResolver = new DefaultContractResolver
@@ -115,7 +115,7 @@ public static void WhiteLabelVerifySession(LootLockerWhiteLabelVerifySessionRequ
 
             LootLockerServerRequest.CallDomainAuthAPI(endPoint.endPoint, endPoint.httpMethod, json, ((serverResponse) =>
             {
-                LootLockerWhiteLabelVerifySessionResponse? response = new LootLockerWhiteLabelVerifySessionResponse();
+                LootLockerWhiteLabelVerifySessionResponse response = new LootLockerWhiteLabelVerifySessionResponse();
                 if (string.IsNullOrEmpty(serverResponse.Error) && serverResponse.text != null)
                 {
                     DefaultContractResolver contractResolver = new DefaultContractResolver
@@ -159,7 +159,7 @@ public static void WhiteLabelSignUp(LootLockerWhiteLabelUserRequest input, Actio
 
             LootLockerServerRequest.CallDomainAuthAPI(endPoint.endPoint, endPoint.httpMethod, json, ((serverResponse) =>
             {
-                LootLockerWhiteLabelSignupResponse? response = new LootLockerWhiteLabelSignupResponse();
+                LootLockerWhiteLabelSignupResponse response = new LootLockerWhiteLabelSignupResponse();
                 if (string.IsNullOrEmpty(serverResponse.Error) && serverResponse.text != null)
                 {
                     DefaultContractResolver contractResolver = new DefaultContractResolver
@@ -195,7 +195,7 @@ public static void WhiteLabelRequestPasswordReset(string email, Action<LootLocke
             var json = JsonConvert.SerializeObject(new { email });
             LootLockerServerRequest.CallDomainAuthAPI(endPoint.endPoint, endPoint.httpMethod, json, (serverResponse) =>
             {
-                LootLockerResponse? response = new LootLockerResponse
+                LootLockerResponse response = new LootLockerResponse
                 {
                     text = serverResponse.text,
                     success = serverResponse.success,
@@ -214,7 +214,7 @@ public static void WhiteLabelRequestAccountVerification(int userID, Action<LootL
             var json = JsonConvert.SerializeObject(new { user_id = userID });
             LootLockerServerRequest.CallDomainAuthAPI(endPoint.endPoint, endPoint.httpMethod, json, (serverResponse) =>
             {
-                LootLockerResponse? response = new LootLockerResponse
+                LootLockerResponse response = new LootLockerResponse
                 {
                     text = serverResponse.text,
                     success = serverResponse.success,

Original file line number	Diff line number	Diff line change
`@@ -72,17 +72,17 @@ protected override void RefreshTokenAndCompleteCall(LootLockerServerRequest cach`
`72`	`72`	`});`
`73`	`73`	`}`
`74`	`74`
`75`		`- void CompleteCall(LootLockerServerRequest cacheServerRequest, Action<LootLockerResponse> OnServerResponse, LootLockerSessionResponse response)`
	`75`	`+ void CompleteCall(LootLockerServerRequest newcacheServerRequest, Action<LootLockerResponse> newOnServerResponse, LootLockerSessionResponse response)`
`76`	`76`	`{`
`77`	`77`	`if (response.success)`
`78`	`78`	`{`
`79`	`79`	`Dictionary<string, string> headers = new Dictionary<string, string>();`
`80`	`80`	`headers.Add("x-session-token", LootLockerConfig.current.token);`
`81`		`- cacheServerRequest.extraHeaders = headers;`
`82`		`- if (cacheServerRequest.retryCount < 4)`
	`81`	`+ newcacheServerRequest.extraHeaders = headers;`
	`82`	`+ if (newcacheServerRequest.retryCount < 4)`
`83`	`83`	`{`
`84`		`- SendRequest(cacheServerRequest, OnServerResponse);`
`85`		`- cacheServerRequest.retryCount++;`
	`84`	`+ SendRequest(newcacheServerRequest, newOnServerResponse);`
	`85`	`+ newcacheServerRequest.retryCount++;`
`86`	`86`	`}`
`87`	`87`	`else`
`88`	`88`	`{`
`@@ -91,7 +91,7 @@ void CompleteCall(LootLockerServerRequest cacheServerRequest, Action<LootLockerR`
`91`	`91`	`res.statusCode = 401;`
`92`	`92`	`res.Error = "Token Expired";`
`93`	`93`	`res.hasError = true;`
`94`		`- OnServerResponse?.Invoke(res);`
	`94`	`+ newOnServerResponse?.Invoke(res);`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`	`else`
`@@ -101,7 +101,7 @@ void CompleteCall(LootLockerServerRequest cacheServerRequest, Action<LootLockerR`
`101`	`101`	`res.statusCode = 401;`
`102`	`102`	`res.Error = "Token Expired";`
`103`	`103`	`res.hasError = true;`
`104`		`- OnServerResponse?.Invoke(res);`
	`104`	`+ newOnServerResponse?.Invoke(res);`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,17 +35,17 @@ public class LootLockerWhiteLabelSignupResponse : LootLockerResponse`
`35`	`35`	`public int GameID { get; set; }`
`36`	`36`	`public string Email { get; set; }`
`37`	`37`	`public string CreatedAt { get; set; }`
`38`		`- #nullable enable`
`39`		`- public string? UpdatedAt { get; set; }`
`40`		`- #nullable enable`
`41`		`- public string? DeletedAt { get; set; }`
`42`		`- #nullable enable`
`43`		`- public string? ValidatedAt { get; set; }`
	`38`	`+`
	`39`	`+ public string UpdatedAt { get; set; }`
	`40`	`+`
	`41`	`+ public string DeletedAt { get; set; }`
	`42`	`+`
	`43`	`+ public string ValidatedAt { get; set; }`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public class LootLockerWhiteLabelLoginResponse : LootLockerWhiteLabelSignupResponse`
`47`	`47`	`{`
`48`		`- public string? SessionToken { get; set; }`
	`48`	`+ public string SessionToken { get; set; }`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`@@ -70,7 +70,7 @@ public static void WhiteLabelLogin(LootLockerWhiteLabelUserRequest input, Action`
`70`	`70`
`71`	`71`	`LootLockerServerRequest.CallDomainAuthAPI(endPoint.endPoint, endPoint.httpMethod, json, ((serverResponse) =>`
`72`	`72`	`{`
`73`		`- LootLockerWhiteLabelLoginResponse? response = new LootLockerWhiteLabelLoginResponse();`
	`73`	`+ LootLockerWhiteLabelLoginResponse response = new LootLockerWhiteLabelLoginResponse();`
`74`	`74`	`if (string.IsNullOrEmpty(serverResponse.Error) && serverResponse.text != null)`
`75`	`75`	`{`
`76`	`76`	`DefaultContractResolver contractResolver = new DefaultContractResolver`
`@@ -115,7 +115,7 @@ public static void WhiteLabelVerifySession(LootLockerWhiteLabelVerifySessionRequ`
`115`	`115`
`116`	`116`	`LootLockerServerRequest.CallDomainAuthAPI(endPoint.endPoint, endPoint.httpMethod, json, ((serverResponse) =>`
`117`	`117`	`{`
`118`		`- LootLockerWhiteLabelVerifySessionResponse? response = new LootLockerWhiteLabelVerifySessionResponse();`
	`118`	`+ LootLockerWhiteLabelVerifySessionResponse response = new LootLockerWhiteLabelVerifySessionResponse();`
`119`	`119`	`if (string.IsNullOrEmpty(serverResponse.Error) && serverResponse.text != null)`
`120`	`120`	`{`
`121`	`121`	`DefaultContractResolver contractResolver = new DefaultContractResolver`
`@@ -159,7 +159,7 @@ public static void WhiteLabelSignUp(LootLockerWhiteLabelUserRequest input, Actio`
`159`	`159`
`160`	`160`	`LootLockerServerRequest.CallDomainAuthAPI(endPoint.endPoint, endPoint.httpMethod, json, ((serverResponse) =>`
`161`	`161`	`{`
`162`		`- LootLockerWhiteLabelSignupResponse? response = new LootLockerWhiteLabelSignupResponse();`
	`162`	`+ LootLockerWhiteLabelSignupResponse response = new LootLockerWhiteLabelSignupResponse();`
`163`	`163`	`if (string.IsNullOrEmpty(serverResponse.Error) && serverResponse.text != null)`
`164`	`164`	`{`
`165`	`165`	`DefaultContractResolver contractResolver = new DefaultContractResolver`
`@@ -195,7 +195,7 @@ public static void WhiteLabelRequestPasswordReset(string email, Action<LootLocke`
`195`	`195`	`var json = JsonConvert.SerializeObject(new { email });`
`196`	`196`	`LootLockerServerRequest.CallDomainAuthAPI(endPoint.endPoint, endPoint.httpMethod, json, (serverResponse) =>`
`197`	`197`	`{`
`198`		`- LootLockerResponse? response = new LootLockerResponse`
	`198`	`+ LootLockerResponse response = new LootLockerResponse`
`199`	`199`	`{`
`200`	`200`	`text = serverResponse.text,`
`201`	`201`	`success = serverResponse.success,`
`@@ -214,7 +214,7 @@ public static void WhiteLabelRequestAccountVerification(int userID, Action<LootL`
`214`	`214`	`var json = JsonConvert.SerializeObject(new { user_id = userID });`
`215`	`215`	`LootLockerServerRequest.CallDomainAuthAPI(endPoint.endPoint, endPoint.httpMethod, json, (serverResponse) =>`
`216`	`216`	`{`
`217`		`- LootLockerResponse? response = new LootLockerResponse`
	`217`	`+ LootLockerResponse response = new LootLockerResponse`
`218`	`218`	`{`
`219`	`219`	`text = serverResponse.text,`
`220`	`220`	`success = serverResponse.success,`