Skip to content

Commit a9c19a8

Browse files
author
Paul Gilmore
committed
Merge pull request #14 from PlayFab/MinorJsFixes
Minor js fixes
2 parents 9869f95 + 6570d0e commit a9c19a8

File tree

5 files changed

+48
-48
lines changed

5 files changed

+48
-48
lines changed

‎PlayFabApiTest.js

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ var PlayFabApiTests = {
182182
// Login MUST succeed at some point during this test
183183
PlayFabApiTests.VerifyNullError(result, error, assert, "Testing Valid login result");
184184
assert.ok(PlayFab._internalSettings.sessionTicket != null, "Testing Login credentials cache");
185-
PlayFabApiTests.testData.playFabId = result.PlayFabId; // Save the PlayFabId, it will be used in other tests
185+
PlayFabApiTests.testData.playFabId = result.data.PlayFabId; // Save the PlayFabId, it will be used in other tests
186186
loginDone();
187187
};
188188
loginDone = assert.async();
@@ -199,11 +199,11 @@ var PlayFabApiTests = {
199199

200200
var GetDataCallback1 = function (result, error) {
201201
PlayFabApiTests.VerifyNullError(result, error, assert, "Testing GetUserData result");
202-
assert.ok(result.Data != null, "Testing GetUserData Data");
203-
assert.ok(result.Data.hasOwnProperty(PlayFabApiTests.testConstants.TEST_KEY), "Testing GetUserData DataKey");
202+
assert.ok(result.data.Data != null, "Testing GetUserData Data");
203+
assert.ok(result.data.Data.hasOwnProperty(PlayFabApiTests.testConstants.TEST_KEY), "Testing GetUserData DataKey");
204204

205-
PlayFabApiTests.testData.testNumber = parseInt(result.Data[PlayFabApiTests.testConstants.TEST_KEY].Value, 10);
206-
PlayFabApiTests.testData.testTimeStamp = new Date(result.Data[PlayFabApiTests.testConstants.TEST_KEY].LastUpdated);
205+
PlayFabApiTests.testData.testNumber = parseInt(result.data.Data[PlayFabApiTests.testConstants.TEST_KEY].Value, 10);
206+
PlayFabApiTests.testData.testTimeStamp = new Date(result.data.Data[PlayFabApiTests.testConstants.TEST_KEY].LastUpdated);
207207
PlayFabApiTests.testData.testNumber = (PlayFabApiTests.testData.testNumber + 1) % 100; // This test is about the expected value changing - but not testing more complicated issues like bounds
208208

209209
var updateDataRequest = {}; // Can't create this until we have the testNumber value
@@ -220,11 +220,11 @@ var PlayFabApiTests = {
220220
};
221221
var GetDataCallback2 = function (result, error) {
222222
PlayFabApiTests.VerifyNullError(result, error, assert, "Testing GetUserData result");
223-
assert.ok(result.Data != null, "Testing GetUserData Data");
224-
assert.ok(result.Data.hasOwnProperty(PlayFabApiTests.testConstants.TEST_KEY), "Testing GetUserData DataKey");
223+
assert.ok(result.data.Data != null, "Testing GetUserData Data");
224+
assert.ok(result.data.Data.hasOwnProperty(PlayFabApiTests.testConstants.TEST_KEY), "Testing GetUserData DataKey");
225225

226-
var actualtestNumber = parseInt(result.Data[PlayFabApiTests.testConstants.TEST_KEY].Value, 10);
227-
var actualTimeStamp = new Date(result.Data[PlayFabApiTests.testConstants.TEST_KEY].LastUpdated);
226+
var actualtestNumber = parseInt(result.data.Data[PlayFabApiTests.testConstants.TEST_KEY].Value, 10);
227+
var actualTimeStamp = new Date(result.data.Data[PlayFabApiTests.testConstants.TEST_KEY].LastUpdated);
228228

229229
assert.equal(PlayFabApiTests.testData.testNumber, actualtestNumber, "Testing incrementing counter: " + PlayFabApiTests.testData.testNumber + "==" + actualtestNumber);
230230
assert.ok(actualTimeStamp > PlayFabApiTests.testData.testTimeStamp, "Testing incrementing timestamp: " + actualTimeStamp + " > " + PlayFabApiTests.testData.testTimeStamp);
@@ -245,10 +245,10 @@ var PlayFabApiTests = {
245245

246246
var GetStatsCallback1 = function (result, error) {
247247
PlayFabApiTests.VerifyNullError(result, error, assert, "Testing GetUserStats result");
248-
assert.ok(result.UserStatistics != null, "Testing GetUserData Stats");
249-
assert.ok(result.UserStatistics.hasOwnProperty(PlayFabApiTests.testConstants.TEST_STAT_NAME), "Testing GetUserData Stat-value");
248+
assert.ok(result.data.UserStatistics != null, "Testing GetUserData Stats");
249+
assert.ok(result.data.UserStatistics.hasOwnProperty(PlayFabApiTests.testConstants.TEST_STAT_NAME), "Testing GetUserData Stat-value");
250250

251-
PlayFabApiTests.testData.testNumber = result.UserStatistics[PlayFabApiTests.testConstants.TEST_STAT_NAME];
251+
PlayFabApiTests.testData.testNumber = result.data.UserStatistics[PlayFabApiTests.testConstants.TEST_STAT_NAME];
252252
PlayFabApiTests.testData.testNumber = (PlayFabApiTests.testData.testNumber + 1) % 100; // This test is about the expected value changing - but not testing more complicated issues like bounds
253253

254254
var updateStatsRequest = {}; // Can't create this until we have the testNumber value
@@ -264,10 +264,10 @@ var PlayFabApiTests = {
264264
};
265265
var GetStatsCallback2 = function (result, error) {
266266
PlayFabApiTests.VerifyNullError(result, error, assert, "Testing GetUserStats result");
267-
assert.ok(result.UserStatistics != null, "Testing GetUserData Stats");
268-
assert.ok(result.UserStatistics.hasOwnProperty(PlayFabApiTests.testConstants.TEST_STAT_NAME), "Testing GetUserData Stat-value");
267+
assert.ok(result.data.UserStatistics != null, "Testing GetUserData Stats");
268+
assert.ok(result.data.UserStatistics.hasOwnProperty(PlayFabApiTests.testConstants.TEST_STAT_NAME), "Testing GetUserData Stat-value");
269269

270-
var actualtestNumber = result.UserStatistics[PlayFabApiTests.testConstants.TEST_STAT_NAME];
270+
var actualtestNumber = result.data.UserStatistics[PlayFabApiTests.testConstants.TEST_STAT_NAME];
271271

272272
assert.equal(PlayFabApiTests.testData.testNumber, actualtestNumber, "Testing incrementing stat: " + PlayFabApiTests.testData.testNumber + "==" + actualtestNumber);
273273
get2Done();
@@ -316,9 +316,9 @@ var PlayFabApiTests = {
316316
// GetChars MUST succeed at some point during this test
317317
PlayFabApiTests.VerifyNullError(result, error, assert, "Testing GetChars result");
318318

319-
for (var i in result.Characters)
320-
if (result.Characters[i].CharacterName == PlayFabApiTests.titleData.characterName)
321-
PlayFabApiTests.testData.characterId = result.Characters[i].CharacterId; // Save the characterId, it will be used in other tests
319+
for (var i in result.data.Characters)
320+
if (result.data.Characters[i].CharacterName == PlayFabApiTests.titleData.characterName)
321+
PlayFabApiTests.testData.characterId = result.data.Characters[i].CharacterId; // Save the characterId, it will be used in other tests
322322

323323
assert.ok(PlayFabApiTests.testData.characterId != null, "Searching for " + PlayFabApiTests.titleData.characterName + " on this account.");
324324
getDone();
@@ -342,17 +342,17 @@ var PlayFabApiTests = {
342342
var GetLeaderboardCallback_C = function (result, error) {
343343
PlayFabApiTests.VerifyNullError(result, error, assert, "Testing GetLeaderboard result");
344344
if (result != null) {
345-
assert.ok(result.Leaderboard != null, "Testing GetLeaderboard content");
346-
assert.ok(result.Leaderboard.length > 0, "Testing GetLeaderboard content-length");
345+
assert.ok(result.data.Leaderboard != null, "Testing GetLeaderboard content");
346+
assert.ok(result.data.Leaderboard.length > 0, "Testing GetLeaderboard content-length");
347347
}
348348

349349
lbDone_C();
350350
};
351351
var GetLeaderboardCallback_S = function (result, error) {
352352
PlayFabApiTests.VerifyNullError(result, error, assert, "Testing GetLeaderboard result");
353353
if (result != null) {
354-
assert.ok(result.Leaderboard != null, "Testing GetLeaderboard content");
355-
assert.ok(result.Leaderboard.length > 0, "Testing GetLeaderboard content-length");
354+
assert.ok(result.data.Leaderboard != null, "Testing GetLeaderboard content");
355+
assert.ok(result.data.Leaderboard.length > 0, "Testing GetLeaderboard content-length");
356356
}
357357

358358
lbDone_S();
@@ -367,10 +367,10 @@ var PlayFabApiTests = {
367367
AccountInfo: function (assert) {
368368
var GetAccountInfoCallback = function (result, error) {
369369
PlayFabApiTests.VerifyNullError(result, error, assert, "Testing GetAccountInfo result");
370-
assert.ok(result.AccountInfo != null, "Testing GetAccountInfo");
371-
assert.ok(result.AccountInfo.TitleInfo != null, "Testing TitleInfo");
372-
assert.ok(result.AccountInfo.TitleInfo.Origination != null, "Testing Origination");
373-
assert.ok(result.AccountInfo.TitleInfo.Origination.length > 0, "Testing Origination string-Enum");
370+
assert.ok(result.data.AccountInfo != null, "Testing GetAccountInfo");
371+
assert.ok(result.data.AccountInfo.TitleInfo != null, "Testing TitleInfo");
372+
assert.ok(result.data.AccountInfo.TitleInfo.Origination != null, "Testing Origination");
373+
assert.ok(result.data.AccountInfo.TitleInfo.Origination.length > 0, "Testing Origination string-Enum");
374374
getDone();
375375
};
376376

@@ -404,9 +404,9 @@ var PlayFabApiTests = {
404404
var HelloWorldCallback = function (result, error) {
405405
PlayFabApiTests.VerifyNullError(result, error, assert, "Testing HelloWorld response");
406406
if (result != null) {
407-
assert.ok(result.Results != null, "Testing HelloWorld result");
408-
assert.ok(result.Results.messageValue != null, "Testing HelloWorld result message");
409-
assert.equal(result.Results.messageValue, "Hello " + PlayFabApiTests.testData.playFabId + "!", "HelloWorld cloudscript result: " + result.Results.messageValue);
407+
assert.ok(result.data.Results != null, "Testing HelloWorld result");
408+
assert.ok(result.data.Results.messageValue != null, "Testing HelloWorld result message");
409+
assert.equal(result.data.Results.messageValue, "Hello " + PlayFabApiTests.testData.playFabId + "!", "HelloWorld cloudscript result: " + result.data.Results.messageValue);
410410
}
411411
hwDone();
412412
};

‎PlayFabSDK/PlayFabAdminApi.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var PlayFab = typeof PlayFab != 'undefined' ? PlayFab : {};
22

33
if(!PlayFab.settings) {
44
PlayFab.settings = {
5-
titleID: null,
5+
titleId: null,
66
developerSecretKey: null // For security reasons you must never expose this value to the client or players
77
}
88
}
@@ -68,7 +68,7 @@ if(!PlayFab._internalSettings) {
6868
result.CallBackTimeMS = new Date() - startTime;
6969

7070
if (result.code == 200)
71-
callback(result.data, null);
71+
callback(result, null);
7272
else
7373
callback(null, result);
7474
}

‎PlayFabSDK/PlayFabClientApi.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var PlayFab = typeof PlayFab != 'undefined' ? PlayFab : {};
22

33
if(!PlayFab.settings) {
44
PlayFab.settings = {
5-
titleID: null,
5+
titleId: null,
66
developerSecretKey: null // For security reasons you must never expose this value to the client or players
77
}
88
}
@@ -68,7 +68,7 @@ if(!PlayFab._internalSettings) {
6868
result.CallBackTimeMS = new Date() - startTime;
6969

7070
if (result.code == 200)
71-
callback(result.data, null);
71+
callback(result, null);
7272
else
7373
callback(null, result);
7474
}
@@ -110,7 +110,7 @@ PlayFab.ClientApi = {
110110
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";
111111

112112
var overloadCallback = function (result, error) {
113-
if (result != null && result.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.SessionTicket; }
113+
if (result != null && result.data.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.data.SessionTicket; }
114114
if (callback != null && typeof (callback) == "function")
115115
callback(result, error);
116116
};
@@ -121,7 +121,7 @@ PlayFab.ClientApi = {
121121
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";
122122

123123
var overloadCallback = function (result, error) {
124-
if (result != null && result.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.SessionTicket; }
124+
if (result != null && result.data.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.data.SessionTicket; }
125125
if (callback != null && typeof (callback) == "function")
126126
callback(result, error);
127127
};
@@ -132,7 +132,7 @@ PlayFab.ClientApi = {
132132
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";
133133

134134
var overloadCallback = function (result, error) {
135-
if (result != null && result.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.SessionTicket; }
135+
if (result != null && result.data.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.data.SessionTicket; }
136136
if (callback != null && typeof (callback) == "function")
137137
callback(result, error);
138138
};
@@ -143,7 +143,7 @@ PlayFab.ClientApi = {
143143
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";
144144

145145
var overloadCallback = function (result, error) {
146-
if (result != null && result.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.SessionTicket; }
146+
if (result != null && result.data.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.data.SessionTicket; }
147147
if (callback != null && typeof (callback) == "function")
148148
callback(result, error);
149149
};
@@ -154,7 +154,7 @@ PlayFab.ClientApi = {
154154
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";
155155

156156
var overloadCallback = function (result, error) {
157-
if (result != null && result.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.SessionTicket; }
157+
if (result != null && result.data.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.data.SessionTicket; }
158158
if (callback != null && typeof (callback) == "function")
159159
callback(result, error);
160160
};
@@ -165,7 +165,7 @@ PlayFab.ClientApi = {
165165
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";
166166

167167
var overloadCallback = function (result, error) {
168-
if (result != null && result.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.SessionTicket; }
168+
if (result != null && result.data.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.data.SessionTicket; }
169169
if (callback != null && typeof (callback) == "function")
170170
callback(result, error);
171171
};
@@ -176,7 +176,7 @@ PlayFab.ClientApi = {
176176
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";
177177

178178
var overloadCallback = function (result, error) {
179-
if (result != null && result.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.SessionTicket; }
179+
if (result != null && result.data.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.data.SessionTicket; }
180180
if (callback != null && typeof (callback) == "function")
181181
callback(result, error);
182182
};
@@ -187,7 +187,7 @@ PlayFab.ClientApi = {
187187
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";
188188

189189
var overloadCallback = function (result, error) {
190-
if (result != null && result.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.SessionTicket; }
190+
if (result != null && result.data.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.data.SessionTicket; }
191191
if (callback != null && typeof (callback) == "function")
192192
callback(result, error);
193193
};
@@ -198,7 +198,7 @@ PlayFab.ClientApi = {
198198
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";
199199

200200
var overloadCallback = function (result, error) {
201-
if (result != null && result.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.SessionTicket; }
201+
if (result != null && result.data.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.data.SessionTicket; }
202202
if (callback != null && typeof (callback) == "function")
203203
callback(result, error);
204204
};
@@ -209,7 +209,7 @@ PlayFab.ClientApi = {
209209
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";
210210

211211
var overloadCallback = function (result, error) {
212-
if (result != null && result.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.SessionTicket; }
212+
if (result != null && result.data.SessionTicket != null) { PlayFab._internalSettings.sessionTicket = result.data.SessionTicket; }
213213
if (callback != null && typeof (callback) == "function")
214214
callback(result, error);
215215
};
@@ -657,7 +657,7 @@ PlayFab.ClientApi = {
657657
if (PlayFab._internalSettings.sessionTicket == null) throw "Must be logged in to call this method";
658658

659659
var overloadCallback = function (result, error) {
660-
PlayFab._internalSettings.logicServerUrl = result.Url;
660+
PlayFab._internalSettings.logicServerUrl = result.data.Url;
661661
if (callback != null && typeof (callback) == "function")
662662
callback(result, error);
663663
};

‎PlayFabSDK/PlayFabMatchmakerApi.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var PlayFab = typeof PlayFab != 'undefined' ? PlayFab : {};
22

33
if(!PlayFab.settings) {
44
PlayFab.settings = {
5-
titleID: null,
5+
titleId: null,
66
developerSecretKey: null // For security reasons you must never expose this value to the client or players
77
}
88
}
@@ -68,7 +68,7 @@ if(!PlayFab._internalSettings) {
6868
result.CallBackTimeMS = new Date() - startTime;
6969

7070
if (result.code == 200)
71-
callback(result.data, null);
71+
callback(result, null);
7272
else
7373
callback(null, result);
7474
}

‎PlayFabSDK/PlayFabServerApi.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var PlayFab = typeof PlayFab != 'undefined' ? PlayFab : {};
22

33
if(!PlayFab.settings) {
44
PlayFab.settings = {
5-
titleID: null,
5+
titleId: null,
66
developerSecretKey: null // For security reasons you must never expose this value to the client or players
77
}
88
}
@@ -68,7 +68,7 @@ if(!PlayFab._internalSettings) {
6868
result.CallBackTimeMS = new Date() - startTime;
6969

7070
if (result.code == 200)
71-
callback(result.data, null);
71+
callback(result, null);
7272
else
7373
callback(null, result);
7474
}

0 commit comments

Comments
 (0)