https://api.playfab.com/releaseNotes/#190312

Author: PlayFabJenkinsBot

PlayFabSdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "playfab-web-sdk",
-  "version": "1.41.190304",
+  "version": "1.42.190312",
   "description": "Playfab SDK for JS client applications",
   "license": "Apache-2.0",
   "repository": {

PlayFabSdk/src/PlayFab/PlayFabAdminApi.js

@@ -21,9 +21,9 @@ if(!PlayFab.settings) {
 if(!PlayFab._internalSettings) {
     PlayFab._internalSettings = {
         entityToken: null,
-        sdkVersion: "1.41.190304",
+        sdkVersion: "1.42.190312",
         requestGetParams: {
-            sdk: "JavaScriptSDK-1.41.190304"
+            sdk: "JavaScriptSDK-1.42.190312"
         },
         sessionTicket: null,
         verticalName: null, // The name of a customer vertical. This is only for customers running a private cluster. Generally you shouldn't touch this
@@ -60,104 +60,179 @@ if(!PlayFab._internalSettings) {
         },
 
         ExecuteRequest: function (url, request, authkey, authValue, callback, customData, extraHeaders) {
-            if (callback != null && typeof (callback) != "function")
-                throw "Callback must be null of a function";
-
-            if (request == null)
-                request = {};
-
-            var startTime = new Date();
-            var requestBody = JSON.stringify(request);
-
-            var urlArr = [url];
-            var getParams = PlayFab._internalSettings.requestGetParams;
-            if (getParams != null) {
-                var firstParam = true;
-                for (var key in getParams) {
-                    if (firstParam) {
-                        urlArr.push("?");
-                        firstParam = false;
-                    } else {
-                        urlArr.push("&");
+            var resultPromise = new Promise(function (resolve, reject) {
+                if (callback != null && typeof (callback) !== "function")
+                    throw "Callback must be null of a function";
+
+                if (request == null)
+                    request = {};
+
+                var startTime = new Date();
+                var requestBody = JSON.stringify(request);
+
+                var urlArr = [url];
+                var getParams = PlayFab._internalSettings.requestGetParams;
+                if (getParams != null) {
+                    var firstParam = true;
+                    for (var key in getParams) {
+                        if (firstParam) {
+                            urlArr.push("?");
+                            firstParam = false;
+                        } else {
+                            urlArr.push("&");
+                        }
+                        urlArr.push(key);
+                        urlArr.push("=");
+                        urlArr.push(getParams[key]);
                     }
-                    urlArr.push(key);
-                    urlArr.push("=");
-                    urlArr.push(getParams[key]);
                 }
-            }
 
-            var completeUrl = urlArr.join("");
+                var completeUrl = urlArr.join("");
 
-            var xhr = new XMLHttpRequest();
-            // window.console.log("URL: " + completeUrl);
-            xhr.open("POST", completeUrl, true);
+                var xhr = new XMLHttpRequest();
+                // window.console.log("URL: " + completeUrl);
+                xhr.open("POST", completeUrl, true);
 
-            xhr.setRequestHeader("Content-Type", "application/json");
-            xhr.setRequestHeader("X-PlayFabSDK", "JavaScriptSDK-" + PlayFab._internalSettings.sdkVersion);
-            if (authkey != null)
-                xhr.setRequestHeader(authkey, authValue);
-            PlayFab._internalSettings.InjectHeaders(xhr, PlayFab.settings.GlobalHeaderInjection);
-            PlayFab._internalSettings.InjectHeaders(xhr, extraHeaders);
+                xhr.setRequestHeader("Content-Type", "application/json");
+                xhr.setRequestHeader("X-PlayFabSDK", "JavaScriptSDK-" + PlayFab._internalSettings.sdkVersion);
+                if (authkey != null)
+                    xhr.setRequestHeader(authkey, authValue);
+                PlayFab._internalSettings.InjectHeaders(xhr, PlayFab.settings.GlobalHeaderInjection);
+                PlayFab._internalSettings.InjectHeaders(xhr, extraHeaders);
 
-            xhr.onloadend = function () {
-                if (callback == null)
-                    return;
+                xhr.onloadend = function () {
+                    if (callback == null)
+                        return;
 
-                var result;
-                try {
-                    // window.console.log("parsing json result: " + xhr.responseText);
-                    result = JSON.parse(xhr.responseText);
-                } catch (e) {
-                    result = {
-                        code: 503, // Service Unavailable
-                        status: "Service Unavailable",
-                        error: "Connection error",
-                        errorCode: 2, // PlayFabErrorCode.ConnectionError
-                        errorMessage: xhr.responseText
-                    };
+                    var result = PlayFab._internalSettings.GetPlayFabResponse(request, xhr, startTime, customData);
+                    if (result.code === 200) {
+                        callback(result, null);
+                    } else {
+                        callback(null, result);
+                    }
                 }
 
-                result.CallBackTimeMS = new Date() - startTime;
-                result.Request = request;
-                result.CustomData = customData;
+                xhr.onerror = function () {
+                    if (callback == null)
+                        return;
 
-                if (result.code === 200)
-                    callback(result, null);
-                else
+                    var result = PlayFab._internalSettings.GetPlayFabResponse(request, xhr, startTime, customData);
                     callback(null, result);
+                }
+
+                xhr.send(requestBody);
+                xhr.onreadystatechange = function () {
+                    if (this.readyState === 4) {
+                        var xhrResult = PlayFab._internalSettings.GetPlayFabResponse(request, this, startTime, customData);
+                        if (this.status === 200) {
+                            resolve(xhrResult);
+                        } else {
+                            reject(xhrResult);
+                        }
+                    }
+                };
+            });
+            // Return a Promise so that calls to various API methods can be handled asynchronously
+            return resultPromise;
+        },
+
+        GetPlayFabResponse: function(request, xhr, startTime, customData) {
+            var result = null;
+            try {
+                // window.console.log("parsing json result: " + xhr.responseText);
+                result = JSON.parse(xhr.responseText);
+            } catch (e) {
+                result = {
+                    code: 503, // Service Unavailable
+                    status: "Service Unavailable",
+                    error: "Connection error",
+                    errorCode: 2, // PlayFabErrorCode.ConnectionError
+                    errorMessage: xhr.responseText
+                };
             }
 
-            xhr.onerror = function () {
-                if (callback == null)
-                    return;
+            result.CallBackTimeMS = new Date() - startTime;
+            result.Request = request;
+            result.CustomData = customData;
+            return result;
+        },
 
-                var result;
-                try {
-                    result = JSON.parse(xhr.responseText);
-                } catch (e) {
-                    result = {
-                        code: 503, // Service Unavailable
-                        status: "Service Unavailable",
-                        error: "Connection error",
-                        errorCode: 2, // PlayFabErrorCode.ConnectionError
-                        errorMessage: xhr.responseText
-                    };
-                }
+        authenticationContext: {
+            PlayFabId: null,
+            EntityId: null,
+            EntityType: null,
+            SessionTicket: null,
+            EntityToken: null
+        },
 
-                result.CallBackTimeMS = new Date() - startTime;
-                result.Request = request;
-                result.CustomData = customData;
+        UpdateAuthenticationContext: function (authenticationContext, result) {
+            var authenticationContextUpdates = {};
+            if(result.data.PlayFabId !== null) {
+                PlayFab._internalSettings.authenticationContext.PlayFabId = result.data.PlayFabId;
+                authenticationContextUpdates.PlayFabId = result.data.PlayFabId;
+            }
+            if(result.data.SessionTicket !== null) {
+                PlayFab._internalSettings.authenticationContext.SessionTicket = result.data.SessionTicket;
+                authenticationContextUpdates.SessionTicket = result.data.SessionTicket;
+            }
+            if (result.data.EntityToken !== null) {
+                PlayFab._internalSettings.authenticationContext.EntityId = result.data.EntityToken.Entity.Id;
+                authenticationContextUpdates.EntityId = result.data.EntityToken.Entity.Id;
+                PlayFab._internalSettings.authenticationContext.EntityType = result.data.EntityToken.Entity.Type;
+                authenticationContextUpdates.EntityType = result.data.EntityToken.Entity.Type;
+                PlayFab._internalSettings.authenticationContext.EntityToken = result.data.EntityToken.EntityToken;
+                authenticationContextUpdates.EntityToken = result.data.EntityToken.EntityToken;
+            }
+            // Update the authenticationContext with values from the result
+            authenticationContext = Object.assign(authenticationContext, authenticationContextUpdates);
+            return authenticationContext;
+        },
 
-                callback(null, result);
+        AuthInfoMap: {
+            "X-EntityToken": {
+                authAttr: "entityToken",
+                authError: "errorEntityToken"
+            },
+            "X-Authorization": {
+                authAttr: "sessionTicket",
+                authError: "errorLoggedIn"
+            },
+            "X-SecretKey": {
+                authAttr: "developerSecretKey",
+                authError: "errorSecretKey"
             }
+        },
 
-            xhr.send(requestBody);
+        GetAuthInfo: function (request, authKey) {
+            // Use the most-recently saved authKey, unless one was provided in the request via the AuthenticationContext
+            var authError = PlayFab._internalSettings.AuthInfoMap[authKey].authError;
+            var authAttr = PlayFab._internalSettings.AuthInfoMap[authKey].authAttr;
+            var defaultAuthValue = null;
+            if (authAttr === "entityToken")
+                defaultAuthValue = PlayFab._internalSettings.entityToken;
+            else if (authAttr === "sessionTicket")
+                defaultAuthValue = PlayFab._internalSettings.sessionTicket;
+            else if (authAttr === "developerSecretKey")
+                defaultAuthValue = PlayFab.settings.developerSecretKey;
+            var authValue = request.AuthenticationContext ? request.AuthenticationContext[authAttr] : defaultAuthValue;
+            return {"authKey": authKey, "authValue": authValue, "authError": authError};
+        },
+
+        ExecuteRequestWrapper: function (apiURL, request, authKey, callback, customData, extraHeaders) {
+            var authValue = null;
+            if (authKey !== null){
+                var authInfo = PlayFab._internalSettings.GetAuthInfo(request, authKey=authKey);
+                var authKey = authInfo.authKey, authValue = authInfo.authValue, authError = authInfo.authError;
+
+                if (!authValue) throw authError;
+            }
+            return PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + apiURL, request, authKey, authValue, callback, customData, extraHeaders);
         }
     }
 }
 
-PlayFab.buildIdentifier = "jbuild_javascriptsdk__sdk-genericslave-3_0";
-PlayFab.sdkVersion = "1.41.190304";
+PlayFab.buildIdentifier = "jbuild_javascriptsdk__sdk-genericslave-1_0";
+PlayFab.sdkVersion = "1.42.190312";
 PlayFab.GenerateErrorReport = function (error) {
     if (error == null)
         return "";
@@ -176,15 +251,15 @@ PlayFab.AuthenticationApi = {
 
     GetEntityToken: function (request, callback, customData, extraHeaders) {
         var authKey = null; var authValue = null;
-        if (!authKey && PlayFab._internalSettings.sessionTicket) { authKey = "X-Authorization"; authValue = PlayFab._internalSettings.sessionTicket; }
-        if (!authKey && PlayFab.settings.developerSecretKey) { authKey = "X-SecretKey"; authValue = PlayFab.settings.developerSecretKey; }
+        if (!authKey && PlayFab._internalSettings.sessionTicket) { var authInfo = PlayFab._internalSettings.GetAuthInfo(request, authKey="X-Authorization"); authKey = authInfo.authKey, authValue = authInfo.authValue; }
+        if (!authKey && PlayFab.settings.developerSecretKey) { var authInfo = PlayFab._internalSettings.GetAuthInfo(request, authKey="X-SecretKey"); authKey = authInfo.authKey, authValue = authInfo.authValue; }
         var overloadCallback = function (result, error) {
             if (result != null && result.data.EntityToken != null)
                 PlayFab._internalSettings.entityToken = result.data.EntityToken;
-            if (callback != null && typeof (callback) == "function")
+            if (callback != null && typeof (callback) === "function")
                 callback(result, error);
         };
-        PlayFab._internalSettings.ExecuteRequest(PlayFab._internalSettings.GetServerUrl() + "/Authentication/GetEntityToken", request, authKey, authValue, overloadCallback, customData, extraHeaders);
+        return PlayFab._internalSettings.ExecuteRequestWrapper("/Authentication/GetEntityToken", request, authKey, overloadCallback, customData, extraHeaders);
     },
 };