Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion PlayFabApiTest.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<body>
<div id="qunit"></div>
<div id="qunit-fixture"></div>
<script src="http://code.jquery.com/jquery-1.7.1.min.js"></script>
<script src="https://code.jquery.com/jquery-1.7.1.min.js"></script><!-- HTTP vs HTTPS here should match where this file is hosted (This file is not strictly meant to be hosted, but rather run locally) -->
<script src="code.jquery.com/qunit/qunit-1.19.0.js"></script>
<script src="PlayFabSDK/PlayFabAdminApi.js"></script>
<script src="PlayFabSDK/PlayFabClientApi.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions PlayFabSDK/PlayFabAdminApi.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ if(!PlayFab.settings) {
if(!PlayFab._internalSettings) {
PlayFab._internalSettings = {
sessionTicket: null,
sdkVersion: "0.22.160705",
buildIdentifier: "jbuild_javascriptsdk_0",
sdkVersion: "0.23.160714",
buildIdentifier: "jbuild_javascriptsdk_1",
productionServerUrl: ".playfabapi.com",
logicServerUrl: null,

Expand Down
36 changes: 34 additions & 2 deletions PlayFabSDK/PlayFabClientApi.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ if(!PlayFab.settings) {
if(!PlayFab._internalSettings) {
PlayFab._internalSettings = {
sessionTicket: null,
sdkVersion: "0.22.160705",
buildIdentifier: "jbuild_javascriptsdk_0",
sdkVersion: "0.23.160714",
buildIdentifier: "jbuild_javascriptsdk_1",
productionServerUrl: ".playfabapi.com",
logicServerUrl: null,

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

LoginWithTwitch: 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/LoginWithTwitch", 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 @@ -318,6 +332,12 @@ PlayFab.ClientApi = {
PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/GetPlayFabIDsFromSteamIDs", request, "X-Authorization", PlayFab._internalSettings.sessionTicket, callback);
},

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

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

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

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

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

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

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

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

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

PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Client/UnlinkTwitch", 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
4 changes: 2 additions & 2 deletions PlayFabSDK/PlayFabMatchmakerApi.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ if(!PlayFab.settings) {
if(!PlayFab._internalSettings) {
PlayFab._internalSettings = {
sessionTicket: null,
sdkVersion: "0.22.160705",
buildIdentifier: "jbuild_javascriptsdk_0",
sdkVersion: "0.23.160714",
buildIdentifier: "jbuild_javascriptsdk_1",
productionServerUrl: ".playfabapi.com",
logicServerUrl: null,

Expand Down
4 changes: 2 additions & 2 deletions PlayFabSDK/PlayFabServerApi.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ if(!PlayFab.settings) {
if(!PlayFab._internalSettings) {
PlayFab._internalSettings = {
sessionTicket: null,
sdkVersion: "0.22.160705",
buildIdentifier: "jbuild_javascriptsdk_0",
sdkVersion: "0.23.160714",
buildIdentifier: "jbuild_javascriptsdk_1",
productionServerUrl: ".playfabapi.com",
logicServerUrl: null,

Expand Down