Skip to content

Commit

Permalink
Merge pull request #46 from PlayFab/master
Browse files Browse the repository at this point in the history 
Weekly Versioning PR: 160307
  • Loading branch information
@zac-playfab
zac-playfab committed Mar 7, 2016
2 parents 04cd73c + 13aa40c commit e3ee8da
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 74 deletions.
2 changes: 1 addition & 1 deletion PlayFabSDK/PlayFabAdminApi.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if(!PlayFab.settings) {
if(!PlayFab._internalSettings) {
PlayFab._internalSettings = {
sessionTicket: null,
sdkVersion: "0.11.160222",
sdkVersion: "0.12.160307",
productionServerUrl: ".playfabapi.com",
logicServerUrl: null,

Expand Down
78 changes: 7 additions & 71 deletions PlayFabSDK/PlayFabClientApi.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if(!PlayFab.settings) {
if(!PlayFab._internalSettings) {
PlayFab._internalSettings = {
sessionTicket: null,
sdkVersion: "0.11.160222",
sdkVersion: "0.12.160307",
productionServerUrl: ".playfabapi.com",
logicServerUrl: null,

Expand Down Expand Up @@ -236,20 +236,6 @@ PlayFab.ClientApi = {
PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/LoginWithPlayFab", request, null, null, overloadCallback);
},

LoginWithPSN: function (request, callback) {
request.TitleId = PlayFab.settings.titleId != null ? PlayFab.settings.titleId : request.TitleId; if (request.TitleId == null) throw "Must be have PlayFab.settings.titleId set to call this method";

var overloadCallback = function (result, error) {
if (result != null && result.data.SessionTicket != null) {
PlayFab._internalSettings.sessionTicket = result.data.SessionTicket;
PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
}
if (callback != null && typeof (callback) == "function")
callback(result, error);
};
PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/LoginWithPSN", request, null, null, overloadCallback);
},

LoginWithSteam: function (request, callback) {
request.TitleId = PlayFab.settings.titleId != null ? PlayFab.settings.titleId : request.TitleId; if (request.TitleId == null) throw "Must be have PlayFab.settings.titleId set to call this method";

Expand All @@ -264,20 +250,6 @@ PlayFab.ClientApi = {
PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/LoginWithSteam", request, null, null, overloadCallback);
},

LoginWithXbox: function (request, callback) {
request.TitleId = PlayFab.settings.titleId != null ? PlayFab.settings.titleId : request.TitleId; if (request.TitleId == null) throw "Must be have PlayFab.settings.titleId set to call this method";

var overloadCallback = function (result, error) {
if (result != null && result.data.SessionTicket != null) {
PlayFab._internalSettings.sessionTicket = result.data.SessionTicket;
PlayFab.ClientApi._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
}
if (callback != null && typeof (callback) == "function")
callback(result, error);
};
PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/LoginWithXbox", request, null, null, overloadCallback);
},

RegisterPlayFabUser: function (request, callback) {
request.TitleId = PlayFab.settings.titleId != null ? PlayFab.settings.titleId : request.TitleId; if (request.TitleId == null) throw "Must be have PlayFab.settings.titleId set to call this method";

Expand Down Expand Up @@ -328,12 +300,6 @@ PlayFab.ClientApi = {
PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/GetPlayFabIDsFromKongregateIDs", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, callback);
},

GetPlayFabIDsFromPSNAccountIDs: function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";

PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/GetPlayFabIDsFromPSNAccountIDs", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, callback);
},

GetPlayFabIDsFromSteamIDs: function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";

Expand Down Expand Up @@ -388,24 +354,12 @@ PlayFab.ClientApi = {
PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/LinkKongregate", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, callback);
},

LinkPSNAccount: function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";

PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/LinkPSNAccount", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, callback);
},

LinkSteamAccount: function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";

PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/LinkSteamAccount", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, callback);
},

LinkXboxAccount: function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";

PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/LinkXboxAccount", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, callback);
},

SendAccountRecoveryEmail: function (request, callback) {

PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/SendAccountRecoveryEmail", request, null, null, callback);
Expand Down Expand Up @@ -453,24 +407,12 @@ PlayFab.ClientApi = {
PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/UnlinkKongregate", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, callback);
},

UnlinkPSNAccount: function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";

PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/UnlinkPSNAccount", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, callback);
},

UnlinkSteamAccount: function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";

PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/UnlinkSteamAccount", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, callback);
},

UnlinkXboxAccount: function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";

PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/UnlinkXboxAccount", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, callback);
},

UpdateUserTitleDisplayName: function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";

Expand Down Expand Up @@ -519,6 +461,12 @@ PlayFab.ClientApi = {
PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/GetPlayerStatistics", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, callback);
},

GetPlayerStatisticVersions: function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";

PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/GetPlayerStatisticVersions", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, callback);
},

GetUserData: function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";

Expand Down Expand Up @@ -801,18 +749,6 @@ PlayFab.ClientApi = {
PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/UpdateSharedGroupData", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, callback);
},

ConsumePSNEntitlements: function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";

PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/ConsumePSNEntitlements", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, callback);
},

RefreshPSNAuthToken: function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";

PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/RefreshPSNAuthToken", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, callback);
},

GetCloudScriptUrl: function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";

Expand Down
2 changes: 1 addition & 1 deletion PlayFabSDK/PlayFabMatchmakerApi.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if(!PlayFab.settings) {
if(!PlayFab._internalSettings) {
PlayFab._internalSettings = {
sessionTicket: null,
sdkVersion: "0.11.160222",
sdkVersion: "0.12.160307",
productionServerUrl: ".playfabapi.com",
logicServerUrl: null,

Expand Down
8 changes: 7 additions & 1 deletion PlayFabSDK/PlayFabServerApi.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if(!PlayFab.settings) {
if(!PlayFab._internalSettings) {
PlayFab._internalSettings = {
sessionTicket: null,
sdkVersion: "0.11.160222",
sdkVersion: "0.12.160307",
productionServerUrl: ".playfabapi.com",
logicServerUrl: null,

Expand Down Expand Up @@ -158,6 +158,12 @@ PlayFab.ServerApi = {
PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Server/GetPlayerStatistics", request, "X-SecretKey", PlayFab.settings.developerSecretKey, callback);
},

GetPlayerStatisticVersions: function (request, callback) {
if (PlayFab.settings.developerSecretKey == null) throw "Must have PlayFab.settings.developerSecretKey set to call this method";

PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Server/GetPlayerStatisticVersions", request, "X-SecretKey", PlayFab.settings.developerSecretKey, callback);
},

GetUserData: function (request, callback) {
if (PlayFab.settings.developerSecretKey == null) throw "Must have PlayFab.settings.developerSecretKey set to call this method";

Expand Down

0 comments on commit e3ee8da

Please sign in to comment.