diff --git a/AndroidStudioExample/app/packageMe.ps1 b/AndroidStudioExample/app/packageMe.ps1 index 8ae7e7409..60bad3d12 100644 --- a/AndroidStudioExample/app/packageMe.ps1 +++ b/AndroidStudioExample/app/packageMe.ps1 @@ -5,4 +5,4 @@ New-Item -ItemType Directory -Force ./builds popd cd target -Copy-Item client-sdk-0.131.210511.jar -Destination ../../builds/client-sdk-0.131.210511.jar \ No newline at end of file +Copy-Item client-sdk-0.132.210521.jar -Destination ../../builds/client-sdk-0.132.210521.jar \ No newline at end of file diff --git a/AndroidStudioExample/app/packageMe.sh b/AndroidStudioExample/app/packageMe.sh index eb5be3732..188c6654f 100644 --- a/AndroidStudioExample/app/packageMe.sh +++ b/AndroidStudioExample/app/packageMe.sh @@ -7,4 +7,4 @@ mkdir -p ./builds popd cd target -cp client-sdk-0.131.210511.jar ../../builds/client-sdk-0.131.210511.jar +cp client-sdk-0.132.210521.jar ../../builds/client-sdk-0.132.210521.jar diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabAuthenticationAPI.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabAuthenticationAPI.java index 6e7230d62..37991104c 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabAuthenticationAPI.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabAuthenticationAPI.java @@ -149,4 +149,5 @@ private static PlayFabResult privateValidateEntityT pfResult.Result = result; return pfResult; } + } diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientAPI.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientAPI.java index 2d89ea9f6..6beeb7747 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientAPI.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientAPI.java @@ -602,8 +602,6 @@ private static PlayFabResult privateAttributeInstallAsyn PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); AttributeInstallResult result = resultData.data; - // Modify AdvertisingIdType: Prevents us from sending the id multiple times, and allows automated tests to determine id was sent successfully - PlayFabSettings.AdvertisingIdType += "_Successful"; PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -4602,75 +4600,6 @@ private static PlayFabResult privateGetUserReadOnlyDataAsync( return pfResult; } - /** - * Requests a challenge from the server to be signed by Windows Hello Passport service to authenticate. - * @deprecated Do not use - * @param request GetWindowsHelloChallengeRequest - * @return Async Task will return GetWindowsHelloChallengeResponse - */ - @Deprecated - @SuppressWarnings("unchecked") - public static FutureTask> GetWindowsHelloChallengeAsync(final GetWindowsHelloChallengeRequest request) { - return new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateGetWindowsHelloChallengeAsync(request); - } - }); - } - - /** - * Requests a challenge from the server to be signed by Windows Hello Passport service to authenticate. - * @deprecated Do not use - * @param request GetWindowsHelloChallengeRequest - * @return GetWindowsHelloChallengeResponse - */ - @Deprecated - @SuppressWarnings("unchecked") - public static PlayFabResult GetWindowsHelloChallenge(final GetWindowsHelloChallengeRequest request) { - FutureTask> task = new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateGetWindowsHelloChallengeAsync(request); - } - }); - try { - task.run(); - return task.get(); - } catch(Exception e) { - PlayFabResult exceptionResult = new PlayFabResult(); - exceptionResult.Error = PlayFabHTTP.GeneratePfError(-1, PlayFabErrorCode.Unknown, e.getMessage(), null); - return exceptionResult; - } - } - - /** - * Requests a challenge from the server to be signed by Windows Hello Passport service to authenticate. - * @deprecated Do not use - */ - @Deprecated - @SuppressWarnings("unchecked") - private static PlayFabResult privateGetWindowsHelloChallengeAsync(final GetWindowsHelloChallengeRequest request) throws Exception { - - FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL("/Client/GetWindowsHelloChallenge"), request, null, null); - task.run(); - Object httpResult = task.get(); - if (httpResult instanceof PlayFabError) { - PlayFabError error = (PlayFabError)httpResult; - if (PlayFabSettings.GlobalErrorHandler != null) - PlayFabSettings.GlobalErrorHandler.callback(error); - PlayFabResult result = new PlayFabResult(); - result.Error = error; - return result; - } - String resultRawJson = (String) httpResult; - - PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); - GetWindowsHelloChallengeResponse result = resultData.data; - - PlayFabResult pfResult = new PlayFabResult(); - pfResult.Result = result; - return pfResult; - } - /** * Grants the specified character type to the user. CharacterIds are not globally unique; characterId must be evaluated * with the parent PlayFabId to guarantee uniqueness. @@ -5684,76 +5613,6 @@ private static PlayFabResult privateLinkTwitchAsync(fin return pfResult; } - /** - * Link Windows Hello authentication to the current PlayFab Account - * @deprecated Do not use - * @param request LinkWindowsHelloAccountRequest - * @return Async Task will return LinkWindowsHelloAccountResponse - */ - @Deprecated - @SuppressWarnings("unchecked") - public static FutureTask> LinkWindowsHelloAsync(final LinkWindowsHelloAccountRequest request) { - return new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateLinkWindowsHelloAsync(request); - } - }); - } - - /** - * Link Windows Hello authentication to the current PlayFab Account - * @deprecated Do not use - * @param request LinkWindowsHelloAccountRequest - * @return LinkWindowsHelloAccountResponse - */ - @Deprecated - @SuppressWarnings("unchecked") - public static PlayFabResult LinkWindowsHello(final LinkWindowsHelloAccountRequest request) { - FutureTask> task = new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateLinkWindowsHelloAsync(request); - } - }); - try { - task.run(); - return task.get(); - } catch(Exception e) { - PlayFabResult exceptionResult = new PlayFabResult(); - exceptionResult.Error = PlayFabHTTP.GeneratePfError(-1, PlayFabErrorCode.Unknown, e.getMessage(), null); - return exceptionResult; - } - } - - /** - * Link Windows Hello authentication to the current PlayFab Account - * @deprecated Do not use - */ - @Deprecated - @SuppressWarnings("unchecked") - private static PlayFabResult privateLinkWindowsHelloAsync(final LinkWindowsHelloAccountRequest request) throws Exception { - if (PlayFabSettings.ClientSessionTicket == null) throw new Exception ("Must be logged in to call this method"); - - FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL("/Client/LinkWindowsHello"), request, "X-Authorization", PlayFabSettings.ClientSessionTicket); - task.run(); - Object httpResult = task.get(); - if (httpResult instanceof PlayFabError) { - PlayFabError error = (PlayFabError)httpResult; - if (PlayFabSettings.GlobalErrorHandler != null) - PlayFabSettings.GlobalErrorHandler.callback(error); - PlayFabResult result = new PlayFabResult(); - result.Error = error; - return result; - } - String resultRawJson = (String) httpResult; - - PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); - LinkWindowsHelloAccountResponse result = resultData.data; - - PlayFabResult pfResult = new PlayFabResult(); - pfResult.Result = result; - return pfResult; - } - /** * Links the Xbox Live account associated with the provided access code to the user's PlayFab account * @param request LinkXboxAccountRequest @@ -5880,7 +5739,6 @@ private static PlayFabResult privateLoginWithAndroidDeviceIDAsync(f LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -5946,7 +5804,6 @@ private static PlayFabResult privateLoginWithAppleAsync(final Login LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6017,7 +5874,6 @@ private static PlayFabResult privateLoginWithCustomIDAsync(final Lo LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6094,7 +5950,6 @@ private static PlayFabResult privateLoginWithEmailAddressAsync(fina LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6165,7 +6020,6 @@ private static PlayFabResult privateLoginWithFacebookAsync(final Lo LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6236,7 +6090,6 @@ private static PlayFabResult privateLoginWithFacebookInstantGamesId LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6316,7 +6169,6 @@ private static PlayFabResult privateLoginWithGameCenterAsync(final LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6382,7 +6234,6 @@ private static PlayFabResult privateLoginWithGoogleAccountAsync(fin LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6453,7 +6304,6 @@ private static PlayFabResult privateLoginWithIOSDeviceIDAsync(final LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6519,7 +6369,6 @@ private static PlayFabResult privateLoginWithKongregateAsync(final LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6585,7 +6434,6 @@ private static PlayFabResult privateLoginWithNintendoServiceAccount LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6656,7 +6504,6 @@ private static PlayFabResult privateLoginWithNintendoSwitchDeviceId LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6727,7 +6574,6 @@ private static PlayFabResult privateLoginWithOpenIdConnectAsync(fin LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6804,7 +6650,6 @@ private static PlayFabResult privateLoginWithPlayFabAsync(final Log LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6875,7 +6720,6 @@ private static PlayFabResult privateLoginWithPSNAsync(final LoginWi LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6946,7 +6790,6 @@ private static PlayFabResult privateLoginWithSteamAsync(final Login LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -7012,90 +6855,6 @@ private static PlayFabResult privateLoginWithTwitchAsync(final Logi LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); - - PlayFabResult pfResult = new PlayFabResult(); - pfResult.Result = result; - return pfResult; - } - - /** - * Completes the Windows Hello login flow by returning the signed value of the challange from GetWindowsHelloChallenge. - * Windows Hello has a 2 step client to server authentication scheme. Step one is to request from the server a challenge - * string. Step two is to request the user sign the string via Windows Hello and then send the signed value back to the - * server. - * @deprecated Do not use - * @param request LoginWithWindowsHelloRequest - * @return Async Task will return LoginResult - */ - @Deprecated - @SuppressWarnings("unchecked") - public static FutureTask> LoginWithWindowsHelloAsync(final LoginWithWindowsHelloRequest request) { - return new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateLoginWithWindowsHelloAsync(request); - } - }); - } - - /** - * Completes the Windows Hello login flow by returning the signed value of the challange from GetWindowsHelloChallenge. - * Windows Hello has a 2 step client to server authentication scheme. Step one is to request from the server a challenge - * string. Step two is to request the user sign the string via Windows Hello and then send the signed value back to the - * server. - * @deprecated Do not use - * @param request LoginWithWindowsHelloRequest - * @return LoginResult - */ - @Deprecated - @SuppressWarnings("unchecked") - public static PlayFabResult LoginWithWindowsHello(final LoginWithWindowsHelloRequest request) { - FutureTask> task = new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateLoginWithWindowsHelloAsync(request); - } - }); - try { - task.run(); - return task.get(); - } catch(Exception e) { - PlayFabResult exceptionResult = new PlayFabResult(); - exceptionResult.Error = PlayFabHTTP.GeneratePfError(-1, PlayFabErrorCode.Unknown, e.getMessage(), null); - return exceptionResult; - } - } - - /** - * Completes the Windows Hello login flow by returning the signed value of the challange from GetWindowsHelloChallenge. - * Windows Hello has a 2 step client to server authentication scheme. Step one is to request from the server a challenge - * string. Step two is to request the user sign the string via Windows Hello and then send the signed value back to the - * server. - * @deprecated Do not use - */ - @Deprecated - @SuppressWarnings("unchecked") - private static PlayFabResult privateLoginWithWindowsHelloAsync(final LoginWithWindowsHelloRequest request) throws Exception { - request.TitleId = PlayFabSettings.TitleId != null ? PlayFabSettings.TitleId : request.TitleId; - if (request.TitleId == null) throw new Exception ("Must be have PlayFabSettings.TitleId set to call this method"); - - FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL("/Client/LoginWithWindowsHello"), request, null, null); - task.run(); - Object httpResult = task.get(); - if (httpResult instanceof PlayFabError) { - PlayFabError error = (PlayFabError)httpResult; - if (PlayFabSettings.GlobalErrorHandler != null) - PlayFabSettings.GlobalErrorHandler.callback(error); - PlayFabResult result = new PlayFabResult(); - result.Error = error; - return result; - } - String resultRawJson = (String) httpResult; - - PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); - LoginResult result = resultData.data; - PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; - if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -7166,7 +6925,6 @@ private static PlayFabResult privateLoginWithXboxAsync(final LoginW LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -7697,90 +7455,12 @@ private static PlayFabResult privateRegisterPlayFabUs PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); RegisterPlayFabUserResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; return pfResult; } - /** - * Registers a new PlayFab user account using Windows Hello authentication, returning a session ticket that can - * subsequently be used for API calls which require an authenticated user - * @deprecated Do not use - * @param request RegisterWithWindowsHelloRequest - * @return Async Task will return LoginResult - */ - @Deprecated - @SuppressWarnings("unchecked") - public static FutureTask> RegisterWithWindowsHelloAsync(final RegisterWithWindowsHelloRequest request) { - return new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateRegisterWithWindowsHelloAsync(request); - } - }); - } - - /** - * Registers a new PlayFab user account using Windows Hello authentication, returning a session ticket that can - * subsequently be used for API calls which require an authenticated user - * @deprecated Do not use - * @param request RegisterWithWindowsHelloRequest - * @return LoginResult - */ - @Deprecated - @SuppressWarnings("unchecked") - public static PlayFabResult RegisterWithWindowsHello(final RegisterWithWindowsHelloRequest request) { - FutureTask> task = new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateRegisterWithWindowsHelloAsync(request); - } - }); - try { - task.run(); - return task.get(); - } catch(Exception e) { - PlayFabResult exceptionResult = new PlayFabResult(); - exceptionResult.Error = PlayFabHTTP.GeneratePfError(-1, PlayFabErrorCode.Unknown, e.getMessage(), null); - return exceptionResult; - } - } - - /** - * Registers a new PlayFab user account using Windows Hello authentication, returning a session ticket that can - * subsequently be used for API calls which require an authenticated user - * @deprecated Do not use - */ - @Deprecated - @SuppressWarnings("unchecked") - private static PlayFabResult privateRegisterWithWindowsHelloAsync(final RegisterWithWindowsHelloRequest request) throws Exception { - request.TitleId = PlayFabSettings.TitleId != null ? PlayFabSettings.TitleId : request.TitleId; - if (request.TitleId == null) throw new Exception ("Must be have PlayFabSettings.TitleId set to call this method"); - - FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL("/Client/RegisterWithWindowsHello"), request, null, null); - task.run(); - Object httpResult = task.get(); - if (httpResult instanceof PlayFabError) { - PlayFabError error = (PlayFabError)httpResult; - if (PlayFabSettings.GlobalErrorHandler != null) - PlayFabSettings.GlobalErrorHandler.callback(error); - PlayFabResult result = new PlayFabResult(); - result.Error = error; - return result; - } - String resultRawJson = (String) httpResult; - - PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); - LoginResult result = resultData.data; - PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; - if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); - - PlayFabResult pfResult = new PlayFabResult(); - pfResult.Result = result; - return pfResult; - } - /** * Removes a contact email from the player's profile. * @param request RemoveContactEmailRequest @@ -9689,76 +9369,6 @@ private static PlayFabResult privateUnlinkTwitchAsync return pfResult; } - /** - * Unlink Windows Hello authentication from the current PlayFab Account - * @deprecated Do not use - * @param request UnlinkWindowsHelloAccountRequest - * @return Async Task will return UnlinkWindowsHelloAccountResponse - */ - @Deprecated - @SuppressWarnings("unchecked") - public static FutureTask> UnlinkWindowsHelloAsync(final UnlinkWindowsHelloAccountRequest request) { - return new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateUnlinkWindowsHelloAsync(request); - } - }); - } - - /** - * Unlink Windows Hello authentication from the current PlayFab Account - * @deprecated Do not use - * @param request UnlinkWindowsHelloAccountRequest - * @return UnlinkWindowsHelloAccountResponse - */ - @Deprecated - @SuppressWarnings("unchecked") - public static PlayFabResult UnlinkWindowsHello(final UnlinkWindowsHelloAccountRequest request) { - FutureTask> task = new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateUnlinkWindowsHelloAsync(request); - } - }); - try { - task.run(); - return task.get(); - } catch(Exception e) { - PlayFabResult exceptionResult = new PlayFabResult(); - exceptionResult.Error = PlayFabHTTP.GeneratePfError(-1, PlayFabErrorCode.Unknown, e.getMessage(), null); - return exceptionResult; - } - } - - /** - * Unlink Windows Hello authentication from the current PlayFab Account - * @deprecated Do not use - */ - @Deprecated - @SuppressWarnings("unchecked") - private static PlayFabResult privateUnlinkWindowsHelloAsync(final UnlinkWindowsHelloAccountRequest request) throws Exception { - if (PlayFabSettings.ClientSessionTicket == null) throw new Exception ("Must be logged in to call this method"); - - FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL("/Client/UnlinkWindowsHello"), request, "X-Authorization", PlayFabSettings.ClientSessionTicket); - task.run(); - Object httpResult = task.get(); - if (httpResult instanceof PlayFabError) { - PlayFabError error = (PlayFabError)httpResult; - if (PlayFabSettings.GlobalErrorHandler != null) - PlayFabSettings.GlobalErrorHandler.callback(error); - PlayFabResult result = new PlayFabResult(); - result.Error = error; - return result; - } - String resultRawJson = (String) httpResult; - - PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); - UnlinkWindowsHelloAccountResponse result = resultData.data; - - PlayFabResult pfResult = new PlayFabResult(); - pfResult.Result = result; - return pfResult; - } - /** * Unlinks the related Xbox Live account from the user's PlayFab account * @param request UnlinkXboxAccountRequest @@ -10930,17 +10540,4 @@ private static PlayFabResult privateWriteTitleEventAsync(fin return pfResult; } - public static void MultiStepClientLogin(Boolean needsAttribution) { - if (needsAttribution && !PlayFabSettings.DisableAdvertising && PlayFabSettings.AdvertisingIdType != null && PlayFabSettings.AdvertisingIdValue != null) { - PlayFabClientModels.AttributeInstallRequest request = new PlayFabClientModels.AttributeInstallRequest(); - if (PlayFabSettings.AdvertisingIdType == PlayFabSettings.AD_TYPE_IDFA) - request.Idfa = PlayFabSettings.AdvertisingIdValue; - else if (PlayFabSettings.AdvertisingIdType == PlayFabSettings.AD_TYPE_ANDROID_ID) - request.Adid = PlayFabSettings.AdvertisingIdValue; - else - return; - FutureTask> task = AttributeInstallAsync(request); - task.run(); - } - } } diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java index 67b79c21d..b0f8a4759 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java @@ -2266,30 +2266,6 @@ public static class GetUserInventoryResult { } - /** - * Requires the SHA256 hash of the user's public key. - * @deprecated Do not use - */ - @Deprecated - public static class GetWindowsHelloChallengeRequest { - /** SHA256 hash of the PublicKey generated by Windows Hello. */ - public String PublicKeyHint; - /** - * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a - * title has been selected. - */ - public String TitleId; - - } - - /** @deprecated Do not use */ - @Deprecated - public static class GetWindowsHelloChallengeResponse { - /** Server generated challenge to be signed by the user. */ - public String Challenge; - - } - public static class GooglePlayFabIdPair { /** Unique Google identifier for a user. */ public String GoogleId; @@ -2672,31 +2648,6 @@ public static class LinkTwitchAccountResult { } - /** - * PublicKey must be generated using the Windows Hello Passport service. - * @deprecated Do not use - */ - @Deprecated - public static class LinkWindowsHelloAccountRequest { - /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ - public Map CustomTags; - /** Device name. */ - public String DeviceName; - /** If another user is already linked to the account, unlink the other user and re-link. */ - public Boolean ForceLink; - /** PublicKey generated by Windows Hello. */ - public String PublicKey; - /** Player's user named used by Windows Hello. */ - public String UserName; - - } - - /** @deprecated Do not use */ - @Deprecated - public static class LinkWindowsHelloAccountResponse { - - } - public static class LinkXboxAccountRequest { /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ public Map CustomTags; @@ -3288,28 +3239,6 @@ public static class LoginWithTwitchRequest { } - /** - * Requires both the SHA256 hash of the user's public key as well as the signed response from GetWindowsHelloChallenge - * @deprecated Do not use - */ - @Deprecated - public static class LoginWithWindowsHelloRequest { - /** The signed response from the user for the Challenge. */ - public String ChallengeSignature; - /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ - public Map CustomTags; - /** Flags for which pieces of info to return for the user. */ - public GetPlayerCombinedInfoRequestParams InfoRequestParameters; - /** SHA256 hash of the PublicKey generated by Windows Hello. */ - public String PublicKeyHint; - /** - * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a - * title has been selected. - */ - public String TitleId; - - } - /** * If this is the first time a user has signed in with the Xbox Live account and CreateAccount is set to true, a new * PlayFab account will be created and linked to the Xbox Live account. In this case, no email or username will be @@ -3857,34 +3786,6 @@ public static class RegisterPlayFabUserResult { } - /** - * PublicKey must be generated using the Windows Hello Passport service. - * @deprecated Do not use - */ - @Deprecated - public static class RegisterWithWindowsHelloRequest { - /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ - public Map CustomTags; - /** Device name. */ - public String DeviceName; - /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */ - public String EncryptedRequest; - /** Flags for which pieces of info to return for the user. */ - public GetPlayerCombinedInfoRequestParams InfoRequestParameters; - /** Player secret that is used to verify API request signatures (Enterprise Only). */ - public String PlayerSecret; - /** PublicKey generated by Windows Hello. */ - public String PublicKey; - /** - * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a - * title has been selected. - */ - public String TitleId; - /** Player's user name used by Windows Hello. */ - public String UserName; - - } - /** This API removes an existing contact email from the player's profile. */ public static class RemoveContactEmailRequest { /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ @@ -4575,25 +4476,6 @@ public static class UnlinkTwitchAccountResult { } - /** - * Must include the Public Key Hint - * @deprecated Do not use - */ - @Deprecated - public static class UnlinkWindowsHelloAccountRequest { - /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ - public Map CustomTags; - /** SHA256 hash of the PublicKey generated by Windows Hello. */ - public String PublicKeyHint; - - } - - /** @deprecated Do not use */ - @Deprecated - public static class UnlinkWindowsHelloAccountResponse { - - } - public static class UnlinkXboxAccountRequest { /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ public Map CustomTags; diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabCloudScriptAPI.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabCloudScriptAPI.java index f9b2eaf93..1864def3c 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabCloudScriptAPI.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabCloudScriptAPI.java @@ -766,4 +766,5 @@ private static PlayFabResult privateUnregisterFunctionAsync(final U pfResult.Result = result; return pfResult; } + } diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabDataAPI.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabDataAPI.java index 41ce9b008..84fb722a2 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabDataAPI.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabDataAPI.java @@ -451,4 +451,5 @@ private static PlayFabResult privateSetObjectsAsync(final Se pfResult.Result = result; return pfResult; } + } diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java index c56827fd9..75e6889fd 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java @@ -634,6 +634,8 @@ public static enum PlayFabErrorCode { UpdateSegmentRateLimitExceeded(10009), GetSegmentsRateLimitExceeded(10010), AsyncExportNotInFlight(10011), + AsyncExportNotFound(10012), + AsyncExportRateLimitExceeded(10013), SnapshotNotFound(11000), InventoryApiNotImplemented(12000); diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabExperimentationAPI.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabExperimentationAPI.java index aca4f28fd..29f33dfad 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabExperimentationAPI.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabExperimentationAPI.java @@ -818,4 +818,5 @@ private static PlayFabResult privateUpdateExperimentAsync(final U pfResult.Result = result; return pfResult; } + } diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabGroupsAPI.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabGroupsAPI.java index d99bc71a3..6b8a54531 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabGroupsAPI.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabGroupsAPI.java @@ -1566,4 +1566,5 @@ private static PlayFabResult privateUpdateRoleAsync(fin pfResult.Result = result; return pfResult; } + } diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabInsightsAPI.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabInsightsAPI.java index 89c3b60a2..53cb06f34 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabInsightsAPI.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabInsightsAPI.java @@ -394,4 +394,5 @@ private static PlayFabResult privateSetStorageRetenti pfResult.Result = result; return pfResult; } + } diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabLocalizationAPI.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabLocalizationAPI.java index 238979470..7f69652c2 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabLocalizationAPI.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabLocalizationAPI.java @@ -74,4 +74,5 @@ private static PlayFabResult privateGetLanguageListAsyn pfResult.Result = result; return pfResult; } + } diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabMultiplayerAPI.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabMultiplayerAPI.java index 77179bd21..04ade79d0 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabMultiplayerAPI.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabMultiplayerAPI.java @@ -3764,4 +3764,5 @@ private static PlayFabResult privateUploadCertificateAsync(final pfResult.Result = result; return pfResult; } + } diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabProfilesAPI.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabProfilesAPI.java index b78b7762a..7d3c33be8 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabProfilesAPI.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabProfilesAPI.java @@ -454,4 +454,5 @@ private static PlayFabResult privateSetProfilePo pfResult.Result = result; return pfResult; } + } diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabSettings.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabSettings.java index 139a7dbd2..a7402ebc1 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabSettings.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabSettings.java @@ -9,9 +9,9 @@ import com.playfab.PlayFabErrors.ErrorCallback; public class PlayFabSettings { - public static String SdkVersion = "0.131.210511"; - public static String BuildIdentifier = "jbuild_javasdk_sdk-generic-2_2"; - public static String SdkVersionString = "JavaSDK-0.131.210511"; + public static String SdkVersion = "0.132.210521"; + public static String BuildIdentifier = "jbuild_javasdk_sdk-generic-2_0"; + public static String SdkVersionString = "JavaSDK-0.132.210521"; public static Map RequestGetParams; static { @@ -27,15 +27,8 @@ public class PlayFabSettings { public static String EntityToken = null; // Set by GetEntityToken public static String DeveloperSecretKey = null; // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website) public static String ClientSessionTicket = null; // Set by any Client Login Call - public static String AdvertisingIdType = null; // Set this to the appropriate AD_TYPE_X constant below - public static String AdvertisingIdValue = null; // Set this to corresponding device value public static Context androidContext = null; // Context object for android devices - // DisableAdvertising is provided for completeness, but changing it is not suggested - // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly - public static Boolean DisableAdvertising = false; - public static final String AD_TYPE_IDFA = "Idfa"; - public static final String AD_TYPE_ANDROID_ID = "Adid"; public static String GetURL(String apiCall) { StringBuilder sb = new StringBuilder(1000); diff --git a/AndroidStudioExample/app/src/test/java/com/playfab/test/PlayFabApiTest.java b/AndroidStudioExample/app/src/test/java/com/playfab/test/PlayFabApiTest.java index 136c23aee..07a20b64d 100644 --- a/AndroidStudioExample/app/src/test/java/com/playfab/test/PlayFabApiTest.java +++ b/AndroidStudioExample/app/src/test/java/com/playfab/test/PlayFabApiTest.java @@ -160,25 +160,6 @@ public void LoginOrRegister() playFabId = result.Result.PlayFabId; } - /** - * CLIENT API - * Test that the login call sequence sends the AdvertisingId when set - */ - @Test - public void LoginWithAdvertisingId() - { - PlayFabSettings.AdvertisingIdType = PlayFabSettings.AD_TYPE_ANDROID_ID; - PlayFabSettings.AdvertisingIdValue = "PlayFabTestId"; - - PlayFabClientModels.LoginWithCustomIDRequest request = new PlayFabClientModels.LoginWithCustomIDRequest(); - request.TitleId = PlayFabSettings.TitleId; - request.CustomId = PlayFabSettings.BuildIdentifier; - request.CreateAccount = true; - PlayFabResult result = PlayFabClientAPI.LoginWithCustomID(request); - - assertEquals(PlayFabSettings.AD_TYPE_ANDROID_ID, PlayFabSettings.AdvertisingIdType); - } - /** * CLIENT API * Test a sequence of calls that modifies saved data, diff --git a/PlayFabClientSDK/packageMe.ps1 b/PlayFabClientSDK/packageMe.ps1 index 8ae7e7409..60bad3d12 100644 --- a/PlayFabClientSDK/packageMe.ps1 +++ b/PlayFabClientSDK/packageMe.ps1 @@ -5,4 +5,4 @@ New-Item -ItemType Directory -Force ./builds popd cd target -Copy-Item client-sdk-0.131.210511.jar -Destination ../../builds/client-sdk-0.131.210511.jar \ No newline at end of file +Copy-Item client-sdk-0.132.210521.jar -Destination ../../builds/client-sdk-0.132.210521.jar \ No newline at end of file diff --git a/PlayFabClientSDK/packageMe.sh b/PlayFabClientSDK/packageMe.sh index eb5be3732..188c6654f 100644 --- a/PlayFabClientSDK/packageMe.sh +++ b/PlayFabClientSDK/packageMe.sh @@ -7,4 +7,4 @@ mkdir -p ./builds popd cd target -cp client-sdk-0.131.210511.jar ../../builds/client-sdk-0.131.210511.jar +cp client-sdk-0.132.210521.jar ../../builds/client-sdk-0.132.210521.jar diff --git a/PlayFabClientSDK/pom.xml b/PlayFabClientSDK/pom.xml index 625c57d53..7e6c3559f 100644 --- a/PlayFabClientSDK/pom.xml +++ b/PlayFabClientSDK/pom.xml @@ -14,7 +14,7 @@ com.playfab client-sdk - 0.131.210511 + 0.132.210521 PlayFab Client API PlayFab is the unified backend platform for games — everything you need to build and operate your game, all in one place, so you can focus on creating and delivering a great player experience. https://docs.microsoft.com/gaming/playfab/ diff --git a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabAuthenticationAPI.java b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabAuthenticationAPI.java index 6e7230d62..37991104c 100644 --- a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabAuthenticationAPI.java +++ b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabAuthenticationAPI.java @@ -149,4 +149,5 @@ private static PlayFabResult privateValidateEntityT pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabClientAPI.java b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabClientAPI.java index 2d89ea9f6..6beeb7747 100644 --- a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabClientAPI.java +++ b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabClientAPI.java @@ -602,8 +602,6 @@ private static PlayFabResult privateAttributeInstallAsyn PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); AttributeInstallResult result = resultData.data; - // Modify AdvertisingIdType: Prevents us from sending the id multiple times, and allows automated tests to determine id was sent successfully - PlayFabSettings.AdvertisingIdType += "_Successful"; PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -4602,75 +4600,6 @@ private static PlayFabResult privateGetUserReadOnlyDataAsync( return pfResult; } - /** - * Requests a challenge from the server to be signed by Windows Hello Passport service to authenticate. - * @deprecated Do not use - * @param request GetWindowsHelloChallengeRequest - * @return Async Task will return GetWindowsHelloChallengeResponse - */ - @Deprecated - @SuppressWarnings("unchecked") - public static FutureTask> GetWindowsHelloChallengeAsync(final GetWindowsHelloChallengeRequest request) { - return new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateGetWindowsHelloChallengeAsync(request); - } - }); - } - - /** - * Requests a challenge from the server to be signed by Windows Hello Passport service to authenticate. - * @deprecated Do not use - * @param request GetWindowsHelloChallengeRequest - * @return GetWindowsHelloChallengeResponse - */ - @Deprecated - @SuppressWarnings("unchecked") - public static PlayFabResult GetWindowsHelloChallenge(final GetWindowsHelloChallengeRequest request) { - FutureTask> task = new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateGetWindowsHelloChallengeAsync(request); - } - }); - try { - task.run(); - return task.get(); - } catch(Exception e) { - PlayFabResult exceptionResult = new PlayFabResult(); - exceptionResult.Error = PlayFabHTTP.GeneratePfError(-1, PlayFabErrorCode.Unknown, e.getMessage(), null); - return exceptionResult; - } - } - - /** - * Requests a challenge from the server to be signed by Windows Hello Passport service to authenticate. - * @deprecated Do not use - */ - @Deprecated - @SuppressWarnings("unchecked") - private static PlayFabResult privateGetWindowsHelloChallengeAsync(final GetWindowsHelloChallengeRequest request) throws Exception { - - FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL("/Client/GetWindowsHelloChallenge"), request, null, null); - task.run(); - Object httpResult = task.get(); - if (httpResult instanceof PlayFabError) { - PlayFabError error = (PlayFabError)httpResult; - if (PlayFabSettings.GlobalErrorHandler != null) - PlayFabSettings.GlobalErrorHandler.callback(error); - PlayFabResult result = new PlayFabResult(); - result.Error = error; - return result; - } - String resultRawJson = (String) httpResult; - - PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); - GetWindowsHelloChallengeResponse result = resultData.data; - - PlayFabResult pfResult = new PlayFabResult(); - pfResult.Result = result; - return pfResult; - } - /** * Grants the specified character type to the user. CharacterIds are not globally unique; characterId must be evaluated * with the parent PlayFabId to guarantee uniqueness. @@ -5684,76 +5613,6 @@ private static PlayFabResult privateLinkTwitchAsync(fin return pfResult; } - /** - * Link Windows Hello authentication to the current PlayFab Account - * @deprecated Do not use - * @param request LinkWindowsHelloAccountRequest - * @return Async Task will return LinkWindowsHelloAccountResponse - */ - @Deprecated - @SuppressWarnings("unchecked") - public static FutureTask> LinkWindowsHelloAsync(final LinkWindowsHelloAccountRequest request) { - return new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateLinkWindowsHelloAsync(request); - } - }); - } - - /** - * Link Windows Hello authentication to the current PlayFab Account - * @deprecated Do not use - * @param request LinkWindowsHelloAccountRequest - * @return LinkWindowsHelloAccountResponse - */ - @Deprecated - @SuppressWarnings("unchecked") - public static PlayFabResult LinkWindowsHello(final LinkWindowsHelloAccountRequest request) { - FutureTask> task = new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateLinkWindowsHelloAsync(request); - } - }); - try { - task.run(); - return task.get(); - } catch(Exception e) { - PlayFabResult exceptionResult = new PlayFabResult(); - exceptionResult.Error = PlayFabHTTP.GeneratePfError(-1, PlayFabErrorCode.Unknown, e.getMessage(), null); - return exceptionResult; - } - } - - /** - * Link Windows Hello authentication to the current PlayFab Account - * @deprecated Do not use - */ - @Deprecated - @SuppressWarnings("unchecked") - private static PlayFabResult privateLinkWindowsHelloAsync(final LinkWindowsHelloAccountRequest request) throws Exception { - if (PlayFabSettings.ClientSessionTicket == null) throw new Exception ("Must be logged in to call this method"); - - FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL("/Client/LinkWindowsHello"), request, "X-Authorization", PlayFabSettings.ClientSessionTicket); - task.run(); - Object httpResult = task.get(); - if (httpResult instanceof PlayFabError) { - PlayFabError error = (PlayFabError)httpResult; - if (PlayFabSettings.GlobalErrorHandler != null) - PlayFabSettings.GlobalErrorHandler.callback(error); - PlayFabResult result = new PlayFabResult(); - result.Error = error; - return result; - } - String resultRawJson = (String) httpResult; - - PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); - LinkWindowsHelloAccountResponse result = resultData.data; - - PlayFabResult pfResult = new PlayFabResult(); - pfResult.Result = result; - return pfResult; - } - /** * Links the Xbox Live account associated with the provided access code to the user's PlayFab account * @param request LinkXboxAccountRequest @@ -5880,7 +5739,6 @@ private static PlayFabResult privateLoginWithAndroidDeviceIDAsync(f LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -5946,7 +5804,6 @@ private static PlayFabResult privateLoginWithAppleAsync(final Login LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6017,7 +5874,6 @@ private static PlayFabResult privateLoginWithCustomIDAsync(final Lo LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6094,7 +5950,6 @@ private static PlayFabResult privateLoginWithEmailAddressAsync(fina LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6165,7 +6020,6 @@ private static PlayFabResult privateLoginWithFacebookAsync(final Lo LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6236,7 +6090,6 @@ private static PlayFabResult privateLoginWithFacebookInstantGamesId LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6316,7 +6169,6 @@ private static PlayFabResult privateLoginWithGameCenterAsync(final LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6382,7 +6234,6 @@ private static PlayFabResult privateLoginWithGoogleAccountAsync(fin LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6453,7 +6304,6 @@ private static PlayFabResult privateLoginWithIOSDeviceIDAsync(final LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6519,7 +6369,6 @@ private static PlayFabResult privateLoginWithKongregateAsync(final LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6585,7 +6434,6 @@ private static PlayFabResult privateLoginWithNintendoServiceAccount LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6656,7 +6504,6 @@ private static PlayFabResult privateLoginWithNintendoSwitchDeviceId LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6727,7 +6574,6 @@ private static PlayFabResult privateLoginWithOpenIdConnectAsync(fin LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6804,7 +6650,6 @@ private static PlayFabResult privateLoginWithPlayFabAsync(final Log LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6875,7 +6720,6 @@ private static PlayFabResult privateLoginWithPSNAsync(final LoginWi LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6946,7 +6790,6 @@ private static PlayFabResult privateLoginWithSteamAsync(final Login LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -7012,90 +6855,6 @@ private static PlayFabResult privateLoginWithTwitchAsync(final Logi LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); - - PlayFabResult pfResult = new PlayFabResult(); - pfResult.Result = result; - return pfResult; - } - - /** - * Completes the Windows Hello login flow by returning the signed value of the challange from GetWindowsHelloChallenge. - * Windows Hello has a 2 step client to server authentication scheme. Step one is to request from the server a challenge - * string. Step two is to request the user sign the string via Windows Hello and then send the signed value back to the - * server. - * @deprecated Do not use - * @param request LoginWithWindowsHelloRequest - * @return Async Task will return LoginResult - */ - @Deprecated - @SuppressWarnings("unchecked") - public static FutureTask> LoginWithWindowsHelloAsync(final LoginWithWindowsHelloRequest request) { - return new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateLoginWithWindowsHelloAsync(request); - } - }); - } - - /** - * Completes the Windows Hello login flow by returning the signed value of the challange from GetWindowsHelloChallenge. - * Windows Hello has a 2 step client to server authentication scheme. Step one is to request from the server a challenge - * string. Step two is to request the user sign the string via Windows Hello and then send the signed value back to the - * server. - * @deprecated Do not use - * @param request LoginWithWindowsHelloRequest - * @return LoginResult - */ - @Deprecated - @SuppressWarnings("unchecked") - public static PlayFabResult LoginWithWindowsHello(final LoginWithWindowsHelloRequest request) { - FutureTask> task = new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateLoginWithWindowsHelloAsync(request); - } - }); - try { - task.run(); - return task.get(); - } catch(Exception e) { - PlayFabResult exceptionResult = new PlayFabResult(); - exceptionResult.Error = PlayFabHTTP.GeneratePfError(-1, PlayFabErrorCode.Unknown, e.getMessage(), null); - return exceptionResult; - } - } - - /** - * Completes the Windows Hello login flow by returning the signed value of the challange from GetWindowsHelloChallenge. - * Windows Hello has a 2 step client to server authentication scheme. Step one is to request from the server a challenge - * string. Step two is to request the user sign the string via Windows Hello and then send the signed value back to the - * server. - * @deprecated Do not use - */ - @Deprecated - @SuppressWarnings("unchecked") - private static PlayFabResult privateLoginWithWindowsHelloAsync(final LoginWithWindowsHelloRequest request) throws Exception { - request.TitleId = PlayFabSettings.TitleId != null ? PlayFabSettings.TitleId : request.TitleId; - if (request.TitleId == null) throw new Exception ("Must be have PlayFabSettings.TitleId set to call this method"); - - FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL("/Client/LoginWithWindowsHello"), request, null, null); - task.run(); - Object httpResult = task.get(); - if (httpResult instanceof PlayFabError) { - PlayFabError error = (PlayFabError)httpResult; - if (PlayFabSettings.GlobalErrorHandler != null) - PlayFabSettings.GlobalErrorHandler.callback(error); - PlayFabResult result = new PlayFabResult(); - result.Error = error; - return result; - } - String resultRawJson = (String) httpResult; - - PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); - LoginResult result = resultData.data; - PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; - if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -7166,7 +6925,6 @@ private static PlayFabResult privateLoginWithXboxAsync(final LoginW LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -7697,90 +7455,12 @@ private static PlayFabResult privateRegisterPlayFabUs PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); RegisterPlayFabUserResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; return pfResult; } - /** - * Registers a new PlayFab user account using Windows Hello authentication, returning a session ticket that can - * subsequently be used for API calls which require an authenticated user - * @deprecated Do not use - * @param request RegisterWithWindowsHelloRequest - * @return Async Task will return LoginResult - */ - @Deprecated - @SuppressWarnings("unchecked") - public static FutureTask> RegisterWithWindowsHelloAsync(final RegisterWithWindowsHelloRequest request) { - return new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateRegisterWithWindowsHelloAsync(request); - } - }); - } - - /** - * Registers a new PlayFab user account using Windows Hello authentication, returning a session ticket that can - * subsequently be used for API calls which require an authenticated user - * @deprecated Do not use - * @param request RegisterWithWindowsHelloRequest - * @return LoginResult - */ - @Deprecated - @SuppressWarnings("unchecked") - public static PlayFabResult RegisterWithWindowsHello(final RegisterWithWindowsHelloRequest request) { - FutureTask> task = new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateRegisterWithWindowsHelloAsync(request); - } - }); - try { - task.run(); - return task.get(); - } catch(Exception e) { - PlayFabResult exceptionResult = new PlayFabResult(); - exceptionResult.Error = PlayFabHTTP.GeneratePfError(-1, PlayFabErrorCode.Unknown, e.getMessage(), null); - return exceptionResult; - } - } - - /** - * Registers a new PlayFab user account using Windows Hello authentication, returning a session ticket that can - * subsequently be used for API calls which require an authenticated user - * @deprecated Do not use - */ - @Deprecated - @SuppressWarnings("unchecked") - private static PlayFabResult privateRegisterWithWindowsHelloAsync(final RegisterWithWindowsHelloRequest request) throws Exception { - request.TitleId = PlayFabSettings.TitleId != null ? PlayFabSettings.TitleId : request.TitleId; - if (request.TitleId == null) throw new Exception ("Must be have PlayFabSettings.TitleId set to call this method"); - - FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL("/Client/RegisterWithWindowsHello"), request, null, null); - task.run(); - Object httpResult = task.get(); - if (httpResult instanceof PlayFabError) { - PlayFabError error = (PlayFabError)httpResult; - if (PlayFabSettings.GlobalErrorHandler != null) - PlayFabSettings.GlobalErrorHandler.callback(error); - PlayFabResult result = new PlayFabResult(); - result.Error = error; - return result; - } - String resultRawJson = (String) httpResult; - - PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); - LoginResult result = resultData.data; - PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; - if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); - - PlayFabResult pfResult = new PlayFabResult(); - pfResult.Result = result; - return pfResult; - } - /** * Removes a contact email from the player's profile. * @param request RemoveContactEmailRequest @@ -9689,76 +9369,6 @@ private static PlayFabResult privateUnlinkTwitchAsync return pfResult; } - /** - * Unlink Windows Hello authentication from the current PlayFab Account - * @deprecated Do not use - * @param request UnlinkWindowsHelloAccountRequest - * @return Async Task will return UnlinkWindowsHelloAccountResponse - */ - @Deprecated - @SuppressWarnings("unchecked") - public static FutureTask> UnlinkWindowsHelloAsync(final UnlinkWindowsHelloAccountRequest request) { - return new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateUnlinkWindowsHelloAsync(request); - } - }); - } - - /** - * Unlink Windows Hello authentication from the current PlayFab Account - * @deprecated Do not use - * @param request UnlinkWindowsHelloAccountRequest - * @return UnlinkWindowsHelloAccountResponse - */ - @Deprecated - @SuppressWarnings("unchecked") - public static PlayFabResult UnlinkWindowsHello(final UnlinkWindowsHelloAccountRequest request) { - FutureTask> task = new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateUnlinkWindowsHelloAsync(request); - } - }); - try { - task.run(); - return task.get(); - } catch(Exception e) { - PlayFabResult exceptionResult = new PlayFabResult(); - exceptionResult.Error = PlayFabHTTP.GeneratePfError(-1, PlayFabErrorCode.Unknown, e.getMessage(), null); - return exceptionResult; - } - } - - /** - * Unlink Windows Hello authentication from the current PlayFab Account - * @deprecated Do not use - */ - @Deprecated - @SuppressWarnings("unchecked") - private static PlayFabResult privateUnlinkWindowsHelloAsync(final UnlinkWindowsHelloAccountRequest request) throws Exception { - if (PlayFabSettings.ClientSessionTicket == null) throw new Exception ("Must be logged in to call this method"); - - FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL("/Client/UnlinkWindowsHello"), request, "X-Authorization", PlayFabSettings.ClientSessionTicket); - task.run(); - Object httpResult = task.get(); - if (httpResult instanceof PlayFabError) { - PlayFabError error = (PlayFabError)httpResult; - if (PlayFabSettings.GlobalErrorHandler != null) - PlayFabSettings.GlobalErrorHandler.callback(error); - PlayFabResult result = new PlayFabResult(); - result.Error = error; - return result; - } - String resultRawJson = (String) httpResult; - - PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); - UnlinkWindowsHelloAccountResponse result = resultData.data; - - PlayFabResult pfResult = new PlayFabResult(); - pfResult.Result = result; - return pfResult; - } - /** * Unlinks the related Xbox Live account from the user's PlayFab account * @param request UnlinkXboxAccountRequest @@ -10930,17 +10540,4 @@ private static PlayFabResult privateWriteTitleEventAsync(fin return pfResult; } - public static void MultiStepClientLogin(Boolean needsAttribution) { - if (needsAttribution && !PlayFabSettings.DisableAdvertising && PlayFabSettings.AdvertisingIdType != null && PlayFabSettings.AdvertisingIdValue != null) { - PlayFabClientModels.AttributeInstallRequest request = new PlayFabClientModels.AttributeInstallRequest(); - if (PlayFabSettings.AdvertisingIdType == PlayFabSettings.AD_TYPE_IDFA) - request.Idfa = PlayFabSettings.AdvertisingIdValue; - else if (PlayFabSettings.AdvertisingIdType == PlayFabSettings.AD_TYPE_ANDROID_ID) - request.Adid = PlayFabSettings.AdvertisingIdValue; - else - return; - FutureTask> task = AttributeInstallAsync(request); - task.run(); - } - } } diff --git a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabClientModels.java b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabClientModels.java index 67b79c21d..b0f8a4759 100644 --- a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabClientModels.java +++ b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabClientModels.java @@ -2266,30 +2266,6 @@ public static class GetUserInventoryResult { } - /** - * Requires the SHA256 hash of the user's public key. - * @deprecated Do not use - */ - @Deprecated - public static class GetWindowsHelloChallengeRequest { - /** SHA256 hash of the PublicKey generated by Windows Hello. */ - public String PublicKeyHint; - /** - * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a - * title has been selected. - */ - public String TitleId; - - } - - /** @deprecated Do not use */ - @Deprecated - public static class GetWindowsHelloChallengeResponse { - /** Server generated challenge to be signed by the user. */ - public String Challenge; - - } - public static class GooglePlayFabIdPair { /** Unique Google identifier for a user. */ public String GoogleId; @@ -2672,31 +2648,6 @@ public static class LinkTwitchAccountResult { } - /** - * PublicKey must be generated using the Windows Hello Passport service. - * @deprecated Do not use - */ - @Deprecated - public static class LinkWindowsHelloAccountRequest { - /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ - public Map CustomTags; - /** Device name. */ - public String DeviceName; - /** If another user is already linked to the account, unlink the other user and re-link. */ - public Boolean ForceLink; - /** PublicKey generated by Windows Hello. */ - public String PublicKey; - /** Player's user named used by Windows Hello. */ - public String UserName; - - } - - /** @deprecated Do not use */ - @Deprecated - public static class LinkWindowsHelloAccountResponse { - - } - public static class LinkXboxAccountRequest { /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ public Map CustomTags; @@ -3288,28 +3239,6 @@ public static class LoginWithTwitchRequest { } - /** - * Requires both the SHA256 hash of the user's public key as well as the signed response from GetWindowsHelloChallenge - * @deprecated Do not use - */ - @Deprecated - public static class LoginWithWindowsHelloRequest { - /** The signed response from the user for the Challenge. */ - public String ChallengeSignature; - /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ - public Map CustomTags; - /** Flags for which pieces of info to return for the user. */ - public GetPlayerCombinedInfoRequestParams InfoRequestParameters; - /** SHA256 hash of the PublicKey generated by Windows Hello. */ - public String PublicKeyHint; - /** - * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a - * title has been selected. - */ - public String TitleId; - - } - /** * If this is the first time a user has signed in with the Xbox Live account and CreateAccount is set to true, a new * PlayFab account will be created and linked to the Xbox Live account. In this case, no email or username will be @@ -3857,34 +3786,6 @@ public static class RegisterPlayFabUserResult { } - /** - * PublicKey must be generated using the Windows Hello Passport service. - * @deprecated Do not use - */ - @Deprecated - public static class RegisterWithWindowsHelloRequest { - /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ - public Map CustomTags; - /** Device name. */ - public String DeviceName; - /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */ - public String EncryptedRequest; - /** Flags for which pieces of info to return for the user. */ - public GetPlayerCombinedInfoRequestParams InfoRequestParameters; - /** Player secret that is used to verify API request signatures (Enterprise Only). */ - public String PlayerSecret; - /** PublicKey generated by Windows Hello. */ - public String PublicKey; - /** - * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a - * title has been selected. - */ - public String TitleId; - /** Player's user name used by Windows Hello. */ - public String UserName; - - } - /** This API removes an existing contact email from the player's profile. */ public static class RemoveContactEmailRequest { /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ @@ -4575,25 +4476,6 @@ public static class UnlinkTwitchAccountResult { } - /** - * Must include the Public Key Hint - * @deprecated Do not use - */ - @Deprecated - public static class UnlinkWindowsHelloAccountRequest { - /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ - public Map CustomTags; - /** SHA256 hash of the PublicKey generated by Windows Hello. */ - public String PublicKeyHint; - - } - - /** @deprecated Do not use */ - @Deprecated - public static class UnlinkWindowsHelloAccountResponse { - - } - public static class UnlinkXboxAccountRequest { /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ public Map CustomTags; diff --git a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabCloudScriptAPI.java b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabCloudScriptAPI.java index f9b2eaf93..1864def3c 100644 --- a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabCloudScriptAPI.java +++ b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabCloudScriptAPI.java @@ -766,4 +766,5 @@ private static PlayFabResult privateUnregisterFunctionAsync(final U pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabDataAPI.java b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabDataAPI.java index 41ce9b008..84fb722a2 100644 --- a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabDataAPI.java +++ b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabDataAPI.java @@ -451,4 +451,5 @@ private static PlayFabResult privateSetObjectsAsync(final Se pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabErrors.java b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabErrors.java index c56827fd9..75e6889fd 100644 --- a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabErrors.java +++ b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabErrors.java @@ -634,6 +634,8 @@ public static enum PlayFabErrorCode { UpdateSegmentRateLimitExceeded(10009), GetSegmentsRateLimitExceeded(10010), AsyncExportNotInFlight(10011), + AsyncExportNotFound(10012), + AsyncExportRateLimitExceeded(10013), SnapshotNotFound(11000), InventoryApiNotImplemented(12000); diff --git a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabExperimentationAPI.java b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabExperimentationAPI.java index aca4f28fd..29f33dfad 100644 --- a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabExperimentationAPI.java +++ b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabExperimentationAPI.java @@ -818,4 +818,5 @@ private static PlayFabResult privateUpdateExperimentAsync(final U pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabGroupsAPI.java b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabGroupsAPI.java index d99bc71a3..6b8a54531 100644 --- a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabGroupsAPI.java +++ b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabGroupsAPI.java @@ -1566,4 +1566,5 @@ private static PlayFabResult privateUpdateRoleAsync(fin pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabInsightsAPI.java b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabInsightsAPI.java index 89c3b60a2..53cb06f34 100644 --- a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabInsightsAPI.java +++ b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabInsightsAPI.java @@ -394,4 +394,5 @@ private static PlayFabResult privateSetStorageRetenti pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabLocalizationAPI.java b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabLocalizationAPI.java index 238979470..7f69652c2 100644 --- a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabLocalizationAPI.java +++ b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabLocalizationAPI.java @@ -74,4 +74,5 @@ private static PlayFabResult privateGetLanguageListAsyn pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabMultiplayerAPI.java b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabMultiplayerAPI.java index 77179bd21..04ade79d0 100644 --- a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabMultiplayerAPI.java +++ b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabMultiplayerAPI.java @@ -3764,4 +3764,5 @@ private static PlayFabResult privateUploadCertificateAsync(final pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabProfilesAPI.java b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabProfilesAPI.java index b78b7762a..7d3c33be8 100644 --- a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabProfilesAPI.java +++ b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabProfilesAPI.java @@ -454,4 +454,5 @@ private static PlayFabResult privateSetProfilePo pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabSettings.java b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabSettings.java index bac761ca4..8eee2be6e 100644 --- a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabSettings.java +++ b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabSettings.java @@ -8,9 +8,9 @@ import com.playfab.PlayFabErrors.ErrorCallback; public class PlayFabSettings { - public static String SdkVersion = "0.131.210511"; - public static String BuildIdentifier = "jbuild_javasdk_sdk-generic-2_2"; - public static String SdkVersionString = "JavaSDK-0.131.210511"; + public static String SdkVersion = "0.132.210521"; + public static String BuildIdentifier = "jbuild_javasdk_sdk-generic-2_0"; + public static String SdkVersionString = "JavaSDK-0.132.210521"; public static Map RequestGetParams; static { @@ -26,14 +26,7 @@ public class PlayFabSettings { public static String EntityToken = null; // Set by GetEntityToken public static String DeveloperSecretKey = null; // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website) public static String ClientSessionTicket = null; // Set by any Client Login Call - public static String AdvertisingIdType = null; // Set this to the appropriate AD_TYPE_X constant below - public static String AdvertisingIdValue = null; // Set this to corresponding device value - // DisableAdvertising is provided for completeness, but changing it is not suggested - // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly - public static Boolean DisableAdvertising = false; - public static final String AD_TYPE_IDFA = "Idfa"; - public static final String AD_TYPE_ANDROID_ID = "Adid"; public static String GetURL(String apiCall) { StringBuilder sb = new StringBuilder(1000); diff --git a/PlayFabClientSDK/src/test/java/com/playfab/test/PlayFabApiTest.java b/PlayFabClientSDK/src/test/java/com/playfab/test/PlayFabApiTest.java index 136c23aee..07a20b64d 100644 --- a/PlayFabClientSDK/src/test/java/com/playfab/test/PlayFabApiTest.java +++ b/PlayFabClientSDK/src/test/java/com/playfab/test/PlayFabApiTest.java @@ -160,25 +160,6 @@ public void LoginOrRegister() playFabId = result.Result.PlayFabId; } - /** - * CLIENT API - * Test that the login call sequence sends the AdvertisingId when set - */ - @Test - public void LoginWithAdvertisingId() - { - PlayFabSettings.AdvertisingIdType = PlayFabSettings.AD_TYPE_ANDROID_ID; - PlayFabSettings.AdvertisingIdValue = "PlayFabTestId"; - - PlayFabClientModels.LoginWithCustomIDRequest request = new PlayFabClientModels.LoginWithCustomIDRequest(); - request.TitleId = PlayFabSettings.TitleId; - request.CustomId = PlayFabSettings.BuildIdentifier; - request.CreateAccount = true; - PlayFabResult result = PlayFabClientAPI.LoginWithCustomID(request); - - assertEquals(PlayFabSettings.AD_TYPE_ANDROID_ID, PlayFabSettings.AdvertisingIdType); - } - /** * CLIENT API * Test a sequence of calls that modifies saved data, diff --git a/PlayFabSDK/packageMe.ps1 b/PlayFabSDK/packageMe.ps1 index be7c6a873..2e2fe5200 100644 --- a/PlayFabSDK/packageMe.ps1 +++ b/PlayFabSDK/packageMe.ps1 @@ -5,4 +5,4 @@ New-Item -ItemType Directory -Force ./builds popd cd target -Copy-Item combo-sdk-0.131.210511.jar -Destination ../../builds/combo-sdk-0.131.210511.jar \ No newline at end of file +Copy-Item combo-sdk-0.132.210521.jar -Destination ../../builds/combo-sdk-0.132.210521.jar \ No newline at end of file diff --git a/PlayFabSDK/packageMe.sh b/PlayFabSDK/packageMe.sh index 69bab861a..f9b1ff019 100644 --- a/PlayFabSDK/packageMe.sh +++ b/PlayFabSDK/packageMe.sh @@ -7,4 +7,4 @@ mkdir -p ./builds popd cd target -cp combo-sdk-0.131.210511.jar ../../builds/combo-sdk-0.131.210511.jar +cp combo-sdk-0.132.210521.jar ../../builds/combo-sdk-0.132.210521.jar diff --git a/PlayFabSDK/pom.xml b/PlayFabSDK/pom.xml index 9a7b97643..ec0f2a26e 100644 --- a/PlayFabSDK/pom.xml +++ b/PlayFabSDK/pom.xml @@ -14,7 +14,7 @@ com.playfab combo-sdk - 0.131.210511 + 0.132.210521 PlayFab Combo API PlayFab is the unified backend platform for games — everything you need to build and operate your game, all in one place, so you can focus on creating and delivering a great player experience. https://docs.microsoft.com/gaming/playfab/ diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabAdminAPI.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabAdminAPI.java index 4baadf930..4e1d605aa 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabAdminAPI.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabAdminAPI.java @@ -7369,4 +7369,5 @@ private static PlayFabResult privateUpdateUser pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabAdminModels.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabAdminModels.java index b49a82d26..064550f10 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabAdminModels.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabAdminModels.java @@ -2026,6 +2026,8 @@ public static enum GenericErrorCodes { UpdateSegmentRateLimitExceeded, GetSegmentsRateLimitExceeded, AsyncExportNotInFlight, + AsyncExportNotFound, + AsyncExportRateLimitExceeded, SnapshotNotFound, InventoryApiNotImplemented } diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabAuthenticationAPI.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabAuthenticationAPI.java index 6e7230d62..37991104c 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabAuthenticationAPI.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabAuthenticationAPI.java @@ -149,4 +149,5 @@ private static PlayFabResult privateValidateEntityT pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabClientAPI.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabClientAPI.java index 2d89ea9f6..6beeb7747 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabClientAPI.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabClientAPI.java @@ -602,8 +602,6 @@ private static PlayFabResult privateAttributeInstallAsyn PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); AttributeInstallResult result = resultData.data; - // Modify AdvertisingIdType: Prevents us from sending the id multiple times, and allows automated tests to determine id was sent successfully - PlayFabSettings.AdvertisingIdType += "_Successful"; PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -4602,75 +4600,6 @@ private static PlayFabResult privateGetUserReadOnlyDataAsync( return pfResult; } - /** - * Requests a challenge from the server to be signed by Windows Hello Passport service to authenticate. - * @deprecated Do not use - * @param request GetWindowsHelloChallengeRequest - * @return Async Task will return GetWindowsHelloChallengeResponse - */ - @Deprecated - @SuppressWarnings("unchecked") - public static FutureTask> GetWindowsHelloChallengeAsync(final GetWindowsHelloChallengeRequest request) { - return new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateGetWindowsHelloChallengeAsync(request); - } - }); - } - - /** - * Requests a challenge from the server to be signed by Windows Hello Passport service to authenticate. - * @deprecated Do not use - * @param request GetWindowsHelloChallengeRequest - * @return GetWindowsHelloChallengeResponse - */ - @Deprecated - @SuppressWarnings("unchecked") - public static PlayFabResult GetWindowsHelloChallenge(final GetWindowsHelloChallengeRequest request) { - FutureTask> task = new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateGetWindowsHelloChallengeAsync(request); - } - }); - try { - task.run(); - return task.get(); - } catch(Exception e) { - PlayFabResult exceptionResult = new PlayFabResult(); - exceptionResult.Error = PlayFabHTTP.GeneratePfError(-1, PlayFabErrorCode.Unknown, e.getMessage(), null); - return exceptionResult; - } - } - - /** - * Requests a challenge from the server to be signed by Windows Hello Passport service to authenticate. - * @deprecated Do not use - */ - @Deprecated - @SuppressWarnings("unchecked") - private static PlayFabResult privateGetWindowsHelloChallengeAsync(final GetWindowsHelloChallengeRequest request) throws Exception { - - FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL("/Client/GetWindowsHelloChallenge"), request, null, null); - task.run(); - Object httpResult = task.get(); - if (httpResult instanceof PlayFabError) { - PlayFabError error = (PlayFabError)httpResult; - if (PlayFabSettings.GlobalErrorHandler != null) - PlayFabSettings.GlobalErrorHandler.callback(error); - PlayFabResult result = new PlayFabResult(); - result.Error = error; - return result; - } - String resultRawJson = (String) httpResult; - - PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); - GetWindowsHelloChallengeResponse result = resultData.data; - - PlayFabResult pfResult = new PlayFabResult(); - pfResult.Result = result; - return pfResult; - } - /** * Grants the specified character type to the user. CharacterIds are not globally unique; characterId must be evaluated * with the parent PlayFabId to guarantee uniqueness. @@ -5684,76 +5613,6 @@ private static PlayFabResult privateLinkTwitchAsync(fin return pfResult; } - /** - * Link Windows Hello authentication to the current PlayFab Account - * @deprecated Do not use - * @param request LinkWindowsHelloAccountRequest - * @return Async Task will return LinkWindowsHelloAccountResponse - */ - @Deprecated - @SuppressWarnings("unchecked") - public static FutureTask> LinkWindowsHelloAsync(final LinkWindowsHelloAccountRequest request) { - return new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateLinkWindowsHelloAsync(request); - } - }); - } - - /** - * Link Windows Hello authentication to the current PlayFab Account - * @deprecated Do not use - * @param request LinkWindowsHelloAccountRequest - * @return LinkWindowsHelloAccountResponse - */ - @Deprecated - @SuppressWarnings("unchecked") - public static PlayFabResult LinkWindowsHello(final LinkWindowsHelloAccountRequest request) { - FutureTask> task = new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateLinkWindowsHelloAsync(request); - } - }); - try { - task.run(); - return task.get(); - } catch(Exception e) { - PlayFabResult exceptionResult = new PlayFabResult(); - exceptionResult.Error = PlayFabHTTP.GeneratePfError(-1, PlayFabErrorCode.Unknown, e.getMessage(), null); - return exceptionResult; - } - } - - /** - * Link Windows Hello authentication to the current PlayFab Account - * @deprecated Do not use - */ - @Deprecated - @SuppressWarnings("unchecked") - private static PlayFabResult privateLinkWindowsHelloAsync(final LinkWindowsHelloAccountRequest request) throws Exception { - if (PlayFabSettings.ClientSessionTicket == null) throw new Exception ("Must be logged in to call this method"); - - FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL("/Client/LinkWindowsHello"), request, "X-Authorization", PlayFabSettings.ClientSessionTicket); - task.run(); - Object httpResult = task.get(); - if (httpResult instanceof PlayFabError) { - PlayFabError error = (PlayFabError)httpResult; - if (PlayFabSettings.GlobalErrorHandler != null) - PlayFabSettings.GlobalErrorHandler.callback(error); - PlayFabResult result = new PlayFabResult(); - result.Error = error; - return result; - } - String resultRawJson = (String) httpResult; - - PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); - LinkWindowsHelloAccountResponse result = resultData.data; - - PlayFabResult pfResult = new PlayFabResult(); - pfResult.Result = result; - return pfResult; - } - /** * Links the Xbox Live account associated with the provided access code to the user's PlayFab account * @param request LinkXboxAccountRequest @@ -5880,7 +5739,6 @@ private static PlayFabResult privateLoginWithAndroidDeviceIDAsync(f LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -5946,7 +5804,6 @@ private static PlayFabResult privateLoginWithAppleAsync(final Login LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6017,7 +5874,6 @@ private static PlayFabResult privateLoginWithCustomIDAsync(final Lo LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6094,7 +5950,6 @@ private static PlayFabResult privateLoginWithEmailAddressAsync(fina LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6165,7 +6020,6 @@ private static PlayFabResult privateLoginWithFacebookAsync(final Lo LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6236,7 +6090,6 @@ private static PlayFabResult privateLoginWithFacebookInstantGamesId LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6316,7 +6169,6 @@ private static PlayFabResult privateLoginWithGameCenterAsync(final LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6382,7 +6234,6 @@ private static PlayFabResult privateLoginWithGoogleAccountAsync(fin LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6453,7 +6304,6 @@ private static PlayFabResult privateLoginWithIOSDeviceIDAsync(final LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6519,7 +6369,6 @@ private static PlayFabResult privateLoginWithKongregateAsync(final LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6585,7 +6434,6 @@ private static PlayFabResult privateLoginWithNintendoServiceAccount LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6656,7 +6504,6 @@ private static PlayFabResult privateLoginWithNintendoSwitchDeviceId LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6727,7 +6574,6 @@ private static PlayFabResult privateLoginWithOpenIdConnectAsync(fin LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6804,7 +6650,6 @@ private static PlayFabResult privateLoginWithPlayFabAsync(final Log LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6875,7 +6720,6 @@ private static PlayFabResult privateLoginWithPSNAsync(final LoginWi LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -6946,7 +6790,6 @@ private static PlayFabResult privateLoginWithSteamAsync(final Login LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -7012,90 +6855,6 @@ private static PlayFabResult privateLoginWithTwitchAsync(final Logi LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); - - PlayFabResult pfResult = new PlayFabResult(); - pfResult.Result = result; - return pfResult; - } - - /** - * Completes the Windows Hello login flow by returning the signed value of the challange from GetWindowsHelloChallenge. - * Windows Hello has a 2 step client to server authentication scheme. Step one is to request from the server a challenge - * string. Step two is to request the user sign the string via Windows Hello and then send the signed value back to the - * server. - * @deprecated Do not use - * @param request LoginWithWindowsHelloRequest - * @return Async Task will return LoginResult - */ - @Deprecated - @SuppressWarnings("unchecked") - public static FutureTask> LoginWithWindowsHelloAsync(final LoginWithWindowsHelloRequest request) { - return new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateLoginWithWindowsHelloAsync(request); - } - }); - } - - /** - * Completes the Windows Hello login flow by returning the signed value of the challange from GetWindowsHelloChallenge. - * Windows Hello has a 2 step client to server authentication scheme. Step one is to request from the server a challenge - * string. Step two is to request the user sign the string via Windows Hello and then send the signed value back to the - * server. - * @deprecated Do not use - * @param request LoginWithWindowsHelloRequest - * @return LoginResult - */ - @Deprecated - @SuppressWarnings("unchecked") - public static PlayFabResult LoginWithWindowsHello(final LoginWithWindowsHelloRequest request) { - FutureTask> task = new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateLoginWithWindowsHelloAsync(request); - } - }); - try { - task.run(); - return task.get(); - } catch(Exception e) { - PlayFabResult exceptionResult = new PlayFabResult(); - exceptionResult.Error = PlayFabHTTP.GeneratePfError(-1, PlayFabErrorCode.Unknown, e.getMessage(), null); - return exceptionResult; - } - } - - /** - * Completes the Windows Hello login flow by returning the signed value of the challange from GetWindowsHelloChallenge. - * Windows Hello has a 2 step client to server authentication scheme. Step one is to request from the server a challenge - * string. Step two is to request the user sign the string via Windows Hello and then send the signed value back to the - * server. - * @deprecated Do not use - */ - @Deprecated - @SuppressWarnings("unchecked") - private static PlayFabResult privateLoginWithWindowsHelloAsync(final LoginWithWindowsHelloRequest request) throws Exception { - request.TitleId = PlayFabSettings.TitleId != null ? PlayFabSettings.TitleId : request.TitleId; - if (request.TitleId == null) throw new Exception ("Must be have PlayFabSettings.TitleId set to call this method"); - - FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL("/Client/LoginWithWindowsHello"), request, null, null); - task.run(); - Object httpResult = task.get(); - if (httpResult instanceof PlayFabError) { - PlayFabError error = (PlayFabError)httpResult; - if (PlayFabSettings.GlobalErrorHandler != null) - PlayFabSettings.GlobalErrorHandler.callback(error); - PlayFabResult result = new PlayFabResult(); - result.Error = error; - return result; - } - String resultRawJson = (String) httpResult; - - PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); - LoginResult result = resultData.data; - PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; - if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -7166,7 +6925,6 @@ private static PlayFabResult privateLoginWithXboxAsync(final LoginW LoginResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; @@ -7697,90 +7455,12 @@ private static PlayFabResult privateRegisterPlayFabUs PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); RegisterPlayFabUserResult result = resultData.data; PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); PlayFabResult pfResult = new PlayFabResult(); pfResult.Result = result; return pfResult; } - /** - * Registers a new PlayFab user account using Windows Hello authentication, returning a session ticket that can - * subsequently be used for API calls which require an authenticated user - * @deprecated Do not use - * @param request RegisterWithWindowsHelloRequest - * @return Async Task will return LoginResult - */ - @Deprecated - @SuppressWarnings("unchecked") - public static FutureTask> RegisterWithWindowsHelloAsync(final RegisterWithWindowsHelloRequest request) { - return new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateRegisterWithWindowsHelloAsync(request); - } - }); - } - - /** - * Registers a new PlayFab user account using Windows Hello authentication, returning a session ticket that can - * subsequently be used for API calls which require an authenticated user - * @deprecated Do not use - * @param request RegisterWithWindowsHelloRequest - * @return LoginResult - */ - @Deprecated - @SuppressWarnings("unchecked") - public static PlayFabResult RegisterWithWindowsHello(final RegisterWithWindowsHelloRequest request) { - FutureTask> task = new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateRegisterWithWindowsHelloAsync(request); - } - }); - try { - task.run(); - return task.get(); - } catch(Exception e) { - PlayFabResult exceptionResult = new PlayFabResult(); - exceptionResult.Error = PlayFabHTTP.GeneratePfError(-1, PlayFabErrorCode.Unknown, e.getMessage(), null); - return exceptionResult; - } - } - - /** - * Registers a new PlayFab user account using Windows Hello authentication, returning a session ticket that can - * subsequently be used for API calls which require an authenticated user - * @deprecated Do not use - */ - @Deprecated - @SuppressWarnings("unchecked") - private static PlayFabResult privateRegisterWithWindowsHelloAsync(final RegisterWithWindowsHelloRequest request) throws Exception { - request.TitleId = PlayFabSettings.TitleId != null ? PlayFabSettings.TitleId : request.TitleId; - if (request.TitleId == null) throw new Exception ("Must be have PlayFabSettings.TitleId set to call this method"); - - FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL("/Client/RegisterWithWindowsHello"), request, null, null); - task.run(); - Object httpResult = task.get(); - if (httpResult instanceof PlayFabError) { - PlayFabError error = (PlayFabError)httpResult; - if (PlayFabSettings.GlobalErrorHandler != null) - PlayFabSettings.GlobalErrorHandler.callback(error); - PlayFabResult result = new PlayFabResult(); - result.Error = error; - return result; - } - String resultRawJson = (String) httpResult; - - PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); - LoginResult result = resultData.data; - PlayFabSettings.ClientSessionTicket = result.SessionTicket != null ? result.SessionTicket : PlayFabSettings.ClientSessionTicket; - if (result.EntityToken != null) PlayFabSettings.EntityToken = result.EntityToken.EntityToken != null ? result.EntityToken.EntityToken : PlayFabSettings.EntityToken; - MultiStepClientLogin(resultData.data.SettingsForUser.NeedsAttribution); - - PlayFabResult pfResult = new PlayFabResult(); - pfResult.Result = result; - return pfResult; - } - /** * Removes a contact email from the player's profile. * @param request RemoveContactEmailRequest @@ -9689,76 +9369,6 @@ private static PlayFabResult privateUnlinkTwitchAsync return pfResult; } - /** - * Unlink Windows Hello authentication from the current PlayFab Account - * @deprecated Do not use - * @param request UnlinkWindowsHelloAccountRequest - * @return Async Task will return UnlinkWindowsHelloAccountResponse - */ - @Deprecated - @SuppressWarnings("unchecked") - public static FutureTask> UnlinkWindowsHelloAsync(final UnlinkWindowsHelloAccountRequest request) { - return new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateUnlinkWindowsHelloAsync(request); - } - }); - } - - /** - * Unlink Windows Hello authentication from the current PlayFab Account - * @deprecated Do not use - * @param request UnlinkWindowsHelloAccountRequest - * @return UnlinkWindowsHelloAccountResponse - */ - @Deprecated - @SuppressWarnings("unchecked") - public static PlayFabResult UnlinkWindowsHello(final UnlinkWindowsHelloAccountRequest request) { - FutureTask> task = new FutureTask(new Callable>() { - public PlayFabResult call() throws Exception { - return privateUnlinkWindowsHelloAsync(request); - } - }); - try { - task.run(); - return task.get(); - } catch(Exception e) { - PlayFabResult exceptionResult = new PlayFabResult(); - exceptionResult.Error = PlayFabHTTP.GeneratePfError(-1, PlayFabErrorCode.Unknown, e.getMessage(), null); - return exceptionResult; - } - } - - /** - * Unlink Windows Hello authentication from the current PlayFab Account - * @deprecated Do not use - */ - @Deprecated - @SuppressWarnings("unchecked") - private static PlayFabResult privateUnlinkWindowsHelloAsync(final UnlinkWindowsHelloAccountRequest request) throws Exception { - if (PlayFabSettings.ClientSessionTicket == null) throw new Exception ("Must be logged in to call this method"); - - FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL("/Client/UnlinkWindowsHello"), request, "X-Authorization", PlayFabSettings.ClientSessionTicket); - task.run(); - Object httpResult = task.get(); - if (httpResult instanceof PlayFabError) { - PlayFabError error = (PlayFabError)httpResult; - if (PlayFabSettings.GlobalErrorHandler != null) - PlayFabSettings.GlobalErrorHandler.callback(error); - PlayFabResult result = new PlayFabResult(); - result.Error = error; - return result; - } - String resultRawJson = (String) httpResult; - - PlayFabJsonSuccess resultData = gson.fromJson(resultRawJson, new TypeToken>(){}.getType()); - UnlinkWindowsHelloAccountResponse result = resultData.data; - - PlayFabResult pfResult = new PlayFabResult(); - pfResult.Result = result; - return pfResult; - } - /** * Unlinks the related Xbox Live account from the user's PlayFab account * @param request UnlinkXboxAccountRequest @@ -10930,17 +10540,4 @@ private static PlayFabResult privateWriteTitleEventAsync(fin return pfResult; } - public static void MultiStepClientLogin(Boolean needsAttribution) { - if (needsAttribution && !PlayFabSettings.DisableAdvertising && PlayFabSettings.AdvertisingIdType != null && PlayFabSettings.AdvertisingIdValue != null) { - PlayFabClientModels.AttributeInstallRequest request = new PlayFabClientModels.AttributeInstallRequest(); - if (PlayFabSettings.AdvertisingIdType == PlayFabSettings.AD_TYPE_IDFA) - request.Idfa = PlayFabSettings.AdvertisingIdValue; - else if (PlayFabSettings.AdvertisingIdType == PlayFabSettings.AD_TYPE_ANDROID_ID) - request.Adid = PlayFabSettings.AdvertisingIdValue; - else - return; - FutureTask> task = AttributeInstallAsync(request); - task.run(); - } - } } diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabClientModels.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabClientModels.java index 67b79c21d..b0f8a4759 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabClientModels.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabClientModels.java @@ -2266,30 +2266,6 @@ public static class GetUserInventoryResult { } - /** - * Requires the SHA256 hash of the user's public key. - * @deprecated Do not use - */ - @Deprecated - public static class GetWindowsHelloChallengeRequest { - /** SHA256 hash of the PublicKey generated by Windows Hello. */ - public String PublicKeyHint; - /** - * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a - * title has been selected. - */ - public String TitleId; - - } - - /** @deprecated Do not use */ - @Deprecated - public static class GetWindowsHelloChallengeResponse { - /** Server generated challenge to be signed by the user. */ - public String Challenge; - - } - public static class GooglePlayFabIdPair { /** Unique Google identifier for a user. */ public String GoogleId; @@ -2672,31 +2648,6 @@ public static class LinkTwitchAccountResult { } - /** - * PublicKey must be generated using the Windows Hello Passport service. - * @deprecated Do not use - */ - @Deprecated - public static class LinkWindowsHelloAccountRequest { - /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ - public Map CustomTags; - /** Device name. */ - public String DeviceName; - /** If another user is already linked to the account, unlink the other user and re-link. */ - public Boolean ForceLink; - /** PublicKey generated by Windows Hello. */ - public String PublicKey; - /** Player's user named used by Windows Hello. */ - public String UserName; - - } - - /** @deprecated Do not use */ - @Deprecated - public static class LinkWindowsHelloAccountResponse { - - } - public static class LinkXboxAccountRequest { /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ public Map CustomTags; @@ -3288,28 +3239,6 @@ public static class LoginWithTwitchRequest { } - /** - * Requires both the SHA256 hash of the user's public key as well as the signed response from GetWindowsHelloChallenge - * @deprecated Do not use - */ - @Deprecated - public static class LoginWithWindowsHelloRequest { - /** The signed response from the user for the Challenge. */ - public String ChallengeSignature; - /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ - public Map CustomTags; - /** Flags for which pieces of info to return for the user. */ - public GetPlayerCombinedInfoRequestParams InfoRequestParameters; - /** SHA256 hash of the PublicKey generated by Windows Hello. */ - public String PublicKeyHint; - /** - * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a - * title has been selected. - */ - public String TitleId; - - } - /** * If this is the first time a user has signed in with the Xbox Live account and CreateAccount is set to true, a new * PlayFab account will be created and linked to the Xbox Live account. In this case, no email or username will be @@ -3857,34 +3786,6 @@ public static class RegisterPlayFabUserResult { } - /** - * PublicKey must be generated using the Windows Hello Passport service. - * @deprecated Do not use - */ - @Deprecated - public static class RegisterWithWindowsHelloRequest { - /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ - public Map CustomTags; - /** Device name. */ - public String DeviceName; - /** Base64 encoded body that is encrypted with the Title's public RSA key (Enterprise Only). */ - public String EncryptedRequest; - /** Flags for which pieces of info to return for the user. */ - public GetPlayerCombinedInfoRequestParams InfoRequestParameters; - /** Player secret that is used to verify API request signatures (Enterprise Only). */ - public String PlayerSecret; - /** PublicKey generated by Windows Hello. */ - public String PublicKey; - /** - * Unique identifier for the title, found in the Settings > Game Properties section of the PlayFab developer site when a - * title has been selected. - */ - public String TitleId; - /** Player's user name used by Windows Hello. */ - public String UserName; - - } - /** This API removes an existing contact email from the player's profile. */ public static class RemoveContactEmailRequest { /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ @@ -4575,25 +4476,6 @@ public static class UnlinkTwitchAccountResult { } - /** - * Must include the Public Key Hint - * @deprecated Do not use - */ - @Deprecated - public static class UnlinkWindowsHelloAccountRequest { - /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ - public Map CustomTags; - /** SHA256 hash of the PublicKey generated by Windows Hello. */ - public String PublicKeyHint; - - } - - /** @deprecated Do not use */ - @Deprecated - public static class UnlinkWindowsHelloAccountResponse { - - } - public static class UnlinkXboxAccountRequest { /** The optional custom tags associated with the request (e.g. build number, external trace identifiers, etc.). */ public Map CustomTags; diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabCloudScriptAPI.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabCloudScriptAPI.java index f9b2eaf93..1864def3c 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabCloudScriptAPI.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabCloudScriptAPI.java @@ -766,4 +766,5 @@ private static PlayFabResult privateUnregisterFunctionAsync(final U pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabDataAPI.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabDataAPI.java index 41ce9b008..84fb722a2 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabDataAPI.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabDataAPI.java @@ -451,4 +451,5 @@ private static PlayFabResult privateSetObjectsAsync(final Se pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabErrors.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabErrors.java index c56827fd9..75e6889fd 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabErrors.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabErrors.java @@ -634,6 +634,8 @@ public static enum PlayFabErrorCode { UpdateSegmentRateLimitExceeded(10009), GetSegmentsRateLimitExceeded(10010), AsyncExportNotInFlight(10011), + AsyncExportNotFound(10012), + AsyncExportRateLimitExceeded(10013), SnapshotNotFound(11000), InventoryApiNotImplemented(12000); diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabEventsAPI.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabEventsAPI.java index 84b7a96a7..309700236 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabEventsAPI.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabEventsAPI.java @@ -144,4 +144,5 @@ private static PlayFabResult privateWriteTelemetryEventsAsy pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabExperimentationAPI.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabExperimentationAPI.java index aca4f28fd..29f33dfad 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabExperimentationAPI.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabExperimentationAPI.java @@ -818,4 +818,5 @@ private static PlayFabResult privateUpdateExperimentAsync(final U pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabGroupsAPI.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabGroupsAPI.java index d99bc71a3..6b8a54531 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabGroupsAPI.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabGroupsAPI.java @@ -1566,4 +1566,5 @@ private static PlayFabResult privateUpdateRoleAsync(fin pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabInsightsAPI.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabInsightsAPI.java index 89c3b60a2..53cb06f34 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabInsightsAPI.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabInsightsAPI.java @@ -394,4 +394,5 @@ private static PlayFabResult privateSetStorageRetenti pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabLocalizationAPI.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabLocalizationAPI.java index 238979470..7f69652c2 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabLocalizationAPI.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabLocalizationAPI.java @@ -74,4 +74,5 @@ private static PlayFabResult privateGetLanguageListAsyn pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabMatchmakerAPI.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabMatchmakerAPI.java index 468455324..c25c0ad00 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabMatchmakerAPI.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabMatchmakerAPI.java @@ -327,4 +327,5 @@ private static PlayFabResult privateUserInfoAsync(final UserIn pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabMultiplayerAPI.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabMultiplayerAPI.java index 77179bd21..04ade79d0 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabMultiplayerAPI.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabMultiplayerAPI.java @@ -3764,4 +3764,5 @@ private static PlayFabResult privateUploadCertificateAsync(final pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabProfilesAPI.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabProfilesAPI.java index b78b7762a..7d3c33be8 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabProfilesAPI.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabProfilesAPI.java @@ -454,4 +454,5 @@ private static PlayFabResult privateSetProfilePo pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabServerAPI.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabServerAPI.java index 9d55499fd..0b46603fe 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabServerAPI.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabServerAPI.java @@ -8500,4 +8500,5 @@ private static PlayFabResult privateWriteTitleEventAsync(fin pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabServerModels.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabServerModels.java index c47fe3792..5829bd54b 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabServerModels.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabServerModels.java @@ -1728,6 +1728,8 @@ public static enum GenericErrorCodes { UpdateSegmentRateLimitExceeded, GetSegmentsRateLimitExceeded, AsyncExportNotInFlight, + AsyncExportNotFound, + AsyncExportRateLimitExceeded, SnapshotNotFound, InventoryApiNotImplemented } diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabSettings.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabSettings.java index bac761ca4..8eee2be6e 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabSettings.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabSettings.java @@ -8,9 +8,9 @@ import com.playfab.PlayFabErrors.ErrorCallback; public class PlayFabSettings { - public static String SdkVersion = "0.131.210511"; - public static String BuildIdentifier = "jbuild_javasdk_sdk-generic-2_2"; - public static String SdkVersionString = "JavaSDK-0.131.210511"; + public static String SdkVersion = "0.132.210521"; + public static String BuildIdentifier = "jbuild_javasdk_sdk-generic-2_0"; + public static String SdkVersionString = "JavaSDK-0.132.210521"; public static Map RequestGetParams; static { @@ -26,14 +26,7 @@ public class PlayFabSettings { public static String EntityToken = null; // Set by GetEntityToken public static String DeveloperSecretKey = null; // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website) public static String ClientSessionTicket = null; // Set by any Client Login Call - public static String AdvertisingIdType = null; // Set this to the appropriate AD_TYPE_X constant below - public static String AdvertisingIdValue = null; // Set this to corresponding device value - // DisableAdvertising is provided for completeness, but changing it is not suggested - // Disabling this may prevent your advertising-related PlayFab marketplace partners from working correctly - public static Boolean DisableAdvertising = false; - public static final String AD_TYPE_IDFA = "Idfa"; - public static final String AD_TYPE_ANDROID_ID = "Adid"; public static String GetURL(String apiCall) { StringBuilder sb = new StringBuilder(1000); diff --git a/PlayFabSDK/src/test/java/com/playfab/test/PlayFabApiTest.java b/PlayFabSDK/src/test/java/com/playfab/test/PlayFabApiTest.java index 299681ead..a9def1446 100644 --- a/PlayFabSDK/src/test/java/com/playfab/test/PlayFabApiTest.java +++ b/PlayFabSDK/src/test/java/com/playfab/test/PlayFabApiTest.java @@ -163,25 +163,6 @@ public void LoginOrRegister() playFabId = result.Result.PlayFabId; } - /** - * CLIENT API - * Test that the login call sequence sends the AdvertisingId when set - */ - @Test - public void LoginWithAdvertisingId() - { - PlayFabSettings.AdvertisingIdType = PlayFabSettings.AD_TYPE_ANDROID_ID; - PlayFabSettings.AdvertisingIdValue = "PlayFabTestId"; - - PlayFabClientModels.LoginWithCustomIDRequest request = new PlayFabClientModels.LoginWithCustomIDRequest(); - request.TitleId = PlayFabSettings.TitleId; - request.CustomId = PlayFabSettings.BuildIdentifier; - request.CreateAccount = true; - PlayFabResult result = PlayFabClientAPI.LoginWithCustomID(request); - - assertEquals(PlayFabSettings.AD_TYPE_ANDROID_ID, PlayFabSettings.AdvertisingIdType); - } - /** * CLIENT API * Test a sequence of calls that modifies saved data, diff --git a/PlayFabServerSDK/packageMe.ps1 b/PlayFabServerSDK/packageMe.ps1 index e87b8dc01..f29c5fda1 100644 --- a/PlayFabServerSDK/packageMe.ps1 +++ b/PlayFabServerSDK/packageMe.ps1 @@ -5,4 +5,4 @@ New-Item -ItemType Directory -Force ./builds popd cd target -Copy-Item server-sdk-0.131.210511.jar -Destination ../../builds/server-sdk-0.131.210511.jar \ No newline at end of file +Copy-Item server-sdk-0.132.210521.jar -Destination ../../builds/server-sdk-0.132.210521.jar \ No newline at end of file diff --git a/PlayFabServerSDK/packageMe.sh b/PlayFabServerSDK/packageMe.sh index 733fa5f74..8d879655c 100644 --- a/PlayFabServerSDK/packageMe.sh +++ b/PlayFabServerSDK/packageMe.sh @@ -7,4 +7,4 @@ mkdir -p ./builds popd cd target -cp server-sdk-0.131.210511.jar ../../builds/server-sdk-0.131.210511.jar +cp server-sdk-0.132.210521.jar ../../builds/server-sdk-0.132.210521.jar diff --git a/PlayFabServerSDK/pom.xml b/PlayFabServerSDK/pom.xml index 15b23accf..47982be3b 100644 --- a/PlayFabServerSDK/pom.xml +++ b/PlayFabServerSDK/pom.xml @@ -14,7 +14,7 @@ com.playfab server-sdk - 0.131.210511 + 0.132.210521 PlayFab Server API PlayFab is the unified backend platform for games — everything you need to build and operate your game, all in one place, so you can focus on creating and delivering a great player experience. https://docs.microsoft.com/gaming/playfab/ diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabAdminAPI.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabAdminAPI.java index 4baadf930..4e1d605aa 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabAdminAPI.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabAdminAPI.java @@ -7369,4 +7369,5 @@ private static PlayFabResult privateUpdateUser pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabAdminModels.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabAdminModels.java index b49a82d26..064550f10 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabAdminModels.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabAdminModels.java @@ -2026,6 +2026,8 @@ public static enum GenericErrorCodes { UpdateSegmentRateLimitExceeded, GetSegmentsRateLimitExceeded, AsyncExportNotInFlight, + AsyncExportNotFound, + AsyncExportRateLimitExceeded, SnapshotNotFound, InventoryApiNotImplemented } diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabAuthenticationAPI.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabAuthenticationAPI.java index 6e7230d62..37991104c 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabAuthenticationAPI.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabAuthenticationAPI.java @@ -149,4 +149,5 @@ private static PlayFabResult privateValidateEntityT pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabCloudScriptAPI.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabCloudScriptAPI.java index f9b2eaf93..1864def3c 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabCloudScriptAPI.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabCloudScriptAPI.java @@ -766,4 +766,5 @@ private static PlayFabResult privateUnregisterFunctionAsync(final U pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabDataAPI.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabDataAPI.java index 41ce9b008..84fb722a2 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabDataAPI.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabDataAPI.java @@ -451,4 +451,5 @@ private static PlayFabResult privateSetObjectsAsync(final Se pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabErrors.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabErrors.java index c56827fd9..75e6889fd 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabErrors.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabErrors.java @@ -634,6 +634,8 @@ public static enum PlayFabErrorCode { UpdateSegmentRateLimitExceeded(10009), GetSegmentsRateLimitExceeded(10010), AsyncExportNotInFlight(10011), + AsyncExportNotFound(10012), + AsyncExportRateLimitExceeded(10013), SnapshotNotFound(11000), InventoryApiNotImplemented(12000); diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabEventsAPI.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabEventsAPI.java index 84b7a96a7..309700236 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabEventsAPI.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabEventsAPI.java @@ -144,4 +144,5 @@ private static PlayFabResult privateWriteTelemetryEventsAsy pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabGroupsAPI.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabGroupsAPI.java index d99bc71a3..6b8a54531 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabGroupsAPI.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabGroupsAPI.java @@ -1566,4 +1566,5 @@ private static PlayFabResult privateUpdateRoleAsync(fin pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabLocalizationAPI.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabLocalizationAPI.java index 238979470..7f69652c2 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabLocalizationAPI.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabLocalizationAPI.java @@ -74,4 +74,5 @@ private static PlayFabResult privateGetLanguageListAsyn pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabMatchmakerAPI.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabMatchmakerAPI.java index 468455324..c25c0ad00 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabMatchmakerAPI.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabMatchmakerAPI.java @@ -327,4 +327,5 @@ private static PlayFabResult privateUserInfoAsync(final UserIn pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabMultiplayerAPI.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabMultiplayerAPI.java index 77179bd21..04ade79d0 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabMultiplayerAPI.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabMultiplayerAPI.java @@ -3764,4 +3764,5 @@ private static PlayFabResult privateUploadCertificateAsync(final pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabProfilesAPI.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabProfilesAPI.java index b78b7762a..7d3c33be8 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabProfilesAPI.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabProfilesAPI.java @@ -454,4 +454,5 @@ private static PlayFabResult privateSetProfilePo pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabServerAPI.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabServerAPI.java index 9d55499fd..0b46603fe 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabServerAPI.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabServerAPI.java @@ -8500,4 +8500,5 @@ private static PlayFabResult privateWriteTitleEventAsync(fin pfResult.Result = result; return pfResult; } + } diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabServerModels.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabServerModels.java index c47fe3792..5829bd54b 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabServerModels.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabServerModels.java @@ -1728,6 +1728,8 @@ public static enum GenericErrorCodes { UpdateSegmentRateLimitExceeded, GetSegmentsRateLimitExceeded, AsyncExportNotInFlight, + AsyncExportNotFound, + AsyncExportRateLimitExceeded, SnapshotNotFound, InventoryApiNotImplemented } diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabSettings.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabSettings.java index 62a3025b0..f5cf7ffeb 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabSettings.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabSettings.java @@ -8,9 +8,9 @@ import com.playfab.PlayFabErrors.ErrorCallback; public class PlayFabSettings { - public static String SdkVersion = "0.131.210511"; - public static String BuildIdentifier = "jbuild_javasdk_sdk-generic-2_2"; - public static String SdkVersionString = "JavaSDK-0.131.210511"; + public static String SdkVersion = "0.132.210521"; + public static String BuildIdentifier = "jbuild_javasdk_sdk-generic-2_0"; + public static String SdkVersionString = "JavaSDK-0.132.210521"; public static Map RequestGetParams; static { diff --git a/builds/client-sdk-0.131.210511.jar b/builds/client-sdk-0.132.210521.jar similarity index 54% rename from builds/client-sdk-0.131.210511.jar rename to builds/client-sdk-0.132.210521.jar index b8bf20945..0544d600a 100644 Binary files a/builds/client-sdk-0.131.210511.jar and b/builds/client-sdk-0.132.210521.jar differ diff --git a/builds/combo-sdk-0.131.210511.jar b/builds/combo-sdk-0.132.210521.jar similarity index 63% rename from builds/combo-sdk-0.131.210511.jar rename to builds/combo-sdk-0.132.210521.jar index 74c9a829a..400b145fb 100644 Binary files a/builds/combo-sdk-0.131.210511.jar and b/builds/combo-sdk-0.132.210521.jar differ