You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/02/09 04:29:51 UTC

[james-project] 23/33: JAMES-3491 Advertise webSocket push in session capabilities

This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit ec9f8d44ab4705237ec35ea3c9e6b708efd9edca
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Feb 5 11:14:34 2021 +0700

    JAMES-3491 Advertise webSocket push in session capabilities
---
 .../org/apache/james/jmap/rfc8621/contract/CustomMethodContract.scala | 4 ++--
 .../apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala    | 4 ++--
 .../src/main/scala/org/apache/james/jmap/core/Capabilities.scala      | 2 +-
 .../test/scala/org/apache/james/jmap/routes/SessionRoutesTest.scala   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/CustomMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/CustomMethodContract.scala
index 48b8b8b..0f7607c 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/CustomMethodContract.scala
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/CustomMethodContract.scala
@@ -71,7 +71,7 @@ object CustomMethodContract {
       |      "mayCreateTopLevelMailbox" : true
       |    },
       |    "urn:ietf:params:jmap:websocket": {
-      |      "supportsPush": false,
+      |      "supportsPush": true,
       |      "url": "http://domain.com/jmap/ws"
       |    },
       |    "urn:apache:james:params:jmap:mail:quota": {},
@@ -90,7 +90,7 @@ object CustomMethodContract {
       |          "submissionExtensions": []
       |        },
       |        "urn:ietf:params:jmap:websocket": {
-      |            "supportsPush": false,
+      |            "supportsPush": true,
       |            "url": "http://domain.com/jmap/ws"
       |        },
       |        "urn:ietf:params:jmap:core" : {
diff --git a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala
index 7e1abc8..a7ffe3d 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/SessionRoutesContract.scala
@@ -64,7 +64,7 @@ object SessionRoutesContract {
                          |      "mayCreateTopLevelMailbox" : true
                          |    },
                          |    "urn:ietf:params:jmap:websocket": {
-                         |      "supportsPush": false,
+                         |      "supportsPush": true,
                          |      "url": "http://domain.com/jmap/ws"
                          |    },
                          |    "urn:apache:james:params:jmap:mail:quota": {},
@@ -82,7 +82,7 @@ object SessionRoutesContract {
                          |          "submissionExtensions": []
                          |        },
                          |        "urn:ietf:params:jmap:websocket": {
-                         |            "supportsPush": false,
+                         |            "supportsPush": true,
                          |            "url": "http://domain.com/jmap/ws"
                          |        },
                          |        "urn:ietf:params:jmap:core" : {
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Capabilities.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Capabilities.scala
index d3f7be4..654fb85 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Capabilities.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/core/Capabilities.scala
@@ -36,7 +36,7 @@ object DefaultCapabilities {
       collationAlgorithms = List("i;unicode-casemap")))
 
   def webSocketCapability(url: URL) = WebSocketCapability(
-    properties = WebSocketCapabilityProperties(SupportsPush(false), url))
+    properties = WebSocketCapabilityProperties(SupportsPush(true), url))
 
   val MAIL_CAPABILITY = MailCapability(
     properties = MailCapabilityProperties(
diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/SessionRoutesTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/SessionRoutesTest.scala
index b6d5766..aae99de 100644
--- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/SessionRoutesTest.scala
+++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/routes/SessionRoutesTest.scala
@@ -145,7 +145,7 @@ class SessionRoutesTest extends AnyFlatSpec with BeforeAndAfter with Matchers {
                          |      "mayCreateTopLevelMailbox" : true
                          |    },
                          |    "urn:ietf:params:jmap:websocket": {
-                         |      "supportsPush": false,
+                         |      "supportsPush": true,
                          |      "url": "http://localhost/jmap/ws"
                          |    },
                          |    "urn:apache:james:params:jmap:mail:quota": {},
@@ -163,7 +163,7 @@ class SessionRoutesTest extends AnyFlatSpec with BeforeAndAfter with Matchers {
                          |          "submissionExtensions": []
                          |        },
                          |        "urn:ietf:params:jmap:websocket": {
-                         |            "supportsPush": false,
+                         |            "supportsPush": true,
                          |            "url": "http://localhost/jmap/ws"
                          |        },
                          |        "urn:ietf:params:jmap:core" : {


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