Merge pull request #21 from PlayFab/master

Pushing new version
PlayFab · Nov 9, 2015 · d630cb2 · d630cb2
2 parents e60b588 + 59bf8be
commit d630cb2
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 61 deletions.
diff --git a/PlayFabSdk/PlayFab.js b/PlayFabSdk/PlayFab.js
@@ -1,8 +1,8 @@
 var url = require('url');
 var https = require('https');
 
-exports.sdk_version = "1.0.0";
-exports.api_version = "1.7.20151019";
+exports.sdk_version = "0.3.151109";
+exports.api_version = "1.9.20151109";
 
 exports.settings = {
     useDevEnv: false,
@@ -68,7 +68,7 @@ exports.MakeRequest = function (urlStr, request, authType, authValue, callback)
             if (replyEnvelope.hasOwnProperty("error") || !replyEnvelope.hasOwnProperty("data"))
                 callback(replyEnvelope, null);
             else
-                callback(null, replyEnvelope.data);
+                callback(null, replyEnvelope);
         });
     });
 

diff --git a/PlayFabSdk/PlayFabClient.js b/PlayFabSdk/PlayFabClient.js
@@ -17,7 +17,7 @@ exports.LoginWithAndroidDeviceID = function (request, callback) {
     if (request.TitleId == null) throw "Must be have PlayFab.settings.titleId set to call this method";
 
     PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LoginWithAndroidDeviceID", request, null, null, function (error, result) {
-        PlayFab.settings.sessionTicket = result != null && result.hasOwnProperty("SessionTicket") ? result.SessionTicket : PlayFab.settings.sessionTicket;
+        PlayFab.settings.sessionTicket = result != null && result.data.hasOwnProperty("SessionTicket") ? result.data.SessionTicket : PlayFab.settings.sessionTicket;
 
         if (callback != null)
             callback(error, result);
@@ -29,7 +29,7 @@ exports.LoginWithCustomID = function (request, callback) {
     if (request.TitleId == null) throw "Must be have PlayFab.settings.titleId set to call this method";
 
     PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LoginWithCustomID", request, null, null, function (error, result) {
-        PlayFab.settings.sessionTicket = result != null && result.hasOwnProperty("SessionTicket") ? result.SessionTicket : PlayFab.settings.sessionTicket;
+        PlayFab.settings.sessionTicket = result != null && result.data.hasOwnProperty("SessionTicket") ? result.data.SessionTicket : PlayFab.settings.sessionTicket;
 
         if (callback != null)
             callback(error, result);
@@ -41,7 +41,7 @@ exports.LoginWithEmailAddress = function (request, callback) {
     if (request.TitleId == null) throw "Must be have PlayFab.settings.titleId set to call this method";
 
     PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LoginWithEmailAddress", request, null, null, function (error, result) {
-        PlayFab.settings.sessionTicket = result != null && result.hasOwnProperty("SessionTicket") ? result.SessionTicket : PlayFab.settings.sessionTicket;
+        PlayFab.settings.sessionTicket = result != null && result.data.hasOwnProperty("SessionTicket") ? result.data.SessionTicket : PlayFab.settings.sessionTicket;
 
         if (callback != null)
             callback(error, result);
@@ -53,7 +53,7 @@ exports.LoginWithFacebook = function (request, callback) {
     if (request.TitleId == null) throw "Must be have PlayFab.settings.titleId set to call this method";
 
     PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LoginWithFacebook", request, null, null, function (error, result) {
-        PlayFab.settings.sessionTicket = result != null && result.hasOwnProperty("SessionTicket") ? result.SessionTicket : PlayFab.settings.sessionTicket;
+        PlayFab.settings.sessionTicket = result != null && result.data.hasOwnProperty("SessionTicket") ? result.data.SessionTicket : PlayFab.settings.sessionTicket;
 
         if (callback != null)
             callback(error, result);
@@ -65,7 +65,7 @@ exports.LoginWithGoogleAccount = function (request, callback) {
     if (request.TitleId == null) throw "Must be have PlayFab.settings.titleId set to call this method";
 
     PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LoginWithGoogleAccount", request, null, null, function (error, result) {
-        PlayFab.settings.sessionTicket = result != null && result.hasOwnProperty("SessionTicket") ? result.SessionTicket : PlayFab.settings.sessionTicket;
+        PlayFab.settings.sessionTicket = result != null && result.data.hasOwnProperty("SessionTicket") ? result.data.SessionTicket : PlayFab.settings.sessionTicket;
 
         if (callback != null)
             callback(error, result);
@@ -77,7 +77,7 @@ exports.LoginWithIOSDeviceID = function (request, callback) {
     if (request.TitleId == null) throw "Must be have PlayFab.settings.titleId set to call this method";
 
     PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LoginWithIOSDeviceID", request, null, null, function (error, result) {
-        PlayFab.settings.sessionTicket = result != null && result.hasOwnProperty("SessionTicket") ? result.SessionTicket : PlayFab.settings.sessionTicket;
+        PlayFab.settings.sessionTicket = result != null && result.data.hasOwnProperty("SessionTicket") ? result.data.SessionTicket : PlayFab.settings.sessionTicket;
 
         if (callback != null)
             callback(error, result);
@@ -89,7 +89,7 @@ exports.LoginWithKongregate = function (request, callback) {
     if (request.TitleId == null) throw "Must be have PlayFab.settings.titleId set to call this method";
 
     PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LoginWithKongregate", request, null, null, function (error, result) {
-        PlayFab.settings.sessionTicket = result != null && result.hasOwnProperty("SessionTicket") ? result.SessionTicket : PlayFab.settings.sessionTicket;
+        PlayFab.settings.sessionTicket = result != null && result.data.hasOwnProperty("SessionTicket") ? result.data.SessionTicket : PlayFab.settings.sessionTicket;
 
         if (callback != null)
             callback(error, result);
@@ -101,7 +101,7 @@ exports.LoginWithPlayFab = function (request, callback) {
     if (request.TitleId == null) throw "Must be have PlayFab.settings.titleId set to call this method";
 
     PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LoginWithPlayFab", request, null, null, function (error, result) {
-        PlayFab.settings.sessionTicket = result != null && result.hasOwnProperty("SessionTicket") ? result.SessionTicket : PlayFab.settings.sessionTicket;
+        PlayFab.settings.sessionTicket = result != null && result.data.hasOwnProperty("SessionTicket") ? result.data.SessionTicket : PlayFab.settings.sessionTicket;
 
         if (callback != null)
             callback(error, result);
@@ -113,7 +113,7 @@ exports.LoginWithSteam = function (request, callback) {
     if (request.TitleId == null) throw "Must be have PlayFab.settings.titleId set to call this method";
 
     PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/LoginWithSteam", request, null, null, function (error, result) {
-        PlayFab.settings.sessionTicket = result != null && result.hasOwnProperty("SessionTicket") ? result.SessionTicket : PlayFab.settings.sessionTicket;
+        PlayFab.settings.sessionTicket = result != null && result.data.hasOwnProperty("SessionTicket") ? result.data.SessionTicket : PlayFab.settings.sessionTicket;
 
         if (callback != null)
             callback(error, result);
@@ -125,7 +125,7 @@ exports.RegisterPlayFabUser = function (request, callback) {
     if (request.TitleId == null) throw "Must be have PlayFab.settings.titleId set to call this method";
 
     PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/RegisterPlayFabUser", request, null, null, function (error, result) {
-        PlayFab.settings.sessionTicket = result != null && result.hasOwnProperty("SessionTicket") ? result.SessionTicket : PlayFab.settings.sessionTicket;
+        PlayFab.settings.sessionTicket = result != null && result.data.hasOwnProperty("SessionTicket") ? result.data.SessionTicket : PlayFab.settings.sessionTicket;
 
         if (callback != null)
             callback(error, result);
@@ -865,7 +865,7 @@ exports.GetCloudScriptUrl = function (request, callback) {
     if (PlayFab.settings.sessionTicket == null) throw "Must be logged in to call this method";
 
     PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Client/GetCloudScriptUrl", request, "X-Authorization", PlayFab.settings.sessionTicket, function (error, result) {
-        PlayFab.settings.logicServerUrl = result != null && result.hasOwnProperty("Url") ? result.Url : PlayFab.settings.logicServerUrl;
+        PlayFab.settings.logicServerUrl = result != null && result.data.hasOwnProperty("Url") ? result.data.Url : PlayFab.settings.logicServerUrl;
 
         if (callback != null)
             callback(error, result);

diff --git a/PlayFabSdk/PlayFabServer.js b/PlayFabSdk/PlayFabServer.js
@@ -372,6 +372,16 @@ exports.MoveItemToUserFromCharacter = function (request, callback) {
     });
 };
 
+exports.RedeemCoupon = function (request, callback) {
+    if (PlayFab.settings.developerSecretKey == null) throw "Must have PlayFab.settings.DeveloperSecretKey set to call this method";
+
+    PlayFab.MakeRequest(PlayFab.GetServerUrl() + "/Server/RedeemCoupon", request, "X-SecretKey", PlayFab.settings.developerSecretKey, function (error, result) {
+
+        if (callback != null)
+            callback(error, result);
+    });
+};
+
 exports.ReportPlayer = function (request, callback) {
     if (PlayFab.settings.developerSecretKey == null) throw "Must have PlayFab.settings.DeveloperSecretKey set to call this method";
 

diff --git a/PlayFabTesting/PlayFab.js b/PlayFabTesting/PlayFab.js
@@ -1,8 +1,8 @@
 var url = require('url');
 var https = require('https');
 
-exports.sdk_version = "1.0.0";
-exports.api_version = "1.7.20151019";
+exports.sdk_version = "0.3.151109";
+exports.api_version = "1.9.20151109";
 
 exports.settings = {
     useDevEnv: false,
@@ -68,7 +68,7 @@ exports.MakeRequest = function (urlStr, request, authType, authValue, callback)
             if (replyEnvelope.hasOwnProperty("error") || !replyEnvelope.hasOwnProperty("data"))
                 callback(replyEnvelope, null);
             else
-                callback(null, replyEnvelope.data);
+                callback(null, replyEnvelope);
         });
     });
 

diff --git a/PlayFabTesting/PlayFabApiTests.js b/PlayFabTesting/PlayFabApiTests.js
@@ -138,7 +138,7 @@ exports.PlayFabApiTests = {
             test.ok(error == null, "Valid login failed");
             test.ok(result != null, "Valid login failed");
             test.ok(PlayFab.settings.sessionTicket != null, "Login credentials not saved correctly");
-            testData.playFabId = result.PlayFabId; // Save the PlayFabId, it will be used in other tests
+            testData.playFabId = result.data.PlayFabId; // Save the PlayFabId, it will be used in other tests
             test.done();
         };
         PlayFabClient.LoginWithEmailAddress(loginRequest, CallbackWrapper(OptionalLoginCallback, test));
@@ -149,11 +149,11 @@ exports.PlayFabApiTests = {
         var GetDataCallback1 = function (error, result) {
             test.ok(error == null, "GetUserData failed");
             test.ok(result != null, "GetUserData failed");
-            test.ok(result.Data != null, "GetUserData failed");
-            test.ok(result.Data.hasOwnProperty(testConstants.TEST_KEY), "GetUserData failed");
+            test.ok(result.data.Data != null, "GetUserData failed");
+            test.ok(result.data.Data.hasOwnProperty(testConstants.TEST_KEY), "GetUserData failed");
 
-            testData.testNumber = parseInt(result.Data[testConstants.TEST_KEY].Value, 10);
-            testData.testTimeStamp = new Date(result.Data[testConstants.TEST_KEY].LastUpdated);
+            testData.testNumber = parseInt(result.data.Data[testConstants.TEST_KEY].Value, 10);
+            testData.testTimeStamp = new Date(result.data.Data[testConstants.TEST_KEY].LastUpdated);
             testData.testNumber = (testData.testNumber + 1) % 100; // This test is about the expected value changing - but not testing more complicated issues like bounds
 
             var updateDataRequest = {}; // Can't create this until we have the testNumber value
@@ -169,14 +169,14 @@ exports.PlayFabApiTests = {
         var GetDataCallback2 = function (error, result) {
             test.ok(result != null, "GetUserData failed");
             test.ok(error == null, "GetUserData failed");
-            test.ok(result.Data != null, "GetUserData failed");
-            test.ok(result.Data.hasOwnProperty(testConstants.TEST_KEY), "GetUserData failed");
+            test.ok(result.data.Data != null, "GetUserData failed");
+            test.ok(result.data.Data.hasOwnProperty(testConstants.TEST_KEY), "GetUserData failed");
 
-            var actualtestNumber = parseInt(result.Data[testConstants.TEST_KEY].Value, 10);
-            var actualTimeStamp = new Date(result.Data[testConstants.TEST_KEY].LastUpdated);
+            var actualtestNumber = parseInt(result.data.Data[testConstants.TEST_KEY].Value, 10);
+            var actualTimeStamp = new Date(result.data.Data[testConstants.TEST_KEY].LastUpdated);
 
             test.equal(testData.testNumber, actualtestNumber, "" + testData.testNumber + "!=" + actualtestNumber);
-            test.ok(actualTimeStamp > testData.testTimeStamp, "Timestamp did not increase when incrementing: " + actualTimeStamp + " !> " + testData.testTimestamp);
+            test.ok(actualTimeStamp > testData.testTimeStamp, "Timestamp did not increase when incrementing: " + actualTimeStamp + " !> " + testData.testTimeStamp);
             test.done();
         };
 
@@ -189,10 +189,10 @@ exports.PlayFabApiTests = {
         var GetStatsCallback1 = function (error, result) {
             test.ok(error == null, "GetUserStats failed");
             test.ok(result != null, "GetUserStats failed");
-            test.ok(result.UserStatistics != null, "GetUserStats failed");
-            test.ok(result.UserStatistics.hasOwnProperty(testConstants.TEST_STAT_NAME), "GetUserStats failed");
+            test.ok(result.data.UserStatistics != null, "GetUserStats failed");
+            test.ok(result.data.UserStatistics.hasOwnProperty(testConstants.TEST_STAT_NAME), "GetUserStats failed");
 
-            testData.testNumber = result.UserStatistics[testConstants.TEST_STAT_NAME];
+            testData.testNumber = result.data.UserStatistics[testConstants.TEST_STAT_NAME];
             testData.testNumber = (testData.testNumber + 1) % 100; // This test is about the expected value changing - but not testing more complicated issues like bounds
 
             var updateStatsRequest = {}; // Can't create this until we have the testNumber value
@@ -208,10 +208,10 @@ exports.PlayFabApiTests = {
         var GetStatsCallback2 = function (error, result) {
             test.ok(error == null, "GetUserStats failed");
             test.ok(result != null, "GetUserStats failed");
-            test.ok(result.UserStatistics != null, "GetUserStats failed");
-            test.ok(result.UserStatistics.hasOwnProperty(testConstants.TEST_STAT_NAME), "GetUserStats failed");
+            test.ok(result.data.UserStatistics != null, "GetUserStats failed");
+            test.ok(result.data.UserStatistics.hasOwnProperty(testConstants.TEST_STAT_NAME), "GetUserStats failed");
 
-            var actualtestNumber = result.UserStatistics[testConstants.TEST_STAT_NAME];
+            var actualtestNumber = result.data.UserStatistics[testConstants.TEST_STAT_NAME];
 
             test.equal(testData.testNumber, actualtestNumber, "" + testData.testNumber + "!=" + actualtestNumber);
             test.done();
@@ -230,7 +230,7 @@ exports.PlayFabApiTests = {
         };
 
         var OptionalGetCharsCallback = function (error, result) {
-            // First login falls back upon registration if login failed
+            // First get chars falls back upon grant-char if target character not present
             if (result == null) {
                 // Register the character and try again
                 PlayFabServer.GrantCharacterToUser(grantCharRequest, CallbackWrapper(GrantCharCallback, test));
@@ -241,22 +241,21 @@ exports.PlayFabApiTests = {
             }
         };
         var GrantCharCallback = function (error, result) {
-            // Second login MUST succeed
+            // Second character callback MUST succeed
             test.ok(error == null, "GrantCharacter failed");
             test.ok(result != null, "GrantCharacter failed");
 
-            // Log in again, this time with the newly registered account
-            PlayFabClient.LoginWithEmailAddress(getCharsRequest, CallbackWrapper(MandatoryGetCharsCallback, test));
+            // Get chars again, this time with the newly granted character
+            PlayFabClient.GetAllUsersCharacters(getCharsRequest, CallbackWrapper(MandatoryGetCharsCallback, test));
         };
         var MandatoryGetCharsCallback = function (error, result) {
             // GetChars MUST succeed at some point during this test
             test.ok(error == null, "GetChars failed");
             test.ok(result != null, "GetChars failed");
-            test.ok(PlayFab.settings.sessionTicket != null, "Login credentials not saved correctly");
 
-            for (var i in result.Characters)
-                if (result.Characters[i].CharacterName == titleData.characterName)
-                    testData.characterId = result.Characters[i].CharacterId; // Save the characterId, it will be used in other tests
+            for (var i in result.data.Characters)
+                if (result.data.Characters[i].CharacterName == titleData.characterName)
+                    testData.characterId = result.data.Characters[i].CharacterId; // Save the characterId, it will be used in other tests
 
             test.ok(testData.characterId != null, "Cannot find " + titleData.characterName + " on this account.");
             test.done();
@@ -280,8 +279,8 @@ exports.PlayFabApiTests = {
         var GetLeaderboardCallback = function (error, result) {
             test.ok(error == null, "GetLeaderboard failed");
             test.ok(result != null, "GetLeaderboard failed");
-            test.ok(result.Leaderboard != null, "GetLeaderboard failed");
-            test.ok(result.Leaderboard.length > 0, "Leaderboard had insufficient entries");
+            test.ok(result.data.Leaderboard != null, "GetLeaderboard failed");
+            test.ok(result.data.Leaderboard.length > 0, "Leaderboard had insufficient entries");
 
             callsCompleted += 1;
 
@@ -296,10 +295,10 @@ exports.PlayFabApiTests = {
         var GetAccountInfoCallback = function (error, result) {
             test.ok(error == null, "GetAccountInfo failed");
             test.ok(result != null, "GetAccountInfo failed");
-            test.ok(result.AccountInfo != null, "GetAccountInfo failed");
-            test.ok(result.AccountInfo.TitleInfo != null, "GetAccountInfo failed");
-            test.ok(result.AccountInfo.TitleInfo.Origination != null, "GetAccountInfo failed");
-            test.ok(result.AccountInfo.TitleInfo.Origination.length > 0, "GetAccountInfo string-Enum failed");
+            test.ok(result.data.AccountInfo != null, "GetAccountInfo failed");
+            test.ok(result.data.AccountInfo.TitleInfo != null, "GetAccountInfo failed");
+            test.ok(result.data.AccountInfo.TitleInfo.Origination != null, "GetAccountInfo failed");
+            test.ok(result.data.AccountInfo.TitleInfo.Origination.length > 0, "GetAccountInfo string-Enum failed");
             test.done();
         };
 
@@ -327,9 +326,9 @@ exports.PlayFabApiTests = {
             var HelloWorldCallback = function (error, result) {
                 test.ok(error == null, "HelloWorld failed");
                 test.ok(result != null, "HelloWorld failed");
-                test.ok(result.Results != null, "HelloWorld failed");
-                test.ok(result.Results.messageValue != null, "HelloWorld failed");
-                test.equal(result.Results.messageValue, "Hello " + testData.playFabId + "!", "Unexpected HelloWorld cloudscript result: " + result.Results.messageValue);
+                test.ok(result.data.Results != null, "HelloWorld failed");
+                test.ok(result.data.Results.messageValue != null, "HelloWorld failed");
+                test.equal(result.data.Results.messageValue, "Hello " + testData.playFabId + "!", "Unexpected HelloWorld cloudscript result: " + result.data.Results.messageValue);
                 test.done();
             };