You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2020/11/09 11:45:36 UTC
[james-project] 08/09: JAMES-3434 EmailSubmission/set implicit
onSuccessUpdateEmail call
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 6e725e8d85a66e996047514b8dcd358ef14f38eb
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Nov 6 11:56:21 2020 +0700
JAMES-3434 EmailSubmission/set implicit onSuccessUpdateEmail call
---
.../EmailSubmissionSetMethodContract.scala | 106 +++++++++++++++++++++
.../jmap/json/EmailSubmissionSetSerializer.scala | 8 ++
.../james/jmap/mail/EmailSubmissionSet.scala | 12 ++-
.../apache/james/jmap/method/EmailSetMethod.scala | 2 +-
.../jmap/method/EmailSubmissionSetMethod.scala | 13 ++-
5 files changed, 136 insertions(+), 5 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/EmailSubmissionSetMethodContract.scala b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSubmissionSetMethodContract.scala
index df9ff97..247d04f 100644
--- a/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSubmissionSetMethodContract.scala
+++ b/server/protocols/jmap-rfc-8621-integration-tests/jmap-rfc-8621-integration-tests-common/src/main/scala/org/apache/james/jmap/rfc8621/contract/EmailSubmissionSetMethodContract.scala
@@ -692,6 +692,112 @@ trait EmailSubmissionSetMethodContract {
}
@Test
+ def onSuccessUpdateEmailShouldTriggerAnImplicitEmailSetCall(server: GuiceJamesServer): Unit = {
+ val message: Message = Message.Builder
+ .of
+ .setSubject("test")
+ .setSender(BOB.asString)
+ .setFrom(BOB.asString)
+ .setTo(ANDRE.asString)
+ .setBody("testmail", StandardCharsets.UTF_8)
+ .build
+
+ val bobDraftsPath = MailboxPath.forUser(BOB, DefaultMailboxes.DRAFTS)
+ server.getProbe(classOf[MailboxProbeImpl]).createMailbox(bobDraftsPath)
+ val messageId: MessageId = server.getProbe(classOf[MailboxProbeImpl]).appendMessage(BOB.asString(), bobDraftsPath, AppendCommand.builder()
+ .build(message))
+ .getMessageId
+
+ val requestBob =
+ s"""{
+ | "using": ["urn:ietf:params:jmap:core", "urn:ietf:params:jmap:mail"],
+ | "methodCalls": [
+ | ["EmailSubmission/set", {
+ | "accountId": "$ACCOUNT_ID",
+ | "create": {
+ | "k1490": {
+ | "emailId": "${messageId.serialize}",
+ | "envelope": {
+ | "mailFrom": {"email": "${BOB.asString}"},
+ | "rcptTo": [{"email": "${ANDRE.asString}"}]
+ | }
+ | }
+ | },
+ | "onSuccessUpdateEmail": {
+ | "${messageId.serialize}": {
+ | "keywords": {"$$sent":true}
+ | }
+ | }
+ | }, "c1"],
+ | ["Email/get",
+ | {
+ | "accountId": "$ACCOUNT_ID",
+ | "ids": ["${messageId.serialize}"],
+ | "properties": ["keywords"]
+ | },
+ | "c2"]]
+ |}""".stripMargin
+
+ val response = `given`
+ .header(ACCEPT.toString, ACCEPT_RFC8621_VERSION_HEADER)
+ .body(requestBob)
+ .when
+ .post
+ .`then`
+ .statusCode(SC_OK)
+ .contentType(JSON)
+ .extract
+ .body
+ .asString
+
+ assertThatJson(response)
+ // Ids are randomly generated, and not stored, let's ignore it
+ .whenIgnoringPaths("methodResponses[0][1].created.k1490")
+ .isEqualTo(s"""{
+ | "sessionState": "75128aab4b1b",
+ | "methodResponses": [
+ | [
+ | "EmailSubmission/set",
+ | {
+ | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "newState": "000001",
+ | "created": {
+ | "k1490": "f0850507-bb63-4675-b14f-d560f8dca21f"
+ | }
+ | },
+ | "c1"
+ | ],
+ | [
+ | "Email/set",
+ | {
+ | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "newState": "000001",
+ | "updated": {
+ | "${messageId.serialize}": null
+ | }
+ | },
+ | "c1"
+ | ],
+ | [
+ | "Email/get",
+ | {
+ | "accountId": "29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6",
+ | "state": "000001",
+ | "list": [
+ | {
+ | "keywords": {"$$sent": true},
+ | "id": "${messageId.serialize}"
+ | }
+ | ],
+ | "notFound": []
+ | },
+ | "c2"
+ | ]
+ | ]
+ |}""".stripMargin)
+ }
+
+ @Test
def setShouldRejectOtherAccountIds(server: GuiceJamesServer): Unit = {
val message: Message = Message.Builder
.of
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/EmailSubmissionSetSerializer.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/EmailSubmissionSetSerializer.scala
index 66e49b7..a8e9dbb 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/EmailSubmissionSetSerializer.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/EmailSubmissionSetSerializer.scala
@@ -24,6 +24,7 @@ import javax.inject.Inject
import org.apache.james.core.MailAddress
import org.apache.james.jmap.core.Id.IdConstraint
import org.apache.james.jmap.core.SetError
+import org.apache.james.jmap.mail.EmailSet.{UnparsedMessageId, UnparsedMessageIdConstraint}
import org.apache.james.jmap.mail.EmailSubmissionSet.EmailSubmissionCreationId
import org.apache.james.jmap.mail.{EmailSubmissionAddress, EmailSubmissionCreationRequest, EmailSubmissionCreationResponse, EmailSubmissionId, EmailSubmissionSetRequest, EmailSubmissionSetResponse, Envelope}
import org.apache.james.mailbox.model.MessageId
@@ -52,6 +53,13 @@ class EmailSubmissionSetSerializer @Inject()(messageIdFactory: MessageId.Factory
case _ => JsError("Expecting mailAddress to be represented by a JsString")
}
+ private implicit val emailUpdatesMapReads: Reads[Map[UnparsedMessageId, JsObject]] =
+ readMapEntry[UnparsedMessageId, JsObject](s => refineV[UnparsedMessageIdConstraint](s),
+ {
+ case o: JsObject => JsSuccess(o)
+ case _ => JsError("Expecting a JsObject as an update entry")
+ })
+
private implicit val emailSubmissionSetRequestReads: Reads[EmailSubmissionSetRequest] = Json.reads[EmailSubmissionSetRequest]
private implicit val emailSubmissionIdWrites: Writes[EmailSubmissionId] = Json.valueWrites[EmailSubmissionId]
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailSubmissionSet.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailSubmissionSet.scala
index d9a0ae2..416c4f8 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailSubmissionSet.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/mail/EmailSubmissionSet.scala
@@ -29,6 +29,7 @@ import org.apache.james.jmap.core.Id.Id
import org.apache.james.jmap.core.SetError.SetErrorDescription
import org.apache.james.jmap.core.State.State
import org.apache.james.jmap.core.{AccountId, Id, Properties, SetError}
+import org.apache.james.jmap.mail.EmailSet.UnparsedMessageId
import org.apache.james.jmap.mail.EmailSubmissionSet.EmailSubmissionCreationId
import org.apache.james.jmap.method.{EmailSubmissionCreationParseException, WithAccountId}
import org.apache.james.mailbox.model.MessageId
@@ -43,7 +44,14 @@ object EmailSubmissionId {
}
case class EmailSubmissionSetRequest(accountId: AccountId,
- create: Option[Map[EmailSubmissionCreationId, JsObject]]) extends WithAccountId
+ create: Option[Map[EmailSubmissionCreationId, JsObject]],
+ onSuccessUpdateEmail: Option[Map[UnparsedMessageId, JsObject]]) extends WithAccountId {
+ def implicitEmailSetRequest: EmailSetRequest = EmailSetRequest(
+ accountId = accountId,
+ create = None,
+ update = onSuccessUpdateEmail,
+ destroy = None)
+}
case class EmailSubmissionSetResponse(accountId: AccountId,
newState: State,
@@ -59,7 +67,7 @@ case class EmailSubmissionAddress(email: MailAddress)
case class Envelope(mailFrom: EmailSubmissionAddress, rcptTo: List[EmailSubmissionAddress])
object EmailSubmissionCreationRequest {
- private val assignableProperties = Set("emailId", "envelope")
+ private val assignableProperties = Set("emailId", "envelope", "onSuccessUpdateEmail")
def validateProperties(jsObject: JsObject): Either[EmailSubmissionCreationParseException, JsObject] =
jsObject.keys.diff(assignableProperties) match {
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSetMethod.scala
index 495c5f5..ffe0679 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSetMethod.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSetMethod.scala
@@ -50,7 +50,7 @@ class EmailSetMethod @Inject()(serializer: EmailSetSerializer,
created <- createPerformer.create(request, mailboxSession)
} yield InvocationWithContext(
invocation = Invocation(
- methodName = invocation.invocation.methodName,
+ methodName = methodName,
arguments = Arguments(serializer.serialize(EmailSetResponse(
accountId = request.accountId,
newState = State.INSTANCE,
diff --git a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSubmissionSetMethod.scala b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSubmissionSetMethod.scala
index 3a01e1b..34ce804 100644
--- a/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSubmissionSetMethod.scala
+++ b/server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/method/EmailSubmissionSetMethod.scala
@@ -44,6 +44,7 @@ import org.apache.james.queue.api.{MailQueue, MailQueueFactory}
import org.apache.james.rrt.api.CanSendFrom
import org.apache.james.server.core.{MailImpl, MimeMessageCopyOnWriteProxy, MimeMessageInputStreamSource}
import org.apache.mailet.{Attribute, AttributeName, AttributeValue}
+import org.reactivestreams.Publisher
import org.slf4j.{Logger, LoggerFactory}
import play.api.libs.json._
import reactor.core.scala.publisher.{SFlux, SMono}
@@ -69,6 +70,7 @@ class EmailSubmissionSetMethod @Inject()(serializer: EmailSubmissionSetSerialize
messageIdManager: MessageIdManager,
mailQueueFactory: MailQueueFactory[_ <: MailQueue],
canSendFrom: CanSendFrom,
+ emailSetMethod: EmailSetMethod,
val metricFactory: MetricFactory,
val sessionSupplier: SessionSupplier) extends MethodRequiringAccountId[EmailSubmissionSetRequest] with Startable {
override val methodName: MethodName = MethodName("EmailSubmission/set")
@@ -122,8 +124,8 @@ class EmailSubmissionSetMethod @Inject()(serializer: EmailSubmissionSetSerialize
Try(queue.close())
.recover(e => LOGGER.debug("error closing queue", e))
- override def doProcess(capabilities: Set[CapabilityIdentifier], invocation: InvocationWithContext, mailboxSession: MailboxSession, request: EmailSubmissionSetRequest): SMono[InvocationWithContext] = {
- for {
+ override def doProcess(capabilities: Set[CapabilityIdentifier], invocation: InvocationWithContext, mailboxSession: MailboxSession, request: EmailSubmissionSetRequest): Publisher[InvocationWithContext] = {
+ val result = for {
createdResults <- create(request, mailboxSession, invocation.processingContext)
} yield InvocationWithContext(
invocation = Invocation(
@@ -136,6 +138,13 @@ class EmailSubmissionSetMethod @Inject()(serializer: EmailSubmissionSetSerialize
.as[JsObject]),
methodCallId = invocation.invocation.methodCallId),
processingContext = createdResults._2)
+
+ SFlux.concat(result,
+ emailSetMethod.doProcess(
+ capabilities = capabilities,
+ invocation = invocation,
+ mailboxSession = mailboxSession,
+ request = request.implicitEmailSetRequest))
}
override def getRequest(mailboxSession: MailboxSession, invocation: Invocation): SMono[EmailSubmissionSetRequest] =
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org