Skip to content

Commit

Permalink
Implement getUserParticipationStatus
Browse files Browse the repository at this point in the history
  • Loading branch information
@HoussemNasri
HoussemNasri committed Jan 20, 2025
1 parent fecb130 commit 0df173e
Show file tree
Hide file tree
Showing 28 changed files with 693 additions and 182 deletions.
2 changes: 1 addition & 1 deletion ...ackend/apps/distributed/src/main/java/com/linagora/tmail/james/app/DistributedServer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ private static List<Module> chooseOpenPaasModule(OpenPaasModuleChooserConfigurat
if (openPaasModuleChooserConfiguration.enabled()) {
ImmutableList.Builder<Module> moduleBuilder = ImmutableList.<Module>builder().add(new OpenPaasModule());
if (openPaasModuleChooserConfiguration.cardDavCollectedContactEnabled()) {
moduleBuilder.add(new OpenPaasModule.CardDavModule());
moduleBuilder.add(new OpenPaasModule.DavModule());
}
if (openPaasModuleChooserConfiguration.contactsConsumerEnabled()) {
moduleBuilder.add(new OpenPaasContactsConsumerModule());
Expand Down
2 changes: 1 addition & 1 deletion tmail-backend/apps/memory/src/main/java/com/linagora/tmail/james/app/MemoryServer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ private static List<Module> chooseOpenPaas(OpenPaasModuleChooserConfiguration mo
ImmutableList.Builder<Module> moduleBuilder = ImmutableList.<Module>builder().add(new OpenPaasModule());

if (moduleChooserConfiguration.cardDavCollectedContactEnabled()) {
moduleBuilder.add(new OpenPaasModule.CardDavModule());
moduleBuilder.add(new OpenPaasModule.DavModule());
}
if (moduleChooserConfiguration.contactsConsumerEnabled()) {
moduleBuilder.add(Modules.override(new OpenPaasContactsConsumerModule())
Expand Down
2 changes: 1 addition & 1 deletion ...ap/extensions/src/main/scala/com/linagora/tmail/james/jmap/model/CalendarEventParse.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ object CalendarAttendeeParticipationStatus {
.map(_.getValue)
.map(CalendarAttendeeParticipationStatus(_))
}
case class CalendarAttendeeParticipationStatus(value: String) extends AnyVal
case class CalendarAttendeeParticipationStatus(value: String)
object CalendarAttendeeExpectReply {
def from(attendee: Attendee): Option[CalendarAttendeeExpectReply] =
Option(attendee.getParameter("RSVP").asInstanceOf[Parameter])
Expand Down
4 changes: 4 additions & 0 deletions tmail-backend/tmail-third-party/openpaas/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
<groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-rabbitmq</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jmap-extensions</artifactId>
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
<artifactId>apache-james-backends-rabbitmq</artifactId>
Expand Down
10 changes: 5 additions & 5 deletions ...l-backend/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/OpenPaasModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import com.linagora.tmail.api.OpenPaasRestClient;
import com.linagora.tmail.carddav.CardDavClient;
import com.linagora.tmail.configuration.OpenPaasConfiguration;
import com.linagora.tmail.dav.DavClient;

public class OpenPaasModule extends AbstractModule {
private static final Logger LOGGER = LoggerFactory.getLogger(OpenPaasModule.class);
Expand Down Expand Up @@ -65,14 +65,14 @@ public OpenPaasRestClient provideOpenPaasRestCLient(OpenPaasConfiguration openPa
return new OpenPaasRestClient(openPaasConfiguration);
}

public static class CardDavModule extends AbstractModule {
public static class DavModule extends AbstractModule {

@Provides
@Singleton
public CardDavClient provideCardDavClient(OpenPaasConfiguration openPaasConfiguration) {
public DavClient provideDavClient(OpenPaasConfiguration openPaasConfiguration) {
Preconditions.checkArgument(openPaasConfiguration.cardDavConfiguration().isPresent(),
"OpenPaasConfiguration should have a carddav configuration");
return new CardDavClient.OpenpaasCardDavClient(openPaasConfiguration.cardDavConfiguration().get());
"OpenPaasConfiguration should have dav configuration");
return new DavClient(openPaasConfiguration.cardDavConfiguration().get());
}
}
}
4 changes: 2 additions & 2 deletions ...d-party/openpaas/src/main/java/com/linagora/tmail/OpenPaasModuleChooserConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.linagora.tmail.configuration.CardDavConfiguration;
import com.linagora.tmail.configuration.DavConfiguration;
import com.linagora.tmail.configuration.OpenPaasConfiguration;

public record OpenPaasModuleChooserConfiguration(boolean enabled,
Expand All @@ -43,7 +43,7 @@ public static OpenPaasModuleChooserConfiguration parse(PropertiesProvider proper
try {
Configuration configuration = propertiesProvider.getConfiguration("openpaas");
boolean contactsConsumerEnabled = OpenPaasConfiguration.isConfiguredContactConsumer(configuration);
boolean cardDavCollectedContactEnabled = CardDavConfiguration.isConfigured(configuration);
boolean cardDavCollectedContactEnabled = DavConfiguration.isConfigured(configuration);
LOGGER.info("OpenPaas module is turned on. Contacts consumer is enabled: {}, CardDav is enabled: {}",
contactsConsumerEnabled, cardDavCollectedContactEnabled);
return new OpenPaasModuleChooserConfiguration(ENABLED, cardDavCollectedContactEnabled, contactsConsumerEnabled);
Expand Down
110 changes: 0 additions & 110 deletions ...nd/tmail-third-party/openpaas/src/main/java/com/linagora/tmail/carddav/CardDavClient.java
View file

This file was deleted.

14 changes: 7 additions & 7 deletions ...l/configuration/CardDavConfiguration.java → ...tmail/configuration/DavConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,25 @@

import com.google.common.base.Preconditions;

public record CardDavConfiguration(UsernamePasswordCredentials adminCredential,
URI baseUrl,
Optional<Boolean> trustAllSslCerts,
Optional<Duration> responseTimeout) {
public record DavConfiguration(UsernamePasswordCredentials adminCredential,
URI baseUrl,
Optional<Boolean> trustAllSslCerts,
Optional<Duration> responseTimeout) {
static final boolean CLIENT_TRUST_ALL_SSL_CERTS_DISABLED = false;
static final String CARD_DAV_API_URI_PROPERTY = "carddav.api.uri";
static final String CARD_DAV_ADMIN_USER_PROPERTY = "carddav.admin.user";
static final String CARD_DAV_ADMIN_PASSWORD_PROPERTY = "carddav.admin.password";
static final String CARD_DAV_REST_CLIENT_TRUST_ALL_SSL_CERTS_PROPERTY = "carddav.rest.client.trust.all.ssl.certs";
static final String CARD_DAV_REST_CLIENT_RESPONSE_TIMEOUT_PROPERTY = "carddav.rest.client.response.timeout";

public static Optional<CardDavConfiguration> maybeFrom(Configuration configuration) {
public static Optional<DavConfiguration> maybeFrom(Configuration configuration) {
if (isConfigured(configuration)) {
return Optional.of(from(configuration));
}
return Optional.empty();
}

public static CardDavConfiguration from(Configuration configuration) {
public static DavConfiguration from(Configuration configuration) {
String adminUser = configuration.getString(CARD_DAV_ADMIN_USER_PROPERTY, null);
String adminPassword = configuration.getString(CARD_DAV_ADMIN_PASSWORD_PROPERTY, null);

Expand All @@ -64,7 +64,7 @@ public static CardDavConfiguration from(Configuration configuration) {
Preconditions.checkArgument(durationAsMilliseconds > 0, "Response timeout should not be negative");
return Duration.ofMillis(durationAsMilliseconds);
});
return new CardDavConfiguration(adminCredential, baseUrl, trustAllSslCerts, responseTimeout);
return new DavConfiguration(adminCredential, baseUrl, trustAllSslCerts, responseTimeout);
}

public static boolean isConfigured(Configuration configuration) {
Expand Down
6 changes: 3 additions & 3 deletions ...-party/openpaas/src/main/java/com/linagora/tmail/configuration/OpenPaasConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public record OpenPaasConfiguration(URI apirUri,
String adminPassword,
boolean trustAllSslCerts,
Optional<ContactConsumerConfiguration> contactConsumerConfiguration,
Optional<CardDavConfiguration> cardDavConfiguration) {
Optional<DavConfiguration> cardDavConfiguration) {

public record ContactConsumerConfiguration(List<AmqpUri> amqpUri,
boolean quorumQueuesBypass) {
Expand All @@ -46,7 +46,7 @@ public OpenPaasConfiguration(URI apirUri, String adminUsername, String adminPass
this(apirUri, adminUsername, adminPassword, trustAllSslCerts, Optional.of(contactConsumerConfiguration), Optional.empty());
}

public OpenPaasConfiguration(URI apirUri, String adminUsername, String adminPassword, boolean trustAllSslCerts, CardDavConfiguration cardDavConfiguration) {
public OpenPaasConfiguration(URI apirUri, String adminUsername, String adminPassword, boolean trustAllSslCerts, DavConfiguration cardDavConfiguration) {
this(apirUri, adminUsername, adminPassword, trustAllSslCerts, Optional.empty(), Optional.of(cardDavConfiguration));
}

Expand All @@ -69,7 +69,7 @@ public static OpenPaasConfiguration from(Configuration configuration) {
Optional<ContactConsumerConfiguration> contactConsumerConfiguration = readRabbitMqUri(configuration)
.map(amqpUri -> new ContactConsumerConfiguration(amqpUri, readQuorumQueuesBypass(configuration)));

Optional<CardDavConfiguration> cardDavConfiguration = CardDavConfiguration.maybeFrom(configuration);
Optional<DavConfiguration> cardDavConfiguration = DavConfiguration.maybeFrom(configuration);

return new OpenPaasConfiguration(openPaasApiUri, adminUser, adminPassword, trustAllSslCerts, contactConsumerConfiguration, cardDavConfiguration);
}
Expand Down
17 changes: 9 additions & 8 deletions ...tmail/carddav/CardDavCreationFactory.java → .../com/linagora/tmail/dav/CardDavUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* more details. *
********************************************************************/

package com.linagora.tmail.carddav;
package com.linagora.tmail.dav;

import java.nio.charset.StandardCharsets;
import java.util.List;
Expand All @@ -25,20 +25,21 @@
import org.apache.james.core.MailAddress;

import com.google.common.hash.Hashing;
import com.linagora.tmail.dav.request.CardDavCreationObjectRequest;

import ezvcard.parameter.EmailType;

public class CardDavCreationFactory {
public class CardDavUtils {
private static final String VERSION = "4.0";
private static final EmailType EMAIL_TYPE_DEFAULT = EmailType.WORK;
private static final EmailType DEFAULT_EMAIL_TYPE = EmailType.WORK;

public static CardDavCreationObjectRequest create(Optional<String> fullName, MailAddress email) {
CardDavCreationObjectRequest.Email emailObject = new CardDavCreationObjectRequest.Email(List.of(EMAIL_TYPE_DEFAULT), email);
return new CardDavCreationObjectRequest(VERSION, createContactUid(email), fullName, Optional.empty(), emailObject);
public static CardDavCreationObjectRequest createObjectCreationRequest(Optional<String> maybeFullName, MailAddress email) {
CardDavCreationObjectRequest.Email emailObject = new CardDavCreationObjectRequest.Email(List.of(DEFAULT_EMAIL_TYPE), email);
return new CardDavCreationObjectRequest(VERSION, createContactUid(email), maybeFullName, Optional.empty(), emailObject);
}

public static CardDavCreationObjectRequest create(MailAddress email) {
return create(Optional.empty(), email);
public static CardDavCreationObjectRequest createObjectCreationRequest(MailAddress email) {
return createObjectCreationRequest(Optional.empty(), email);
}

public static String createContactUid(MailAddress email) {
Expand Down
Loading

0 comments on commit 0df173e

Please sign in to comment.