Better management of realtime with contacts

apps/browser/src/background/main.background.ts

@@ -834,6 +834,7 @@ export default class MainBackground {
       this.accountService,
       this.i18nService,
       this.tokenService,
+      this.logService,
     );
     // Cozy customization end
 

apps/browser/src/cozy/realtime/RealtimeNotifications.ts

@@ -3,6 +3,7 @@ import { CouchDBDocument, IOCozyContact } from "cozy-client/types/types";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 
@@ -15,13 +16,15 @@ import {
 } from "../../../../../libs/cozy/note.helper";
 import { convertPaperToCipherData } from "../../../../../libs/cozy/paper.helper";
 import { fetchPaper } from "../../../../../libs/cozy/queries";
+import { shouldDisplayContact } from "../../../../../libs/cozy/sync";
 
 export class RealTimeNotifications {
   constructor(
     private messagingService: MessagingService,
     private cipherService: CipherService,
     private i18nService: I18nService,
     private accountService: AccountService,
+    private logService: LogService,
     private client: CozyClient,
   ) {}
 
@@ -59,9 +62,16 @@ export class RealTimeNotifications {
   }
 
   async dispatchCreateContact(data: IOCozyContact) {
-    await this.upsertContactData(data);
+    const contactMustBeDisplayed = await shouldDisplayContact(this.client, data);
+
+    if (contactMustBeDisplayed) {
+      this.logService.info(`Contact ${data.displayName} (${data._id}) added from realtime`)
+      await this.upsertContactData(data);
 
-    await dispatchCreate(this.client, "io.cozy.contacts", data as CouchDBDocument);
+      await dispatchCreate(this.client, "io.cozy.contacts", data as CouchDBDocument);
+    } else {
+      this.logService.info(`Contact ${data.displayName} (${data._id}) not added from realtime`)
+    }
   }
 
   async dispatchUpdateContact(data: IOCozyContact) {

apps/browser/src/popup/services/cozyClient.service.ts

@@ -11,6 +11,7 @@ import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"
 import { UriMatchStrategy } from "@bitwarden/common/models/domain/domain-service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { SecureNoteType } from "@bitwarden/common/vault/enums";
@@ -61,6 +62,7 @@ export class CozyClientService {
     protected accountService: AccountService,
     private i18nService: I18nService,
     private tokenService: TokenService,
+    private logService: LogService,
   ) {
     this.flagChangedPointer = this.flagChanged.bind(this);
   }
@@ -189,6 +191,7 @@ export class CozyClientService {
       this.cipherService,
       this.i18nService,
       this.accountService,
+      this.logService,
       this.instance,
     );
     this.realTimeNotifications.init();

libs/cozy/queries.ts

@@ -78,6 +78,15 @@ export const fetchPaper = async (client: CozyClient, _id: string) => {
 
 // Contacts
 
+export const buildMyselfQuery = () => {
+  return {
+    definition: Q(CONTACTS_DOCTYPE).where({ me: true }),
+    options: {
+      as: `${CONTACTS_DOCTYPE}/myself`
+    },
+  };
+};
+
 export const buildContactsQuery = () => ({
   definition: Q(CONTACTS_DOCTYPE)
     .where({
@@ -122,6 +131,17 @@ export const buildContactsQuery = () => ({
   },
 });
 
+export const fetchMyself = async (client: CozyClient): Promise<IOCozyContact[]> => {
+  const myselfQuery = buildMyselfQuery();
+
+  const { data }: { data: IOCozyContact[] } = await client.query(
+    myselfQuery.definition,
+    myselfQuery.options,
+  );
+
+  return data;
+};
+
 export const fetchContacts = async (client: CozyClient): Promise<IOCozyContact[]> => {
   const contactsQuery = buildContactsQuery();
 

libs/cozy/sync.ts

@@ -1,3 +1,4 @@
+import CozyClient from "cozy-client";
 import { IOCozyContact, IOCozyFile } from "cozy-client/types/types";
 
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@@ -10,8 +11,40 @@ import { CozyClientService } from "../../apps/browser/src/popup/services/cozyCli
 
 import { convertAllContactsAsCiphers } from "./contactCipher";
 import { convertAllPapersAsCiphers } from "./paperCipher";
-import { fetchContactsAndPapers } from "./queries";
+import { fetchContactsAndPapers, fetchPapers, fetchMyself } from "./queries";
 
+export const shouldDisplayContact = async (client: CozyClient, contact: IOCozyContact) => {
+  if (contact.me) {
+    return true;
+  }
+
+  if (contact.cozyMetadata.favorite) {
+    return true;
+  }
+
+  const me = await fetchMyself(client);
+
+  const contactRelatedToMe =
+    // @ts-expect-error related added manually with an hydration
+    me?.[0]?.relationships?.related?.data.find((relatedContact) => relatedContact._id === contact._id);
+
+  if (contactRelatedToMe) {
+    return true;
+  }
+
+  const papers = await fetchPapers(client);
+
+  const contactIsInPaper = papers.find((paper) => {
+    // @ts-expect-error contacts added manually with an hydration
+    return paper.contacts.data.find((paperContact) => paperContact._id === contact._id);
+  });
+
+  if (contactIsInPaper) {
+    return true;
+  }
+
+  return false;
+};
 export const selectContactsAndPapers = (
   contacts: IOCozyContact[],
   papers: IOCozyFile[],