diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java index 8f50544c..c4a51c6f 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabClientModels.java @@ -2843,6 +2843,11 @@ public static class RegisterPlayFabUserRequest { } public static class RegisterPlayFabUserResult { + /** + * If LoginTitlePlayerAccountEntity flag is set on the login request the title_player_account will also be logged in and + * returned. + */ + public EntityTokenResponse EntityToken; /** PlayFab unique identifier for this newly created account. */ public String PlayFabId; /** Unique token identifying the user and game at the server level, for the current session. */ diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabEntityModels.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabEntityModels.java index 96740dd9..3f8388d0 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabEntityModels.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabEntityModels.java @@ -343,6 +343,23 @@ public static class GetEntityProfileResponse { } + public static class GetEntityProfilesRequest { + /** + * Determines whether the objects will be returned as an escaped JSON string or as a un-escaped JSON object. Default is + * JSON string. + */ + public Boolean DataAsObject; + /** Entity keys of the profiles to load. Must be between 1 and 25 */ + public ArrayList Entities; + + } + + public static class GetEntityProfilesResponse { + /** Entity profiles */ + public ArrayList Profiles; + + } + public static class GetEntityTokenRequest { /** The entity to perform this action on. */ public EntityKey Entity; diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java index 1d2a92be..a75ee494 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabErrors.java @@ -12,6 +12,7 @@ public static enum PlayFabErrorCode { Unknown(1), ConnectionError(2), JsonParseError(3), + UnkownError(500), InvalidParams(1000), AccountNotFound(1001), AccountBanned(1002), @@ -372,7 +373,13 @@ public static enum PlayFabErrorCode { EmailReportAlreadySent(1369), EmailReportRecipientBlacklisted(1370), EventNamespaceNotAllowed(1371), - EventEntityNotAllowed(1372); + EventEntityNotAllowed(1372), + InvalidEntityType(1373), + NullTokenResultFromAad(1374), + InvalidTokenResultFromAad(1375), + NoValidCertificateForAad(1376), + InvalidCertificateForAad(1377), + DuplicateDropTableId(1378); public int id; diff --git a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabSettings.java b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabSettings.java index 53ccafd7..28a36f25 100644 --- a/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabSettings.java +++ b/AndroidStudioExample/app/src/main/java/com/playfab/PlayFabSettings.java @@ -4,9 +4,9 @@ import com.playfab.PlayFabErrors.ErrorCallback; public class PlayFabSettings { - public static String SdkVersion = "0.65.180409"; - public static String BuildIdentifier = "jbuild_javasdk_0"; - public static String SdkVersionString = "JavaSDK-0.65.180409"; + public static String SdkVersion = "0.66.180507"; + public static String BuildIdentifier = "jbuild_javasdk_1"; + public static String SdkVersionString = "JavaSDK-0.66.180507"; public static String TitleId = 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 ErrorCallback GlobalErrorHandler; diff --git a/PlayFabClientSDK/pom.xml b/PlayFabClientSDK/pom.xml index 61ddaa9f..38496cab 100644 --- a/PlayFabClientSDK/pom.xml +++ b/PlayFabClientSDK/pom.xml @@ -14,7 +14,7 @@ com.playfab client-sdk - 0.65.180409 + 0.66.180507 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. http://api.playfab.com/ diff --git a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabClientModels.java b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabClientModels.java index 8f50544c..c4a51c6f 100644 --- a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabClientModels.java +++ b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabClientModels.java @@ -2843,6 +2843,11 @@ public static class RegisterPlayFabUserRequest { } public static class RegisterPlayFabUserResult { + /** + * If LoginTitlePlayerAccountEntity flag is set on the login request the title_player_account will also be logged in and + * returned. + */ + public EntityTokenResponse EntityToken; /** PlayFab unique identifier for this newly created account. */ public String PlayFabId; /** Unique token identifying the user and game at the server level, for the current session. */ diff --git a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabEntityAPI.java b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabEntityAPI.java index 45433a98..754e3161 100644 --- a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabEntityAPI.java +++ b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabEntityAPI.java @@ -1165,6 +1165,66 @@ private static PlayFabResult privateGetProfileAsync(fi return pfResult; } + /** + * Retrieves the entity's profile. + * @param request GetEntityProfilesRequest + * @return Async Task will return GetEntityProfilesResponse + */ + @SuppressWarnings("unchecked") + public static FutureTask> GetProfilesAsync(final GetEntityProfilesRequest request) { + return new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateGetProfilesAsync(request); + } + }); + } + + /** + * Retrieves the entity's profile. + * @param request GetEntityProfilesRequest + * @return GetEntityProfilesResponse + */ + @SuppressWarnings("unchecked") + public static PlayFabResult GetProfiles(final GetEntityProfilesRequest request) { + FutureTask> task = new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateGetProfilesAsync(request); + } + }); + try { + task.run(); + return task.get(); + } catch(Exception e) { + return null; + } + } + + /** Retrieves the entity's profile. */ + @SuppressWarnings("unchecked") + private static PlayFabResult privateGetProfilesAsync(final GetEntityProfilesRequest request) throws Exception { + if (PlayFabSettings.EntityToken == null) throw new Exception ("Must call GetEntityToken before you can use the Entity API"); + + FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Profile/GetProfiles", request, "X-EntityToken", PlayFabSettings.EntityToken); + 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()); + GetEntityProfilesResponse result = resultData.data; + + PlayFabResult pfResult = new PlayFabResult(); + pfResult.Result = result; + return pfResult; + } + /** * Initiates file uploads to an entity's profile. * @param request InitiateFileUploadsRequest diff --git a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabEntityModels.java b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabEntityModels.java index 96740dd9..3f8388d0 100644 --- a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabEntityModels.java +++ b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabEntityModels.java @@ -343,6 +343,23 @@ public static class GetEntityProfileResponse { } + public static class GetEntityProfilesRequest { + /** + * Determines whether the objects will be returned as an escaped JSON string or as a un-escaped JSON object. Default is + * JSON string. + */ + public Boolean DataAsObject; + /** Entity keys of the profiles to load. Must be between 1 and 25 */ + public ArrayList Entities; + + } + + public static class GetEntityProfilesResponse { + /** Entity profiles */ + public ArrayList Profiles; + + } + public static class GetEntityTokenRequest { /** The entity to perform this action on. */ public EntityKey Entity; diff --git a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabErrors.java b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabErrors.java index 1d2a92be..a75ee494 100644 --- a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabErrors.java +++ b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabErrors.java @@ -12,6 +12,7 @@ public static enum PlayFabErrorCode { Unknown(1), ConnectionError(2), JsonParseError(3), + UnkownError(500), InvalidParams(1000), AccountNotFound(1001), AccountBanned(1002), @@ -372,7 +373,13 @@ public static enum PlayFabErrorCode { EmailReportAlreadySent(1369), EmailReportRecipientBlacklisted(1370), EventNamespaceNotAllowed(1371), - EventEntityNotAllowed(1372); + EventEntityNotAllowed(1372), + InvalidEntityType(1373), + NullTokenResultFromAad(1374), + InvalidTokenResultFromAad(1375), + NoValidCertificateForAad(1376), + InvalidCertificateForAad(1377), + DuplicateDropTableId(1378); public int id; diff --git a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabSettings.java b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabSettings.java index 56d0a207..4a06ece7 100644 --- a/PlayFabClientSDK/src/main/java/com/playfab/PlayFabSettings.java +++ b/PlayFabClientSDK/src/main/java/com/playfab/PlayFabSettings.java @@ -3,9 +3,9 @@ import com.playfab.PlayFabErrors.ErrorCallback; public class PlayFabSettings { - public static String SdkVersion = "0.65.180409"; - public static String BuildIdentifier = "jbuild_javasdk_0"; - public static String SdkVersionString = "JavaSDK-0.65.180409"; + public static String SdkVersion = "0.66.180507"; + public static String BuildIdentifier = "jbuild_javasdk_1"; + public static String SdkVersionString = "JavaSDK-0.66.180507"; public static String TitleId = 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 ErrorCallback GlobalErrorHandler; diff --git a/PlayFabSDK/pom.xml b/PlayFabSDK/pom.xml index a25a61aa..16d4f40b 100644 --- a/PlayFabSDK/pom.xml +++ b/PlayFabSDK/pom.xml @@ -14,7 +14,7 @@ com.playfab combo-sdk - 0.65.180409 + 0.66.180507 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. http://api.playfab.com/ diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabAdminModels.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabAdminModels.java index 6e8be61b..fea7c058 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabAdminModels.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabAdminModels.java @@ -1105,6 +1105,7 @@ public static class GameModeInfo { public static enum GenericErrorCodes { Success, + UnkownError, InvalidParams, AccountNotFound, AccountBanned, @@ -1465,7 +1466,13 @@ public static enum GenericErrorCodes { EmailReportAlreadySent, EmailReportRecipientBlacklisted, EventNamespaceNotAllowed, - EventEntityNotAllowed + EventEntityNotAllowed, + InvalidEntityType, + NullTokenResultFromAad, + InvalidTokenResultFromAad, + NoValidCertificateForAad, + InvalidCertificateForAad, + DuplicateDropTableId } public static class GetActionsOnPlayersInSegmentTaskInstanceResult { diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabClientModels.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabClientModels.java index 8f50544c..c4a51c6f 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabClientModels.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabClientModels.java @@ -2843,6 +2843,11 @@ public static class RegisterPlayFabUserRequest { } public static class RegisterPlayFabUserResult { + /** + * If LoginTitlePlayerAccountEntity flag is set on the login request the title_player_account will also be logged in and + * returned. + */ + public EntityTokenResponse EntityToken; /** PlayFab unique identifier for this newly created account. */ public String PlayFabId; /** Unique token identifying the user and game at the server level, for the current session. */ diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabEntityAPI.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabEntityAPI.java index 45433a98..754e3161 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabEntityAPI.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabEntityAPI.java @@ -1165,6 +1165,66 @@ private static PlayFabResult privateGetProfileAsync(fi return pfResult; } + /** + * Retrieves the entity's profile. + * @param request GetEntityProfilesRequest + * @return Async Task will return GetEntityProfilesResponse + */ + @SuppressWarnings("unchecked") + public static FutureTask> GetProfilesAsync(final GetEntityProfilesRequest request) { + return new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateGetProfilesAsync(request); + } + }); + } + + /** + * Retrieves the entity's profile. + * @param request GetEntityProfilesRequest + * @return GetEntityProfilesResponse + */ + @SuppressWarnings("unchecked") + public static PlayFabResult GetProfiles(final GetEntityProfilesRequest request) { + FutureTask> task = new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateGetProfilesAsync(request); + } + }); + try { + task.run(); + return task.get(); + } catch(Exception e) { + return null; + } + } + + /** Retrieves the entity's profile. */ + @SuppressWarnings("unchecked") + private static PlayFabResult privateGetProfilesAsync(final GetEntityProfilesRequest request) throws Exception { + if (PlayFabSettings.EntityToken == null) throw new Exception ("Must call GetEntityToken before you can use the Entity API"); + + FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Profile/GetProfiles", request, "X-EntityToken", PlayFabSettings.EntityToken); + 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()); + GetEntityProfilesResponse result = resultData.data; + + PlayFabResult pfResult = new PlayFabResult(); + pfResult.Result = result; + return pfResult; + } + /** * Initiates file uploads to an entity's profile. * @param request InitiateFileUploadsRequest diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabEntityModels.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabEntityModels.java index 96740dd9..3f8388d0 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabEntityModels.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabEntityModels.java @@ -343,6 +343,23 @@ public static class GetEntityProfileResponse { } + public static class GetEntityProfilesRequest { + /** + * Determines whether the objects will be returned as an escaped JSON string or as a un-escaped JSON object. Default is + * JSON string. + */ + public Boolean DataAsObject; + /** Entity keys of the profiles to load. Must be between 1 and 25 */ + public ArrayList Entities; + + } + + public static class GetEntityProfilesResponse { + /** Entity profiles */ + public ArrayList Profiles; + + } + public static class GetEntityTokenRequest { /** The entity to perform this action on. */ public EntityKey Entity; diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabErrors.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabErrors.java index 1d2a92be..a75ee494 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabErrors.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabErrors.java @@ -12,6 +12,7 @@ public static enum PlayFabErrorCode { Unknown(1), ConnectionError(2), JsonParseError(3), + UnkownError(500), InvalidParams(1000), AccountNotFound(1001), AccountBanned(1002), @@ -372,7 +373,13 @@ public static enum PlayFabErrorCode { EmailReportAlreadySent(1369), EmailReportRecipientBlacklisted(1370), EventNamespaceNotAllowed(1371), - EventEntityNotAllowed(1372); + EventEntityNotAllowed(1372), + InvalidEntityType(1373), + NullTokenResultFromAad(1374), + InvalidTokenResultFromAad(1375), + NoValidCertificateForAad(1376), + InvalidCertificateForAad(1377), + DuplicateDropTableId(1378); public int id; diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabServerModels.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabServerModels.java index 03c409c4..91e56b4c 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabServerModels.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabServerModels.java @@ -1018,6 +1018,7 @@ public static enum GameInstanceState { public static enum GenericErrorCodes { Success, + UnkownError, InvalidParams, AccountNotFound, AccountBanned, @@ -1378,7 +1379,13 @@ public static enum GenericErrorCodes { EmailReportAlreadySent, EmailReportRecipientBlacklisted, EventNamespaceNotAllowed, - EventEntityNotAllowed + EventEntityNotAllowed, + InvalidEntityType, + NullTokenResultFromAad, + InvalidTokenResultFromAad, + NoValidCertificateForAad, + InvalidCertificateForAad, + DuplicateDropTableId } public static class GetAllSegmentsRequest { diff --git a/PlayFabSDK/src/main/java/com/playfab/PlayFabSettings.java b/PlayFabSDK/src/main/java/com/playfab/PlayFabSettings.java index 56d0a207..4a06ece7 100644 --- a/PlayFabSDK/src/main/java/com/playfab/PlayFabSettings.java +++ b/PlayFabSDK/src/main/java/com/playfab/PlayFabSettings.java @@ -3,9 +3,9 @@ import com.playfab.PlayFabErrors.ErrorCallback; public class PlayFabSettings { - public static String SdkVersion = "0.65.180409"; - public static String BuildIdentifier = "jbuild_javasdk_0"; - public static String SdkVersionString = "JavaSDK-0.65.180409"; + public static String SdkVersion = "0.66.180507"; + public static String BuildIdentifier = "jbuild_javasdk_1"; + public static String SdkVersionString = "JavaSDK-0.66.180507"; public static String TitleId = 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 ErrorCallback GlobalErrorHandler; diff --git a/PlayFabServerSDK/pom.xml b/PlayFabServerSDK/pom.xml index 818acc29..570ee893 100644 --- a/PlayFabServerSDK/pom.xml +++ b/PlayFabServerSDK/pom.xml @@ -14,7 +14,7 @@ com.playfab server-sdk - 0.65.180409 + 0.66.180507 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. http://api.playfab.com/ diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabAdminModels.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabAdminModels.java index 6e8be61b..fea7c058 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabAdminModels.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabAdminModels.java @@ -1105,6 +1105,7 @@ public static class GameModeInfo { public static enum GenericErrorCodes { Success, + UnkownError, InvalidParams, AccountNotFound, AccountBanned, @@ -1465,7 +1466,13 @@ public static enum GenericErrorCodes { EmailReportAlreadySent, EmailReportRecipientBlacklisted, EventNamespaceNotAllowed, - EventEntityNotAllowed + EventEntityNotAllowed, + InvalidEntityType, + NullTokenResultFromAad, + InvalidTokenResultFromAad, + NoValidCertificateForAad, + InvalidCertificateForAad, + DuplicateDropTableId } public static class GetActionsOnPlayersInSegmentTaskInstanceResult { diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabEntityAPI.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabEntityAPI.java index 45433a98..754e3161 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabEntityAPI.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabEntityAPI.java @@ -1165,6 +1165,66 @@ private static PlayFabResult privateGetProfileAsync(fi return pfResult; } + /** + * Retrieves the entity's profile. + * @param request GetEntityProfilesRequest + * @return Async Task will return GetEntityProfilesResponse + */ + @SuppressWarnings("unchecked") + public static FutureTask> GetProfilesAsync(final GetEntityProfilesRequest request) { + return new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateGetProfilesAsync(request); + } + }); + } + + /** + * Retrieves the entity's profile. + * @param request GetEntityProfilesRequest + * @return GetEntityProfilesResponse + */ + @SuppressWarnings("unchecked") + public static PlayFabResult GetProfiles(final GetEntityProfilesRequest request) { + FutureTask> task = new FutureTask(new Callable>() { + public PlayFabResult call() throws Exception { + return privateGetProfilesAsync(request); + } + }); + try { + task.run(); + return task.get(); + } catch(Exception e) { + return null; + } + } + + /** Retrieves the entity's profile. */ + @SuppressWarnings("unchecked") + private static PlayFabResult privateGetProfilesAsync(final GetEntityProfilesRequest request) throws Exception { + if (PlayFabSettings.EntityToken == null) throw new Exception ("Must call GetEntityToken before you can use the Entity API"); + + FutureTask task = PlayFabHTTP.doPost(PlayFabSettings.GetURL() + "/Profile/GetProfiles", request, "X-EntityToken", PlayFabSettings.EntityToken); + 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()); + GetEntityProfilesResponse result = resultData.data; + + PlayFabResult pfResult = new PlayFabResult(); + pfResult.Result = result; + return pfResult; + } + /** * Initiates file uploads to an entity's profile. * @param request InitiateFileUploadsRequest diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabEntityModels.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabEntityModels.java index 96740dd9..3f8388d0 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabEntityModels.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabEntityModels.java @@ -343,6 +343,23 @@ public static class GetEntityProfileResponse { } + public static class GetEntityProfilesRequest { + /** + * Determines whether the objects will be returned as an escaped JSON string or as a un-escaped JSON object. Default is + * JSON string. + */ + public Boolean DataAsObject; + /** Entity keys of the profiles to load. Must be between 1 and 25 */ + public ArrayList Entities; + + } + + public static class GetEntityProfilesResponse { + /** Entity profiles */ + public ArrayList Profiles; + + } + public static class GetEntityTokenRequest { /** The entity to perform this action on. */ public EntityKey Entity; diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabErrors.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabErrors.java index 1d2a92be..a75ee494 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabErrors.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabErrors.java @@ -12,6 +12,7 @@ public static enum PlayFabErrorCode { Unknown(1), ConnectionError(2), JsonParseError(3), + UnkownError(500), InvalidParams(1000), AccountNotFound(1001), AccountBanned(1002), @@ -372,7 +373,13 @@ public static enum PlayFabErrorCode { EmailReportAlreadySent(1369), EmailReportRecipientBlacklisted(1370), EventNamespaceNotAllowed(1371), - EventEntityNotAllowed(1372); + EventEntityNotAllowed(1372), + InvalidEntityType(1373), + NullTokenResultFromAad(1374), + InvalidTokenResultFromAad(1375), + NoValidCertificateForAad(1376), + InvalidCertificateForAad(1377), + DuplicateDropTableId(1378); public int id; diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabServerModels.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabServerModels.java index 03c409c4..91e56b4c 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabServerModels.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabServerModels.java @@ -1018,6 +1018,7 @@ public static enum GameInstanceState { public static enum GenericErrorCodes { Success, + UnkownError, InvalidParams, AccountNotFound, AccountBanned, @@ -1378,7 +1379,13 @@ public static enum GenericErrorCodes { EmailReportAlreadySent, EmailReportRecipientBlacklisted, EventNamespaceNotAllowed, - EventEntityNotAllowed + EventEntityNotAllowed, + InvalidEntityType, + NullTokenResultFromAad, + InvalidTokenResultFromAad, + NoValidCertificateForAad, + InvalidCertificateForAad, + DuplicateDropTableId } public static class GetAllSegmentsRequest { diff --git a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabSettings.java b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabSettings.java index 15449029..2a8b4bcf 100644 --- a/PlayFabServerSDK/src/main/java/com/playfab/PlayFabSettings.java +++ b/PlayFabServerSDK/src/main/java/com/playfab/PlayFabSettings.java @@ -3,9 +3,9 @@ import com.playfab.PlayFabErrors.ErrorCallback; public class PlayFabSettings { - public static String SdkVersion = "0.65.180409"; - public static String BuildIdentifier = "jbuild_javasdk_0"; - public static String SdkVersionString = "JavaSDK-0.65.180409"; + public static String SdkVersion = "0.66.180507"; + public static String BuildIdentifier = "jbuild_javasdk_1"; + public static String SdkVersionString = "JavaSDK-0.66.180507"; public static String TitleId = 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 ErrorCallback GlobalErrorHandler; diff --git a/builds/client-sdk-0.65.180409-javadoc.jar b/builds/client-sdk-0.65.180409-javadoc.jar deleted file mode 100644 index 0e84c160..00000000 Binary files a/builds/client-sdk-0.65.180409-javadoc.jar and /dev/null differ diff --git a/builds/client-sdk-0.66.180507-javadoc.jar b/builds/client-sdk-0.66.180507-javadoc.jar new file mode 100644 index 00000000..3b7eabe0 Binary files /dev/null and b/builds/client-sdk-0.66.180507-javadoc.jar differ diff --git a/builds/client-sdk-0.65.180409.jar b/builds/client-sdk-0.66.180507.jar similarity index 67% rename from builds/client-sdk-0.65.180409.jar rename to builds/client-sdk-0.66.180507.jar index 1ed515b7..5128a395 100644 Binary files a/builds/client-sdk-0.65.180409.jar and b/builds/client-sdk-0.66.180507.jar differ diff --git a/builds/combo-sdk-0.65.180409-javadoc.jar b/builds/combo-sdk-0.65.180409-javadoc.jar deleted file mode 100644 index cf1f1cd5..00000000 Binary files a/builds/combo-sdk-0.65.180409-javadoc.jar and /dev/null differ diff --git a/builds/combo-sdk-0.66.180507-javadoc.jar b/builds/combo-sdk-0.66.180507-javadoc.jar new file mode 100644 index 00000000..e25929f4 Binary files /dev/null and b/builds/combo-sdk-0.66.180507-javadoc.jar differ diff --git a/builds/combo-sdk-0.65.180409.jar b/builds/combo-sdk-0.66.180507.jar similarity index 66% rename from builds/combo-sdk-0.65.180409.jar rename to builds/combo-sdk-0.66.180507.jar index dcf254cd..d88807e5 100644 Binary files a/builds/combo-sdk-0.65.180409.jar and b/builds/combo-sdk-0.66.180507.jar differ diff --git a/builds/server-sdk-0.65.180409-javadoc.jar b/builds/server-sdk-0.65.180409-javadoc.jar deleted file mode 100644 index bae51843..00000000 Binary files a/builds/server-sdk-0.65.180409-javadoc.jar and /dev/null differ diff --git a/builds/server-sdk-0.66.180507-javadoc.jar b/builds/server-sdk-0.66.180507-javadoc.jar new file mode 100644 index 00000000..bdd183cc Binary files /dev/null and b/builds/server-sdk-0.66.180507-javadoc.jar differ diff --git a/builds/server-sdk-0.65.180409.jar b/builds/server-sdk-0.66.180507.jar similarity index 63% rename from builds/server-sdk-0.65.180409.jar rename to builds/server-sdk-0.66.180507.jar index 484d4eff..a83c848c 100644 Binary files a/builds/server-sdk-0.65.180409.jar and b/builds/server-sdk-0.66.180507.jar differ