Automatically populate default CookieManager so returned session cookies are automatically added on subsequent HTTP Requests

mythz · mythz · commit e37b1f7c4af9 · 2016-01-08T10:02:11.000-08:00
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonServiceClient.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/JsonServiceClient.java
@@ -5,7 +5,6 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
@@ -16,15 +15,14 @@
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
+import java.net.CookieHandler;
+import java.net.CookieManager;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.Charset;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.UUID;
 
@@ -50,6 +48,11 @@ public class JsonServiceClient implements ServiceClient {
     public JsonServiceClient(String baseUrl) {
         this.baseUrl = baseUrl.endsWith("/") ? baseUrl : baseUrl + "/";
         this.replyUrl = this.baseUrl + "json/reply/";
+
+        //Automatically populate response cookies
+        if (CookieHandler.getDefault() == null){
+            CookieHandler.setDefault(new CookieManager());
+        }
     }
 
     public void setTimeout(int timeoutMs) {
diff --git a/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TestAuthTests.java b/src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TestAuthTests.java
@@ -52,4 +52,24 @@ public void test_does_transparently_send_BasicAuthHeader_on_401_response(){
         assertEquals("test DisplayName", response.getDisplayName());
         assertNotNull(response.getSessionId());
     }
+
+    public void test_can_authenticate_with_CredentialsAuth(){
+        ServiceClient client = CreateClient();
+
+        AuthenticateResponse authResponse = client.post(new Authenticate()
+            .setProvider("credentials")
+            .setUserName("test")
+            .setPassword("test"));
+
+        assertEquals("1", authResponse.getUserId());
+        assertEquals("test", authResponse.getUserName());
+        assertNotNull(authResponse.getSessionId());
+
+        TestAuthResponse response = client.get(new TestAuth());
+
+        assertEquals("1", response.getUserId());
+        assertEquals("test", response.getUserName());
+        assertEquals("test DisplayName", response.getDisplayName());
+        assertNotNull(response.getSessionId());
+    }
 }
