JavaSdk now uses CustomId for login.

Summary: JavaSdk now uses CustomId for login. Test Plan: Existing Jenker! Reviewers: #devtools_in-progress, Marco.Williams Reviewed By: #devtools_in-progress, Marco.Williams Maniphest Tasks: T1573, T1577 Differential Revision: https://phab.playfabdev.com/D1546
PlayFab · Jun 10, 2016 · 9be767d · 9be767d
1 parent ff41cb2
commit 9be767d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 28 deletions.
diff --git a/SDKGenerator.njsproj b/SDKGenerator.njsproj
@@ -594,7 +594,6 @@
     <Content Include="targets\java\templates\Model.java.ejs" />
     <Content Include="targets\java\templates\Models.java.ejs" />
     <Content Include="targets\java\templates\PlayFabSettings.java.ejs" />
-    <Content Include="targets\java\templates\PlayFabVersion.java.ejs" />
     <Content Include="targets\java\templates\Tests.java.ejs" />
     <Content Include="targets\actionscript\templates\API.as.ejs" />
     <Content Include="targets\actionscript\templates\Enum.as.ejs" />

diff --git a/targets/java/make.js b/targets/java/make.js
@@ -107,14 +107,10 @@ function generateSimpleFiles(apis, sourceDir, apiOutputDir, isAndroid) {
     var generatedErrors = errorsTemplate(errorLocals);
     writeFile(path.resolve(apiOutputDir, "com/playfab/PlayFabErrors.java"), generatedErrors);
 
-    var versionTemplate = ejs.compile(readFile(path.resolve(sourceDir, "templates/PlayFabVersion.java.ejs")));
-    var versionLocals = {};
-    versionLocals.sdkVersion = exports.sdkVersion;
-    var generatedVersion = versionTemplate(versionLocals);
-    writeFile(path.resolve(apiOutputDir, "com/playfab/internal/PlayFabVersion.java"), generatedVersion);
-
     var settingsTemplate = ejs.compile(readFile(path.resolve(sourceDir, "templates/PlayFabSettings.java.ejs")));
     var settingsLocals = {};
+    settingsLocals.sdkVersion = exports.sdkVersion;
+    settingsLocals.buildIdentifier = exports.buildIdentifier;
     settingsLocals.isAndroid = isAndroid;
     settingsLocals.hasClientOptions = false;
     settingsLocals.hasServerOptions = false;

diff --git a/targets/java/srcCode/com/playfab/internal/PlayFabHTTP.java b/targets/java/srcCode/com/playfab/internal/PlayFabHTTP.java
@@ -6,6 +6,7 @@
 import java.io.*;
 import com.google.gson.*;
 
+import com.playfab.PlayFabSettings;
 import com.playfab.PlayFabErrors.PlayFabError;
 import com.playfab.PlayFabErrors.PlayFabErrorCode;
 import com.playfab.PlayFabErrors.PlayFabJsonError;
@@ -43,7 +44,7 @@ else if (request instanceof String) {
         if(authType != null) {
             con.setRequestProperty(authType, authKey);
         }
-        con.setRequestProperty("X-PlayFabSDK", PlayFabVersion.getVersionString());
+        con.setRequestProperty("X-PlayFabSDK", PlayFabSettings.SdkVersionString);
         con.setDoOutput(true);
         con.setDoInput(true);
 

diff --git a/targets/java/templates/PlayFabSettings.java.ejs b/targets/java/templates/PlayFabSettings.java.ejs
@@ -4,6 +4,10 @@ package com.playfab;
 <% } %>import com.playfab.PlayFabErrors.ErrorCallback;
 
 public class PlayFabSettings {
+    public static String SdkVersion = "<%- sdkVersion %>";
+    public static String BuildIdentifier = "<%- buildIdentifier %>";
+    public static String SdkVersionString = "JavaSDK-<%- sdkVersion %>";
+
     public static String TitleId = null; // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)
     public static ErrorCallback GlobalErrorHandler;
 <% if (hasServerOptions) { %>    public static String DeveloperSecretKey = null; // You must set this value for PlayFabSdk to work properly (Found in the Game Manager for your title, at the PlayFab Website)

diff --git a/targets/java/templates/PlayFabVersion.java.ejs b/targets/java/templates/PlayFabVersion.java.ejs
diff --git a/targets/java/testingFiles/PlayFabApiTest.java b/targets/java/testingFiles/PlayFabApiTest.java
@@ -165,12 +165,12 @@ public void InvalidRegistration()
     @Test
     public void LoginOrRegister()
     {
-        PlayFabClientModels.LoginWithEmailAddressRequest request = new PlayFabClientModels.LoginWithEmailAddressRequest();
+        PlayFabClientModels.LoginWithCustomIDRequest request = new PlayFabClientModels.LoginWithCustomIDRequest();
         request.TitleId = PlayFabSettings.TitleId;
-        request.Email = USER_EMAIL;
-        request.Password = USER_PASSWORD;
+        request.CustomId = PlayFabSettings.BuildIdentifier;
+        request.CreateAccount = true;
 
-        PlayFabResult<PlayFabClientModels.LoginResult> result = PlayFabClientAPI.LoginWithEmailAddress(request);
+        PlayFabResult<PlayFabClientModels.LoginResult> result = PlayFabClientAPI.LoginWithCustomID(request);
         VerifyResult(result, true);
         assertNotNull(result.Result.PlayFabId);
         playFabId = result.Result.PlayFabId;
@@ -188,11 +188,11 @@ public void LoginWithAdvertisingId()
         PlayFabSettings.AdvertisingIdType = PlayFabSettings.AD_TYPE_ANDROID_ID;
         PlayFabSettings.AdvertisingIdValue = "PlayFabTestId";
 
-        PlayFabClientModels.LoginWithEmailAddressRequest request = new PlayFabClientModels.LoginWithEmailAddressRequest();
+        PlayFabClientModels.LoginWithCustomIDRequest request = new PlayFabClientModels.LoginWithCustomIDRequest();
         request.TitleId = PlayFabSettings.TitleId;
-        request.Email = USER_EMAIL;
-        request.Password = USER_PASSWORD;
-        PlayFabResult<PlayFabClientModels.LoginResult> result = PlayFabClientAPI.LoginWithEmailAddress(request);
+        request.CustomId = PlayFabSettings.BuildIdentifier;
+        request.CreateAccount = true;
+        PlayFabResult<PlayFabClientModels.LoginResult> result = PlayFabClientAPI.LoginWithCustomID(request);
 
         assertEquals(PlayFabSettings.AD_TYPE_ANDROID_ID + "_Successful", PlayFabSettings.AdvertisingIdType);
     }
@@ -258,7 +258,8 @@ public void UserStatisticsApi()
         PlayFabClientModels.GetUserStatisticsRequest getRequest = new PlayFabClientModels.GetUserStatisticsRequest();
         PlayFabResult<PlayFabClientModels.GetUserStatisticsResult> getStatsResult = PlayFabClientAPI.GetUserStatistics(getRequest);
         VerifyResult(getStatsResult, true);
-        int testStatExpected = getStatsResult.Result.UserStatistics == null ? 0 : getStatsResult.Result.UserStatistics.get(TEST_STAT_NAME);
+        boolean hasStat = getStatsResult.Result.UserStatistics != null && getStatsResult.Result.UserStatistics.containsKey(TEST_STAT_NAME);
+        int testStatExpected = !hasStat ? 0 : getStatsResult.Result.UserStatistics.get(TEST_STAT_NAME);
         testStatExpected = (testStatExpected + 1) % 100; // This test is about the expected value changing - but not testing more complicated issues like bounds
 
         PlayFabClientModels.UpdateUserStatisticsRequest updateRequest = new PlayFabClientModels.UpdateUserStatisticsRequest();
@@ -269,7 +270,9 @@ public void UserStatisticsApi()
 
         getStatsResult = PlayFabClientAPI.GetUserStatistics(getRequest);
         VerifyResult(getStatsResult, true);
-        int testStatActual = getStatsResult.Result.UserStatistics == null ? 0 : getStatsResult.Result.UserStatistics.get(TEST_STAT_NAME);
+        hasStat = getStatsResult.Result.UserStatistics != null && getStatsResult.Result.UserStatistics.containsKey(TEST_STAT_NAME);
+        assertTrue(hasStat);
+        int testStatActual = getStatsResult.Result.UserStatistics.get(TEST_STAT_NAME);
 
         assertEquals(testStatExpected, testStatActual);
     }