feat(core): Add option to set a domain on an account

packages/core/src/main/Account.ts

@@ -96,6 +96,10 @@ export interface Account {
 
 export type StoreEngineProvider = (storeName: string) => Promise<CRUDEngine>;
 
+type AccountConfig = {
+  federationDomain?: string;
+};
+
 export class Account extends EventEmitter {
   private readonly apiClient: APIClient;
   private readonly logger: logdown.Logger;
@@ -118,7 +122,16 @@ export class Account extends EventEmitter {
     user: UserService;
   };
 
-  constructor(apiClient: APIClient = new APIClient(), storeEngineProvider?: StoreEngineProvider) {
+  /**
+   * @param apiClient The apiClient instance to use in the core (will create a new new one if undefined)
+   * @param storeEngineProvider Used to store info in the database (will create a inMemory engine if undefined)
+   * @param config.federationDomain If using a federated backend this will set the default domain for qualified ids. Do not set if using a regular backend
+   */
+  constructor(
+    apiClient: APIClient = new APIClient(),
+    storeEngineProvider?: StoreEngineProvider,
+    private readonly config?: AccountConfig,
+  ) {
     super();
     this.apiClient = apiClient;
     if (storeEngineProvider) {
@@ -187,7 +200,7 @@ export class Account extends EventEmitter {
   public async initServices(storeEngine: CRUDEngine): Promise<void> {
     const accountService = new AccountService(this.apiClient);
     const assetService = new AssetService(this.apiClient);
-    const cryptographyService = new CryptographyService(this.apiClient, storeEngine);
+    const cryptographyService = new CryptographyService(this.apiClient, storeEngine, this.config);
 
     const clientService = new ClientService(this.apiClient, storeEngine, cryptographyService);
     const connectionService = new ConnectionService(this.apiClient);

packages/core/src/main/cryptography/CryptographyService.ts

@@ -49,19 +49,28 @@ export interface MetaClient extends RegisteredClient {
   };
 }
 
+type CryptographyServiceOptions = {
+  federationDomain?: string;
+};
+
 export class CryptographyService {
   private readonly logger: logdown.Logger;
 
   public cryptobox: Cryptobox;
   private readonly database: CryptographyDatabaseRepository;
 
-  constructor(readonly apiClient: APIClient, private readonly storeEngine: CRUDEngine) {
+  constructor(
+    readonly apiClient: APIClient,
+    private readonly storeEngine: CRUDEngine,
+    private readonly options?: CryptographyServiceOptions,
+  ) {
     this.cryptobox = new Cryptobox(this.storeEngine);
     this.database = new CryptographyDatabaseRepository(this.storeEngine);
     this.logger = logdown('@wireapp/core/cryptography/CryptographyService', {
       logger: console,
       markdown: false,
     });
+    this.options = options;
   }
 
   public static constructSessionId(userId: string, clientId: string, domain: string | null): string {
@@ -209,7 +218,8 @@ export class CryptographyService {
       data: {sender, text: cipherText},
     } = otrMessage;
 
-    const sessionId = CryptographyService.constructSessionId(from, sender, qualified_from?.domain || null);
+    const domain = this.options?.federationDomain ? qualified_from?.domain || this.options.federationDomain : null;
+    const sessionId = CryptographyService.constructSessionId(from, sender, domain);
     const decryptedMessage = await this.decrypt(sessionId, cipherText);
     const genericMessage = GenericMessage.decode(decryptedMessage);