james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adup...@apache.org
Subject [2/4] james-project git commit: JAMES-1742 Return the downloadUrl when authenticated
Date Mon, 06 Jun 2016 11:06:22 GMT
JAMES-1742 Return the downloadUrl when authenticated


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/38489542
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/38489542
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/38489542

Branch: refs/heads/master
Commit: 38489542461172784fa54bc583d598e774ef428a
Parents: c20adf8
Author: Antoine Duprat <aduprat@linagora.com>
Authored: Wed May 25 16:25:18 2016 +0200
Committer: Antoine Duprat <aduprat@linagora.com>
Committed: Mon Jun 6 13:05:37 2016 +0200

----------------------------------------------------------------------
 .../test/java/org/apache/james/jmap/JMAPAuthenticationTest.java  | 4 ++--
 .../main/java/org/apache/james/jmap/AuthenticationServlet.java   | 4 ++--
 .../jmap/src/main/java/org/apache/james/jmap/JMAPUrls.java       | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/38489542/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
index 4671d6c..c6d71b3 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/JMAPAuthenticationTest.java
@@ -284,7 +284,7 @@ public abstract class JMAPAuthenticationTest {
             .body("api", equalTo("/jmap"))
             .body("eventSource", both(isA(String.class)).and(notNullValue()))
             .body("upload", both(isA(String.class)).and(notNullValue()))
-            .body("download", both(isA(String.class)).and(notNullValue()));
+            .body("download", equalTo("/download"));
     }
     
     @Test
@@ -320,7 +320,7 @@ public abstract class JMAPAuthenticationTest {
             .body("api", equalTo("/jmap"))
             .body("eventSource", both(isA(String.class)).and(notNullValue()))
             .body("upload", both(isA(String.class)).and(notNullValue()))
-            .body("download", both(isA(String.class)).and(notNullValue()));
+            .body("download", equalTo("/download"));
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/james-project/blob/38489542/server/protocols/jmap/src/main/java/org/apache/james/jmap/AuthenticationServlet.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/AuthenticationServlet.java
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/AuthenticationServlet.java
index ed4b11e..a8ce762 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/AuthenticationServlet.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/AuthenticationServlet.java
@@ -182,7 +182,7 @@ public class AuthenticationServlet extends HttpServlet {
             .api(JMAPUrls.JMAP)
             .eventSource("/notImplemented")
             .upload("/notImplemented")
-            .download("/notImplemented")
+            .download(JMAPUrls.DOWNLOAD)
             .build();
         mapper.writeValue(resp.getOutputStream(), response);
     }
@@ -195,7 +195,7 @@ public class AuthenticationServlet extends HttpServlet {
             .api(JMAPUrls.JMAP)
             .eventSource("/notImplemented")
             .upload("/notImplemented")
-            .download("/notImplemented")
+            .download(JMAPUrls.DOWNLOAD)
             .build();
         mapper.writeValue(resp.getOutputStream(), response);
     }

http://git-wip-us.apache.org/repos/asf/james-project/blob/38489542/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPUrls.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPUrls.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPUrls.java
index 719bd49..9d96ccd 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPUrls.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/JMAPUrls.java
@@ -23,4 +23,5 @@ public interface JMAPUrls {
 
     String JMAP = "/jmap";
     String AUTHENTICATION = "/authentication";
+    String DOWNLOAD = "/download";
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message