Merge branch 'master' of https://github.com/ServiceStack/ServiceStack.Java

Layoric · Layoric · commit 68d2226bbe3f · 2016-04-12T20:20:29.000+10:00
diff --git a/src/AndroidClient/android/android.iml b/src/AndroidClient/android/android.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="net.servicestack" external.system.module.version="1.0.22" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="net.servicestack" external.system.module.version="1.0.23" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
diff --git a/src/AndroidClient/android/build.gradle b/src/AndroidClient/android/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "1.0.23"
+version = "1.0.24"
 
 android {
     compileSdkVersion 23
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/ApiMember.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/ApiMember.java
@@ -56,4 +56,9 @@
     /// Gets or sets route to which applies attribute, matches using StartsWith. By default applies to all routes. 
     /// </summary>
     public String Route() default "";
+
+    /// <summary>
+    /// Whether to exclude this property from being included in the ModelSchema
+    /// </summary>
+    public boolean ExcludeInSchema() default false;
 }
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/JsonServiceClient.java b/src/AndroidClient/android/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) {
@@ -176,11 +179,13 @@ public HttpURLConnection createRequest(String requestUrl, String httpMethod, byt
     private static void addBasicAuth(HttpURLConnection req, String userName, String password) {
         req.setRequestProperty(HttpHeaders.Authorization,
             "Basic " + Utils.toBase64String(userName + ":" + password));
+        req.setRequestProperty("X-Auth", "Basic"); // HttpURLConnection doesn't allow re-reading Authorization Header
     }
 
     private static boolean shouldAuthenticate(HttpURLConnection req, String userName, String password){
         try {
             return req.getResponseCode() == 401
+                && req.getRequestProperty("X-Auth") == null //only auth if auth never attempted
                 && userName != null
                 && password != null;
         } catch (IOException e) {
@@ -252,6 +257,11 @@ public static boolean hasRequestBody(String httpMethod)
         return true;
     }
 
+    @Override
+    public boolean getAlwaysSendBasicAuthHeaders() {
+        return this.alwaysSendBasicAuthHeaders;
+    }
+
     @Override
     public void setAlwaysSendBasicAuthHeaders(boolean value) {
         this.alwaysSendBasicAuthHeaders = value;
@@ -368,8 +378,8 @@ public <TResponse> TResponse send(String requestUrl, String httpMethod, byte[] r
             else {
                 BufferedReader reader = new BufferedReader(new InputStreamReader(is));
                 TResponse response = resClass != null
-                    ? (TResponse) getGson().fromJson(reader, resClass)
-                    : (TResponse) getGson().fromJson(reader, resType);
+                        ? (TResponse) getGson().fromJson(reader, resClass)
+                        : (TResponse) getGson().fromJson(reader, resType);
 
                 reader.close();
                 return response;
diff --git a/src/AndroidClient/android/src/main/java/net/servicestack/client/ServiceClient.java b/src/AndroidClient/android/src/main/java/net/servicestack/client/ServiceClient.java
@@ -8,6 +8,7 @@
 import java.util.Map;
 
 public interface ServiceClient {
+    boolean getAlwaysSendBasicAuthHeaders();
     void setAlwaysSendBasicAuthHeaders(boolean value);
     void setCredentials(String userName, String password);
 
diff --git a/src/AndroidClient/app/app.iml b/src/AndroidClient/app/app.iml
@@ -66,8 +66,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
@@ -76,7 +74,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/src/AndroidClient/client/build.gradle b/src/AndroidClient/client/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testCompile 'org.mockito:mockito-core:1.9.5'
 }
 
-version = "1.0.23"
+version = "1.0.24"
 group = "net.servicestack"                                        // Maven Group ID for the artifact
 String packageId = "client"
 String groupID = group
diff --git a/src/AndroidClient/client/client.iml b/src/AndroidClient/client/client.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":client" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="net.servicestack" external.system.module.version="1.0.22" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":client" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="net.servicestack" external.system.module.version="1.0.23" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
diff --git a/src/AndroidClient/client/pom.xml b/src/AndroidClient/client/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.servicestack</groupId>
   <artifactId>client</artifactId>
-  <version>1.0.22</version>
+  <version>1.0.23</version>
   <name>ServiceStack.Client</name>
   <description>A client library to call your ServiceStack webservices.</description>
   <url>https://github.com/ServiceStack/ServiceStack.Java</url>
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ApiMember.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ApiMember.java
@@ -56,4 +56,9 @@
     /// Gets or sets route to which applies attribute, matches using StartsWith. By default applies to all routes. 
     /// </summary>
     public String Route() default "";
+
+    /// <summary>
+    /// Whether to exclude this property from being included in the ModelSchema
+    /// </summary>
+    public boolean ExcludeInSchema() default false;
 }
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) {
@@ -254,6 +257,11 @@ public static boolean hasRequestBody(String httpMethod)
         return true;
     }
 
+    @Override
+    public boolean getAlwaysSendBasicAuthHeaders() {
+        return this.alwaysSendBasicAuthHeaders;
+    }
+
     @Override
     public void setAlwaysSendBasicAuthHeaders(boolean value) {
         this.alwaysSendBasicAuthHeaders = value;
diff --git a/src/AndroidClient/client/src/main/java/net/servicestack/client/ServiceClient.java b/src/AndroidClient/client/src/main/java/net/servicestack/client/ServiceClient.java
@@ -8,6 +8,7 @@
 import java.util.Map;
 
 public interface ServiceClient {
+    boolean getAlwaysSendBasicAuthHeaders();
     void setAlwaysSendBasicAuthHeaders(boolean value);
     void setCredentials(String userName, String password);
 
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());
+    }
 }
diff --git a/src/AndroidClient/kotlin/kotlin.iml b/src/AndroidClient/kotlin/kotlin.iml
@@ -77,7 +77,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
diff --git a/src/AndroidClient/kotlin/src/androidTest/java/test/servicestack/net/kotlin/test/TestAuthTests.kt b/src/AndroidClient/kotlin/src/androidTest/java/test/servicestack/net/kotlin/test/TestAuthTests.kt
@@ -0,0 +1,74 @@
+package test.servicestack.net.kotlin.test
+
+import junit.framework.Assert
+import junit.framework.TestCase
+import net.servicestack.client.JsonServiceClient
+import net.servicestack.client.WebServiceException
+
+/**
+ * Created by mythz on 1/3/2016.
+ */
+class TestAuthTests : TestCase() {
+
+    fun CreateClient(): JsonServiceClient {
+        return JsonServiceClient("http://test.servicestack.net")
+    }
+
+    fun test_AuthRequired_returns_401() {
+        try {
+            val client = CreateClient()
+            client.get(TestAuth())
+            Assert.fail("should throw")
+        } catch (ex: WebServiceException) {
+            Assert.assertEquals(401, ex.statusCode)
+            Assert.assertEquals("Unauthorized", ex.statusDescription)
+        }
+    }
+
+    fun test_does_send_BasicAuthHeaders() {
+        val client = CreateClient()
+        client.setCredentials("test", "test")
+        client.alwaysSendBasicAuthHeaders = true
+
+        val response = client.get(TestAuth())
+
+        assertEquals("1", response.userId)
+        assertEquals("test", response.userName)
+        assertEquals("test DisplayName", response.displayName)
+        Assert.assertNotNull(response.sessionId)
+    }
+
+    fun test_does_transparently_send_BasicAuthHeader_on_401_response() {
+        val client = CreateClient()
+        client.setCredentials("test", "test")
+
+        val response = client.get(TestAuth())
+
+        assertEquals("1", response.userId)
+        assertEquals("test", response.userName)
+        assertEquals("test DisplayName", response.displayName)
+        Assert.assertNotNull(response.sessionId)
+    }
+
+    fun test_can_authenticate_with_CredentialsAuth() {
+        val client = CreateClient()
+
+        var request = Authenticate()
+        request.provider = "credentials"
+        request.userName = "test"
+        request.password = "test"
+
+        val authResponse = client.post(request)
+
+        Assert.assertEquals("1", authResponse.userId)
+        Assert.assertEquals("test", authResponse.userName)
+        Assert.assertNotNull(authResponse.sessionId)
+
+        val response = client.get(TestAuth())
+
+        assertEquals("1", response.userId)
+        assertEquals("test", response.userName)
+        assertEquals("test DisplayName", response.displayName)
+        Assert.assertNotNull(response.sessionId)
+    }
+}
diff --git a/src/AndroidClient/kotlin/src/androidTest/java/test/servicestack/net/kotlin/test/dtos.kt b/src/AndroidClient/kotlin/src/androidTest/java/test/servicestack/net/kotlin/test/dtos.kt
diff --git a/src/AndroidClient/techstacks/techstacks.iml b/src/AndroidClient/techstacks/techstacks.iml
diff --git a/src/AndroidClient/techstackskotlin/techstackskotlin.iml b/src/AndroidClient/techstackskotlin/techstackskotlin.iml

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ dependencies {`
`11`	`11`	`testCompile 'org.mockito:mockito-core:1.9.5'`
`12`	`12`	`}`
`13`	`13`
`14`		`-version = "1.0.23"`
	`14`	`+version = "1.0.24"`
`15`	`15`	`group = "net.servicestack" // Maven Group ID for the artifact`
`16`	`16`	`String packageId = "client"`
`17`	`17`	`String groupID = group`