You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by GitBox <gi...@apache.org> on 2021/11/02 06:38:54 UTC
[GitHub] [james-project] chibenwa commented on a change in pull request #727: JAMES-3539 PushSubscription/set update expires
chibenwa commented on a change in pull request #727:
URL: https://github.com/apache/james-project/pull/727#discussion_r740754212
##########
File path: server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/PushSubscriptionSetMethodContract.scala
##########
@@ -1078,6 +1078,191 @@ trait PushSubscriptionSetMethodContract {
assertThat(probe.retrievePushSubscription(BOB, pushSubscription.id).validated).isFalse
}
+ @Test
+ def updateValidExpiresShouldSucceed(server: GuiceJamesServer): Unit = {
+ val probe = server.getProbe(classOf[PushSubscriptionProbe])
+ val pushSubscription = probe
+ .createPushSubscription(username = BOB,
+ url = PushSubscriptionServerURL(new URL("https://example.com/push/?device=X8980fc&client=12c6d086")),
+ deviceId = DeviceClientId("12c6d086"),
+ types = Seq(MailboxTypeName, EmailDeliveryTypeName, EmailTypeName))
+
+ val validExpiresString = UTCDate(ZonedDateTime.now().plusDays(1)).asUTC.format(TIME_FORMATTER)
+ val request: String =
+ s"""{
+ | "using": ["urn:ietf:params:jmap:core"],
+ | "methodCalls": [
+ | [
+ | "PushSubscription/set",
+ | {
+ | "update": {
+ | "${pushSubscription.id.serialise}": {
+ | "expires": "$validExpiresString"
+ | }
+ | }
+ | },
+ | "c1"
+ | ]
+ | ]
+ | }""".stripMargin
+
+ val response: String = `given`
+ .body(request)
+ .when
+ .post
+ .`then`
+ .statusCode(SC_OK)
+ .contentType(JSON)
+ .extract
+ .body
+ .asString
+
+ assertThatJson(response)
+ .isEqualTo(
+ s"""{
+ | "sessionState": "${SESSION_STATE.value}",
+ | "methodResponses": [
+ | [
+ | "PushSubscription/set",
+ | {
+ | "updated": {
+ | "${pushSubscription.id.serialise}": {}
+ | }
+ | },
+ | "c1"
+ | ]
+ | ]
+ |}""".stripMargin)
+
+ assertThat(probe.retrievePushSubscription(BOB, pushSubscription.id)
+ .expires.value.format(TIME_FORMATTER))
+ .isEqualTo(validExpiresString)
+ }
+
+ @Test
+ def updateWithBiggerExpiresThanServerLimitShouldSetToServerLimitAndExplicitlyReturned(server: GuiceJamesServer): Unit = {
+ val probe = server.getProbe(classOf[PushSubscriptionProbe])
+ val pushSubscription = probe
+ .createPushSubscription(username = BOB,
+ url = PushSubscriptionServerURL(new URL("https://example.com/push/?device=X8980fc&client=12c6d086")),
+ deviceId = DeviceClientId("12c6d086"),
+ types = Seq(MailboxTypeName, EmailDeliveryTypeName, EmailTypeName))
+
+ val biggerExpiresString = UTCDate(ZonedDateTime.now().plusDays(10)).asUTC.format(TIME_FORMATTER)
+ val request: String =
+ s"""{
+ | "using": ["urn:ietf:params:jmap:core"],
+ | "methodCalls": [
+ | [
+ | "PushSubscription/set",
+ | {
+ | "update": {
+ | "${pushSubscription.id.serialise}": {
+ | "expires": "$biggerExpiresString"
+ | }
+ | }
+ | },
+ | "c1"
+ | ]
+ | ]
+ | }""".stripMargin
+
+ val response: String = `given`
+ .body(request)
+ .when
+ .post
+ .`then`
+ .statusCode(SC_OK)
+ .contentType(JSON)
+ .extract
+ .body
+ .asString
+
+ // todo get server fixed expires
+ val serverLimit = ???
Review comment:
defaults to 7 days, not configured yet. Otherwise you could be using a Probe.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org