Skip to content

Commit

Permalink
Merge pull request #57 from PlayFab/master
Browse files Browse the repository at this point in the history
Weekly Versioning PR: 160307
  • Loading branch information
zac-playfab committed Mar 7, 2016
2 parents b97788f + 0fbec56 commit bf93337
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 182 deletions.
2 changes: 1 addition & 1 deletion PlayFabSdk/PlayFab.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var url = require("url");
var https = require("https");

exports.sdk_version = "0.12.160222";
exports.sdk_version = "0.13.160307";

var settings = exports.settings = {
useDevEnv: false,
Expand Down
98 changes: 9 additions & 89 deletions PlayFabSdk/PlayFabClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,19 +128,6 @@ exports.LoginWithPlayFab = function (request, callback) {
});
};

exports.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";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LoginWithPSN", request, null, null, function (error, result) {
if (result != null && result.data != null) {
PlayFab._internalSettings.sessionTicket = result.data.hasOwnProperty("SessionTicket") ? result.data.SessionTicket : PlayFab._internalSettings.sessionTicket;
exports._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
}
if (callback != null)
callback(error, result);
});
};

exports.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 @@ -154,19 +141,6 @@ exports.LoginWithSteam = function (request, callback) {
});
};

exports.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";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LoginWithXbox", request, null, null, function (error, result) {
if (result != null && result.data != null) {
PlayFab._internalSettings.sessionTicket = result.data.hasOwnProperty("SessionTicket") ? result.data.SessionTicket : PlayFab._internalSettings.sessionTicket;
exports._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
}
if (callback != null)
callback(error, result);
});
};

exports.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 @@ -234,15 +208,6 @@ exports.GetPlayFabIDsFromKongregateIDs = function (request, callback) {
});
};

exports.GetPlayFabIDsFromPSNAccountIDs = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/GetPlayFabIDsFromPSNAccountIDs", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {

if (callback != null)
callback(error, result);
});
};

exports.GetPlayFabIDsFromSteamIDs = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/GetPlayFabIDsFromSteamIDs", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {
Expand Down Expand Up @@ -324,15 +289,6 @@ exports.LinkKongregate = function (request, callback) {
});
};

exports.LinkPSNAccount = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LinkPSNAccount", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {

if (callback != null)
callback(error, result);
});
};

exports.LinkSteamAccount = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LinkSteamAccount", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {
Expand All @@ -342,15 +298,6 @@ exports.LinkSteamAccount = function (request, callback) {
});
};

exports.LinkXboxAccount = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LinkXboxAccount", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {

if (callback != null)
callback(error, result);
});
};

exports.SendAccountRecoveryEmail = function (request, callback) {

PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/SendAccountRecoveryEmail", request, null, null, function (error, result) {
Expand Down Expand Up @@ -423,15 +370,6 @@ exports.UnlinkKongregate = function (request, callback) {
});
};

exports.UnlinkPSNAccount = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/UnlinkPSNAccount", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {

if (callback != null)
callback(error, result);
});
};

exports.UnlinkSteamAccount = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/UnlinkSteamAccount", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {
Expand All @@ -441,15 +379,6 @@ exports.UnlinkSteamAccount = function (request, callback) {
});
};

exports.UnlinkXboxAccount = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/UnlinkXboxAccount", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {

if (callback != null)
callback(error, result);
});
};

exports.UpdateUserTitleDisplayName = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/UpdateUserTitleDisplayName", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {
Expand Down Expand Up @@ -522,6 +451,15 @@ exports.GetPlayerStatistics = function (request, callback) {
});
};

exports.GetPlayerStatisticVersions = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/GetPlayerStatisticVersions", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {

if (callback != null)
callback(error, result);
});
};

exports.GetUserData = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/GetUserData", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {
Expand Down Expand Up @@ -945,24 +883,6 @@ exports.UpdateSharedGroupData = function (request, callback) {
});
};

exports.ConsumePSNEntitlements = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/ConsumePSNEntitlements", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {

if (callback != null)
callback(error, result);
});
};

exports.RefreshPSNAuthToken = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/RefreshPSNAuthToken", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {

if (callback != null)
callback(error, result);
});
};

exports.GetCloudScriptUrl = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/GetCloudScriptUrl", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {
Expand Down
10 changes: 10 additions & 0 deletions PlayFabSdk/PlayFabServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,16 @@ exports.GetPlayerStatistics = function (request, callback) {
});
};

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

PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Server/GetPlayerStatisticVersions", request, "X-SecretKey", PlayFab.settings.developerSecretKey, function (error, result) {

if (callback != null)
callback(error, result);
});
};

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

Expand Down
2 changes: 1 addition & 1 deletion PlayFabSdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "playfab-sdk",
"version": "0.12.160222",
"version": "0.13.160307",
"description": "Playfab SDK for node.js applications",
"license": "Apache-2.0",
"main": "main.js",
Expand Down
2 changes: 1 addition & 1 deletion PlayFabTesting/PlayFab.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var url = require("url");
var https = require("https");

exports.sdk_version = "0.12.160222";
exports.sdk_version = "0.13.160307";

var settings = exports.settings = {
useDevEnv: false,
Expand Down
98 changes: 9 additions & 89 deletions PlayFabTesting/PlayFabClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,19 +128,6 @@ exports.LoginWithPlayFab = function (request, callback) {
});
};

exports.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";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LoginWithPSN", request, null, null, function (error, result) {
if (result != null && result.data != null) {
PlayFab._internalSettings.sessionTicket = result.data.hasOwnProperty("SessionTicket") ? result.data.SessionTicket : PlayFab._internalSettings.sessionTicket;
exports._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
}
if (callback != null)
callback(error, result);
});
};

exports.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 @@ -154,19 +141,6 @@ exports.LoginWithSteam = function (request, callback) {
});
};

exports.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";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LoginWithXbox", request, null, null, function (error, result) {
if (result != null && result.data != null) {
PlayFab._internalSettings.sessionTicket = result.data.hasOwnProperty("SessionTicket") ? result.data.SessionTicket : PlayFab._internalSettings.sessionTicket;
exports._MultiStepClientLogin(result.data.SettingsForUser.NeedsAttribution);
}
if (callback != null)
callback(error, result);
});
};

exports.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 @@ -234,15 +208,6 @@ exports.GetPlayFabIDsFromKongregateIDs = function (request, callback) {
});
};

exports.GetPlayFabIDsFromPSNAccountIDs = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/GetPlayFabIDsFromPSNAccountIDs", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {

if (callback != null)
callback(error, result);
});
};

exports.GetPlayFabIDsFromSteamIDs = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/GetPlayFabIDsFromSteamIDs", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {
Expand Down Expand Up @@ -324,15 +289,6 @@ exports.LinkKongregate = function (request, callback) {
});
};

exports.LinkPSNAccount = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LinkPSNAccount", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {

if (callback != null)
callback(error, result);
});
};

exports.LinkSteamAccount = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LinkSteamAccount", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {
Expand All @@ -342,15 +298,6 @@ exports.LinkSteamAccount = function (request, callback) {
});
};

exports.LinkXboxAccount = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LinkXboxAccount", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {

if (callback != null)
callback(error, result);
});
};

exports.SendAccountRecoveryEmail = function (request, callback) {

PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/SendAccountRecoveryEmail", request, null, null, function (error, result) {
Expand Down Expand Up @@ -423,15 +370,6 @@ exports.UnlinkKongregate = function (request, callback) {
});
};

exports.UnlinkPSNAccount = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/UnlinkPSNAccount", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {

if (callback != null)
callback(error, result);
});
};

exports.UnlinkSteamAccount = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/UnlinkSteamAccount", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {
Expand All @@ -441,15 +379,6 @@ exports.UnlinkSteamAccount = function (request, callback) {
});
};

exports.UnlinkXboxAccount = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/UnlinkXboxAccount", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {

if (callback != null)
callback(error, result);
});
};

exports.UpdateUserTitleDisplayName = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/UpdateUserTitleDisplayName", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {
Expand Down Expand Up @@ -522,6 +451,15 @@ exports.GetPlayerStatistics = function (request, callback) {
});
};

exports.GetPlayerStatisticVersions = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/GetPlayerStatisticVersions", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {

if (callback != null)
callback(error, result);
});
};

exports.GetUserData = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/GetUserData", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {
Expand Down Expand Up @@ -945,24 +883,6 @@ exports.UpdateSharedGroupData = function (request, callback) {
});
};

exports.ConsumePSNEntitlements = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/ConsumePSNEntitlements", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {

if (callback != null)
callback(error, result);
});
};

exports.RefreshPSNAuthToken = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/RefreshPSNAuthToken", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {

if (callback != null)
callback(error, result);
});
};

exports.GetCloudScriptUrl = function (request, callback) {
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/GetCloudScriptUrl", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, function (error, result) {
Expand Down
10 changes: 10 additions & 0 deletions PlayFabTesting/PlayFabServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,16 @@ exports.GetPlayerStatistics = function (request, callback) {
});
};

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

PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Server/GetPlayerStatisticVersions", request, "X-SecretKey", PlayFab.settings.developerSecretKey, function (error, result) {

if (callback != null)
callback(error, result);
});
};

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

Expand Down
2 changes: 1 addition & 1 deletion PlayFabTesting/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "playfab-testing",
"version": "0.12.160222",
"version": "0.13.160307",
"description": "Playfab SDK automated testing example",
"license": "Apache-2.0",
"main": "PlayFabApiTests.js",
Expand Down

0 comments on commit bf93337

Please sign in to comment.