Skip to content

Commit 0320411

Browse files
author
pgilmorepf
committed
Hotfix Unity Compression.
1 parent fed5b31 commit 0320411

File tree

12 files changed

+53
-53
lines changed

12 files changed

+53
-53
lines changed

‎PlayFabClientSample/Assets/PlayFabSDK/Internal/PlayFabHTTP.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void Update()
6767
_internalHttp.Update();
6868
}
6969

70-
internal static PlayFabError GeneratePfError(HttpStatusCode httpCode, PlayFabErrorCode pfErrorCode, string errorMessage)
70+
internal static PlayFabError GeneratePfError(HttpStatusCode httpCode, PlayFabErrorCode pfErrorCode, string errorMessage, object customData)
7171
{
7272
string httpCodeStr;
7373
switch (httpCode)
@@ -89,7 +89,8 @@ internal static PlayFabError GeneratePfError(HttpStatusCode httpCode, PlayFabErr
8989
HttpStatus = httpCodeStr,
9090
Error = pfErrorCode,
9191
ErrorMessage = errorMessage,
92-
ErrorDetails = null
92+
ErrorDetails = null,
93+
CustomData = customData
9394
};
9495
}
9596
}

‎PlayFabClientSample/Assets/PlayFabSDK/Internal/PlayFabWebRequest.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,13 @@ private static void StartHttpWebRequest(CallRequestContainer request)
162162
var errorMessage = ResponseToString(e.Response);
163163
if (string.IsNullOrEmpty(errorMessage))
164164
errorMessage = e.ToString();
165-
request.Error = PlayFabHttp.GeneratePfError(HttpStatusCode.ServiceUnavailable, PlayFabErrorCode.ServiceUnavailable, errorMessage);
165+
request.Error = PlayFabHttp.GeneratePfError(HttpStatusCode.ServiceUnavailable, PlayFabErrorCode.ServiceUnavailable, errorMessage, request.CustomData);
166166
request.State = CallRequestContainer.RequestState.Error;
167167
}
168168
catch (Exception e)
169169
{
170170
Debug.LogException(e); // If it's an unexpected exception, we should log it noisily
171-
request.Error = PlayFabHttp.GeneratePfError(HttpStatusCode.ServiceUnavailable, PlayFabErrorCode.ServiceUnavailable, e.ToString());
171+
request.Error = PlayFabHttp.GeneratePfError(HttpStatusCode.ServiceUnavailable, PlayFabErrorCode.ServiceUnavailable, e.ToString(), request.CustomData);
172172
request.State = CallRequestContainer.RequestState.Error;
173173
}
174174
}
@@ -188,21 +188,21 @@ private static bool ProcessHttpWebResult(CallRequestContainer request)
188188
}
189189
if (response.StatusCode != HttpStatusCode.OK || string.IsNullOrEmpty(request.ResultStr))
190190
{
191-
request.Error = PlayFabHttp.GeneratePfError(response.StatusCode, PlayFabErrorCode.ServiceUnavailable, "Failed to connect to PlayFab server");
191+
request.Error = PlayFabHttp.GeneratePfError(response.StatusCode, PlayFabErrorCode.ServiceUnavailable, "Failed to connect to PlayFab server", request.CustomData);
192192
}
193193
request.State = CallRequestContainer.RequestState.RequestReceived;
194194
}
195195
}
196196
catch (WebException e)
197197
{
198198
Debug.LogException(e); // If it's an unexpected exception, we should log it noisily
199-
request.Error = PlayFabHttp.GeneratePfError(HttpStatusCode.ServiceUnavailable, PlayFabErrorCode.ServiceUnavailable, e.ToString());
199+
request.Error = PlayFabHttp.GeneratePfError(HttpStatusCode.ServiceUnavailable, PlayFabErrorCode.ServiceUnavailable, e.ToString(), request.CustomData);
200200
request.State = CallRequestContainer.RequestState.Error;
201201
}
202202
catch (Exception e)
203203
{
204204
Debug.LogException(e); // If it's an unexpected exception, we should log it noisily
205-
request.Error = PlayFabHttp.GeneratePfError(HttpStatusCode.ServiceUnavailable, PlayFabErrorCode.ServiceUnavailable, e.ToString());
205+
request.Error = PlayFabHttp.GeneratePfError(HttpStatusCode.ServiceUnavailable, PlayFabErrorCode.ServiceUnavailable, e.ToString(), request.CustomData);
206206
request.State = CallRequestContainer.RequestState.Error;
207207
}
208208
return true;

‎PlayFabClientSample/Assets/PlayFabSDK/Internal/PlayFabWww.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ private IEnumerator MakeRequestViaUnity(CallRequestContainer requestContainer)
7575
requestContainer.Error = null;
7676
if (!string.IsNullOrEmpty(www.error))
7777
{
78-
requestContainer.Error = PlayFabHttp.GeneratePfError(HttpStatusCode.ServiceUnavailable, PlayFabErrorCode.ServiceUnavailable, www.error);
78+
requestContainer.Error = PlayFabHttp.GeneratePfError(HttpStatusCode.ServiceUnavailable, PlayFabErrorCode.ServiceUnavailable, www.error, requestContainer.CustomData);
7979
}
8080
else
8181
{
@@ -105,8 +105,7 @@ private IEnumerator MakeRequestViaUnity(CallRequestContainer requestContainer)
105105
}
106106
catch
107107
{
108-
// if this was not a valid GZip response, then send the message back as text to the call back.
109-
requestContainer.Error = PlayFabHttp.GeneratePfError(HttpStatusCode.PreconditionFailed, PlayFabErrorCode.Unknown, www.text);
108+
// If this was not a valid GZip response, then the uncompressed result is probably a valid response
110109
finalWwwText = www.text;
111110
}
112111
}

‎PlayFabClientSample/Assets/PlayFabSDK/Internal/Testing/EventTest.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public void TestInstCallbacks_GeneralOnly(UUnitTestContext testContext)
151151
{
152152
_listener.Register();
153153

154-
PlayFabClientAPI.LoginWithCustomID(new LoginWithCustomIDRequest { CreateAccount = true, CustomId = "UnitySdk-UnitTest", TitleId = "6195" }, PlayFabUUnitUtils.ApiCallbackWrapper<LoginResult>(testContext, TestInstCallbacks_GeneralOnlyCallback), null, testContext);
154+
PlayFabClientAPI.LoginWithCustomID(new LoginWithCustomIDRequest { CreateAccount = true, CustomId = "UnitySdk-UnitTest", TitleId = "6195" }, PlayFabUUnitUtils.ApiCallbackWrapper<LoginResult>(testContext, TestInstCallbacks_GeneralOnlyCallback), PlayFabUUnitUtils.ApiErrorWrapper(testContext, SharedErrorCallback), testContext);
155155
testContext.True(callbacks.Contains("OnRequest_InstGl"), string.Join(", ", callbacks.ToArray()));
156156
testContext.True(callbacks.Contains("OnRequest_InstLogin"), string.Join(", ", callbacks.ToArray()));
157157
testContext.IntEquals(2, callbacks.Count, string.Join(", ", callbacks.ToArray()));
@@ -173,7 +173,7 @@ public void TestStaticCallbacks_GeneralOnly(UUnitTestContext testContext)
173173
{
174174
EventStaticListener.Register();
175175

176-
PlayFabClientAPI.LoginWithCustomID(new LoginWithCustomIDRequest { CreateAccount = true, CustomId = "UnitySdk-UnitTest", TitleId = "6195" }, PlayFabUUnitUtils.ApiCallbackWrapper<LoginResult>(testContext, TestStaticCallbacks_GeneralOnlyCallback), null, testContext);
176+
PlayFabClientAPI.LoginWithCustomID(new LoginWithCustomIDRequest { CreateAccount = true, CustomId = "UnitySdk-UnitTest", TitleId = "6195" }, PlayFabUUnitUtils.ApiCallbackWrapper<LoginResult>(testContext, TestStaticCallbacks_GeneralOnlyCallback), PlayFabUUnitUtils.ApiErrorWrapper(testContext, SharedErrorCallback), testContext);
177177
CheckCallbacks(testContext, "OnRequest_StaticGl", callbacks);
178178
CheckCallbacks(testContext, "OnRequest_StaticLogin", callbacks);
179179
testContext.IntEquals(2, callbacks.Count, string.Join(", ", callbacks.ToArray()));
@@ -197,7 +197,7 @@ public void TestInstCallbacks_Local(UUnitTestContext testContext)
197197
{
198198
_listener.Register();
199199

200-
PlayFabClientAPI.LoginWithCustomID(new LoginWithCustomIDRequest { CreateAccount = true, CustomId = "UnitySdk-UnitTest", TitleId = "6195" }, PlayFabUUnitUtils.ApiCallbackWrapper<LoginResult>(testContext, TestInstCallbacks_LocalCallback), null, testContext);
200+
PlayFabClientAPI.LoginWithCustomID(new LoginWithCustomIDRequest { CreateAccount = true, CustomId = "UnitySdk-UnitTest", TitleId = "6195" }, PlayFabUUnitUtils.ApiCallbackWrapper<LoginResult>(testContext, TestInstCallbacks_LocalCallback), PlayFabUUnitUtils.ApiErrorWrapper(testContext, SharedErrorCallback), testContext);
201201
CheckCallbacks(testContext, "OnRequest_InstGl", callbacks);
202202
CheckCallbacks(testContext, "OnRequest_InstLogin", callbacks);
203203
testContext.IntEquals(2, callbacks.Count, string.Join(", ", callbacks.ToArray()));
@@ -220,7 +220,7 @@ public void TestStaticCallbacks_Local(UUnitTestContext testContext)
220220
{
221221
EventStaticListener.Register();
222222

223-
PlayFabClientAPI.LoginWithCustomID(new LoginWithCustomIDRequest { CreateAccount = true, CustomId = "UnitySdk-UnitTest", TitleId = "6195" }, PlayFabUUnitUtils.ApiCallbackWrapper<LoginResult>(testContext, TestStaticCallbacks_LocalCallback), SharedErrorCallback, testContext);
223+
PlayFabClientAPI.LoginWithCustomID(new LoginWithCustomIDRequest { CreateAccount = true, CustomId = "UnitySdk-UnitTest", TitleId = "6195" }, PlayFabUUnitUtils.ApiCallbackWrapper<LoginResult>(testContext, TestStaticCallbacks_LocalCallback), PlayFabUUnitUtils.ApiErrorWrapper(testContext, SharedErrorCallback), testContext);
224224
CheckCallbacks(testContext, "OnRequest_StaticGl", callbacks);
225225
CheckCallbacks(testContext, "OnRequest_StaticLogin", callbacks);
226226
testContext.IntEquals(2, callbacks.Count, string.Join(", ", callbacks.ToArray()));
@@ -249,7 +249,7 @@ public void TestCallbackFailuresGlobal(UUnitTestContext testContext)
249249
PlayFabSettings.RegisterForResponses(null, (PlayFabSettings.ResponseCallback<object, PlayFabResultCommon>)SuccessCallback_Global);
250250

251251
GetCatalogItemsRequest catalogRequest = new GetCatalogItemsRequest();
252-
PlayFabClientAPI.GetCatalogItems(catalogRequest, PlayFabUUnitUtils.ApiCallbackWrapper<GetCatalogItemsResult>(testContext, GetCatalogItemsCallback_Single), SharedErrorCallback, testContext);
252+
PlayFabClientAPI.GetCatalogItems(catalogRequest, PlayFabUUnitUtils.ApiCallbackWrapper<GetCatalogItemsResult>(testContext, GetCatalogItemsCallback_Single), PlayFabUUnitUtils.ApiErrorWrapper(testContext, SharedErrorCallback), testContext);
253253
}
254254
private static void SuccessCallback_Global(string urlPath, int callId, object request, PlayFabResultCommon result, PlayFabError error, object customData)
255255
{

‎PlayFabClientSample/Assets/PlayFabSDK/Internal/Testing/PlayFabApiTest_Client.cs

+13-13
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public void LoginOrRegister(UUnitTestContext testContext)
180180
var loginRequest = new LoginWithCustomIDRequest();
181181
loginRequest.CustomId = PlayFabSettings.BuildIdentifier;
182182
loginRequest.CreateAccount = true;
183-
PlayFabClientAPI.LoginWithCustomID(loginRequest, PlayFabUUnitUtils.ApiCallbackWrapper<LoginResult>(testContext, LoginCallback), SharedErrorCallback, testContext);
183+
PlayFabClientAPI.LoginWithCustomID(loginRequest, PlayFabUUnitUtils.ApiCallbackWrapper<LoginResult>(testContext, LoginCallback), PlayFabUUnitUtils.ApiErrorWrapper(testContext, SharedErrorCallback), testContext);
184184
}
185185
private void LoginCallback(LoginResult result)
186186
{
@@ -204,7 +204,7 @@ public void LoginWithAdvertisingId(UUnitTestContext testContext)
204204
var loginRequest = new LoginWithCustomIDRequest();
205205
loginRequest.CustomId = PlayFabSettings.BuildIdentifier;
206206
loginRequest.CreateAccount = true;
207-
PlayFabClientAPI.LoginWithCustomID(loginRequest, PlayFabUUnitUtils.ApiCallbackWrapper<LoginResult>(testContext, AdvertLoginCallback), SharedErrorCallback, testContext);
207+
PlayFabClientAPI.LoginWithCustomID(loginRequest, PlayFabUUnitUtils.ApiCallbackWrapper<LoginResult>(testContext, AdvertLoginCallback), PlayFabUUnitUtils.ApiErrorWrapper(testContext, SharedErrorCallback), testContext);
208208
}
209209
private void AdvertLoginCallback(LoginResult result)
210210
{
@@ -234,7 +234,7 @@ public void UserDataApi(UUnitTestContext testContext)
234234
}
235235

236236
var getRequest = new GetUserDataRequest();
237-
PlayFabClientAPI.GetUserData(getRequest, PlayFabUUnitUtils.ApiCallbackWrapper<GetUserDataResult>(testContext, GetUserDataCallback1), SharedErrorCallback, testContext);
237+
PlayFabClientAPI.GetUserData(getRequest, PlayFabUUnitUtils.ApiCallbackWrapper<GetUserDataResult>(testContext, GetUserDataCallback1), PlayFabUUnitUtils.ApiErrorWrapper(testContext, SharedErrorCallback), testContext);
238238
}
239239
private void GetUserDataCallback1(GetUserDataResult result)
240240
{
@@ -253,14 +253,14 @@ private void GetUserDataCallback1(GetUserDataResult result)
253253
{ TEST_DATA_KEY, _testInteger.ToString() }
254254
}
255255
};
256-
PlayFabClientAPI.UpdateUserData(updateRequest, PlayFabUUnitUtils.ApiCallbackWrapper<UpdateUserDataResult>(testContext, UpdateUserDataCallback), SharedErrorCallback, testContext);
256+
PlayFabClientAPI.UpdateUserData(updateRequest, PlayFabUUnitUtils.ApiCallbackWrapper<UpdateUserDataResult>(testContext, UpdateUserDataCallback), PlayFabUUnitUtils.ApiErrorWrapper(testContext, SharedErrorCallback), testContext);
257257
}
258258
private void UpdateUserDataCallback(UpdateUserDataResult result)
259259
{
260260
var testContext = (UUnitTestContext)result.CustomData;
261261

262262
var getRequest = new GetUserDataRequest();
263-
PlayFabClientAPI.GetUserData(getRequest, PlayFabUUnitUtils.ApiCallbackWrapper<GetUserDataResult>(testContext, GetUserDataCallback2), SharedErrorCallback, testContext);
263+
PlayFabClientAPI.GetUserData(getRequest, PlayFabUUnitUtils.ApiCallbackWrapper<GetUserDataResult>(testContext, GetUserDataCallback2), PlayFabUUnitUtils.ApiErrorWrapper(testContext, SharedErrorCallback), testContext);
264264
}
265265
private void GetUserDataCallback2(GetUserDataResult result)
266266
{
@@ -299,7 +299,7 @@ public void UserStatisticsApi(UUnitTestContext testContext)
299299
}
300300

301301
var getRequest = new GetUserStatisticsRequest();
302-
PlayFabClientAPI.GetUserStatistics(getRequest, PlayFabUUnitUtils.ApiCallbackWrapper<GetUserStatisticsResult>(testContext, GetUserStatsCallback1), SharedErrorCallback, testContext);
302+
PlayFabClientAPI.GetUserStatistics(getRequest, PlayFabUUnitUtils.ApiCallbackWrapper<GetUserStatisticsResult>(testContext, GetUserStatsCallback1), PlayFabUUnitUtils.ApiErrorWrapper(testContext, SharedErrorCallback), testContext);
303303
}
304304
private void GetUserStatsCallback1(GetUserStatisticsResult result)
305305
{
@@ -316,14 +316,14 @@ private void GetUserStatsCallback1(GetUserStatisticsResult result)
316316
{ TEST_DATA_KEY, _testInteger }
317317
}
318318
};
319-
PlayFabClientAPI.UpdateUserStatistics(updateRequest, PlayFabUUnitUtils.ApiCallbackWrapper<UpdateUserStatisticsResult>(testContext, UpdateUserStatsCallback), SharedErrorCallback, testContext);
319+
PlayFabClientAPI.UpdateUserStatistics(updateRequest, PlayFabUUnitUtils.ApiCallbackWrapper<UpdateUserStatisticsResult>(testContext, UpdateUserStatsCallback), PlayFabUUnitUtils.ApiErrorWrapper(testContext, SharedErrorCallback), testContext);
320320
}
321321
private void UpdateUserStatsCallback(UpdateUserStatisticsResult result)
322322
{
323323
var testContext = (UUnitTestContext)result.CustomData;
324324

325325
var getRequest = new GetUserStatisticsRequest();
326-
PlayFabClientAPI.GetUserStatistics(getRequest, PlayFabUUnitUtils.ApiCallbackWrapper<GetUserStatisticsResult>(testContext, GetUserStatsCallback2), SharedErrorCallback, testContext);
326+
PlayFabClientAPI.GetUserStatistics(getRequest, PlayFabUUnitUtils.ApiCallbackWrapper<GetUserStatisticsResult>(testContext, GetUserStatsCallback2), PlayFabUUnitUtils.ApiErrorWrapper(testContext, SharedErrorCallback), testContext);
327327
}
328328
private void GetUserStatsCallback2(GetUserStatisticsResult result)
329329
{
@@ -347,7 +347,7 @@ public void UserCharacter(UUnitTestContext testContext)
347347
{
348348
var request = new ListUsersCharactersRequest();
349349
request.PlayFabId = _playFabId; // Received from client upon login
350-
PlayFabClientAPI.GetAllUsersCharacters(request, PlayFabUUnitUtils.ApiCallbackWrapper<ListUsersCharactersResult>(testContext, GetCharsCallback), SharedErrorCallback, testContext);
350+
PlayFabClientAPI.GetAllUsersCharacters(request, PlayFabUUnitUtils.ApiCallbackWrapper<ListUsersCharactersResult>(testContext, GetCharsCallback), PlayFabUUnitUtils.ApiErrorWrapper(testContext, SharedErrorCallback), testContext);
351351
}
352352
private void GetCharsCallback(ListUsersCharactersResult result)
353353
{
@@ -365,7 +365,7 @@ public void ClientLeaderBoard(UUnitTestContext testContext)
365365
var clientRequest = new GetLeaderboardRequest();
366366
clientRequest.MaxResultsCount = 3;
367367
clientRequest.StatisticName = TEST_STAT_NAME;
368-
PlayFabClientAPI.GetLeaderboard(clientRequest, PlayFabUUnitUtils.ApiCallbackWrapper<GetLeaderboardResult>(testContext, GetClientLbCallback), SharedErrorCallback, testContext);
368+
PlayFabClientAPI.GetLeaderboard(clientRequest, PlayFabUUnitUtils.ApiCallbackWrapper<GetLeaderboardResult>(testContext, GetClientLbCallback), PlayFabUUnitUtils.ApiErrorWrapper(testContext, SharedErrorCallback), testContext);
369369
}
370370
private void GetClientLbCallback(GetLeaderboardResult result)
371371
{
@@ -387,7 +387,7 @@ public void AccountInfo(UUnitTestContext testContext)
387387
{
388388
PlayFabId = _playFabId
389389
};
390-
PlayFabClientAPI.GetAccountInfo(request, PlayFabUUnitUtils.ApiCallbackWrapper<GetAccountInfoResult>(testContext, AcctInfoCallback), SharedErrorCallback, testContext);
390+
PlayFabClientAPI.GetAccountInfo(request, PlayFabUUnitUtils.ApiCallbackWrapper<GetAccountInfoResult>(testContext, AcctInfoCallback), PlayFabUUnitUtils.ApiErrorWrapper(testContext, SharedErrorCallback), testContext);
391391
}
392392
private void AcctInfoCallback(GetAccountInfoResult result)
393393
{
@@ -412,7 +412,7 @@ public void CloudScript(UUnitTestContext testContext)
412412
{
413413
FunctionName = "helloWorld"
414414
};
415-
PlayFabClientAPI.ExecuteCloudScript(request, PlayFabUUnitUtils.ApiCallbackWrapper<ExecuteCloudScriptResult>(testContext, CloudScriptHwCallback), SharedErrorCallback, testContext);
415+
PlayFabClientAPI.ExecuteCloudScript(request, PlayFabUUnitUtils.ApiCallbackWrapper<ExecuteCloudScriptResult>(testContext, CloudScriptHwCallback), PlayFabUUnitUtils.ApiErrorWrapper(testContext, SharedErrorCallback), testContext);
416416
}
417417
private void CloudScriptHwCallback(ExecuteCloudScriptResult result)
418418
{
@@ -442,7 +442,7 @@ public void WriteEvent(UUnitTestContext testContext)
442442
}
443443
};
444444

445-
PlayFabClientAPI.WritePlayerEvent(request, PlayFabUUnitUtils.ApiCallbackWrapper<WriteEventResponse>(testContext, WriteEventCallback), SharedErrorCallback, testContext);
445+
PlayFabClientAPI.WritePlayerEvent(request, PlayFabUUnitUtils.ApiCallbackWrapper<WriteEventResponse>(testContext, WriteEventCallback), PlayFabUUnitUtils.ApiErrorWrapper(testContext, SharedErrorCallback), testContext);
446446
}
447447
private void WriteEventCallback(WriteEventResponse result)
448448
{

‎PlayFabCombinedTestingSample/Assets/PlayFabSDK/Internal/PlayFabHTTP.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void Update()
6767
_internalHttp.Update();
6868
}
6969

70-
internal static PlayFabError GeneratePfError(HttpStatusCode httpCode, PlayFabErrorCode pfErrorCode, string errorMessage)
70+
internal static PlayFabError GeneratePfError(HttpStatusCode httpCode, PlayFabErrorCode pfErrorCode, string errorMessage, object customData)
7171
{
7272
string httpCodeStr;
7373
switch (httpCode)
@@ -89,7 +89,8 @@ internal static PlayFabError GeneratePfError(HttpStatusCode httpCode, PlayFabErr
8989
HttpStatus = httpCodeStr,
9090
Error = pfErrorCode,
9191
ErrorMessage = errorMessage,
92-
ErrorDetails = null
92+
ErrorDetails = null,
93+
CustomData = customData
9394
};
9495
}
9596
}

0 commit comments

Comments
 (0)