chore(deps): bump @wireapp/core from 17.3.0 to 17.4.7 (#11012)

* chore(deps): bump @wireapp/core from 17.3.0 to 17.4.7

Bumps [@wireapp/core](https://github.com/wireapp/wire-web-packages) from 17.3.0 to 17.4.7.
- [Release notes](https://github.com/wireapp/wire-web-packages/releases)
- [Commits](https://github.com/wireapp/wire-web-packages/compare/@wireapp/core@17.3.0...@wireapp/core@17.4.7)

Signed-off-by: dependabot[bot] <support@github.com>

* new API

* new API

* fix return value

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Florian Imdahl <florian@wire.com>
Co-authored-by: Benny Neugebauer <bn@bennyn.de>

package.json

@@ -2,7 +2,7 @@
   "dependencies": {
     "@wireapp/antiscroll-2": "1.0.2",
     "@wireapp/avs": "7.1.6",
-    "@wireapp/core": "17.3.0",
+    "@wireapp/core": "17.4.7",
     "@wireapp/protocol-messaging": "1.29.0",
     "@wireapp/react-ui-kit": "7.50.0",
     "@wireapp/store-engine-dexie": "1.4.0",

src/script/client/ClientRepository.test.ts

@@ -17,7 +17,7 @@
  *
  */
 
-import {ClientClassification, ClientType, PublicClient, QualifiedPublicClients} from '@wireapp/api-client/src/client/';
+import {ClientClassification, ClientType, PublicClient} from '@wireapp/api-client/src/client/';
 import {StatusCodes as HTTP_STATUS} from 'http-status-codes';
 import {Runtime} from '@wireapp/commons';
 
@@ -26,6 +26,7 @@ import {ClientRepository} from 'src/script/client/ClientRepository';
 import {ClientEntity} from 'src/script/client/ClientEntity';
 import {ClientMapper} from 'src/script/client/ClientMapper';
 import {ClientError} from 'src/script/error/ClientError';
+import {QualifiedPublicUserMap} from 'src/script/client/ClientService';
 import {TestFactory} from '../../../test/helper/TestFactory';
 
 describe('ClientRepository', () => {
@@ -54,7 +55,7 @@ describe('ClientRepository', () => {
         {class: ClientClassification.TABLET, id: 'c411f97b139c818b'},
         {class: ClientClassification.DESKTOP, id: 'cbf3ea49214702d8'},
       ];
-      const userClientMap: QualifiedPublicClients = {
+      const userClientMap: QualifiedPublicUserMap = {
         none: {
           [entities.user.john_doe.id]: allClients,
         },

src/script/client/ClientRepository.ts

@@ -18,7 +18,7 @@
  */
 
 import ko from 'knockout';
-import {ClientType, PublicClient, QualifiedPublicClients, RegisteredClient} from '@wireapp/api-client/src/client/';
+import {ClientType, PublicClient, RegisteredClient} from '@wireapp/api-client/src/client/';
 import {USER_EVENT, UserClientAddEvent, UserClientRemoveEvent} from '@wireapp/api-client/src/event';
 import {QualifiedId} from '@wireapp/api-client/src/user/';
 import {Runtime} from '@wireapp/commons';
@@ -37,7 +37,7 @@ import {StorageKey} from '../storage/StorageKey';
 import {ModalsViewModel} from '../view_model/ModalsViewModel';
 import {ClientEntity} from './ClientEntity';
 import {ClientMapper} from './ClientMapper';
-import type {ClientService} from './ClientService';
+import type {ClientService, QualifiedPublicUserMap} from './ClientService';
 import type {CryptographyRepository} from '../cryptography/CryptographyRepository';
 import type {User} from '../entity/User';
 import {ClientError} from '../error/ClientError';
@@ -350,11 +350,11 @@ export class ClientRepository {
    * @returns Resolves with an array of client entities
    */
   async getClientsByUserIds(userIds: (QualifiedId | string)[], updateClients: true): Promise<QualifiedUserClientMap>;
-  async getClientsByUserIds(userIds: (QualifiedId | string)[], updateClients: false): Promise<QualifiedPublicClients>;
+  async getClientsByUserIds(userIds: (QualifiedId | string)[], updateClients: false): Promise<QualifiedPublicUserMap>;
   async getClientsByUserIds(
     userIds: (QualifiedId | string)[],
     updateClients: boolean,
-  ): Promise<QualifiedPublicClients | QualifiedUserClientMap> {
+  ): Promise<QualifiedPublicUserMap | QualifiedUserClientMap> {
     const userClientsMap = await this.clientService.getClientsByUserIds(userIds);
 
     if (updateClients) {

src/script/client/ClientService.ts

@@ -28,6 +28,8 @@ import {StorageService} from '../storage';
 import {StorageSchemata} from '../storage/StorageSchemata';
 import {APIClient} from '../service/APIClientSingleton';
 
+export type QualifiedPublicUserMap = QualifiedPublicClients['qualified_user_map'];
+
 export class ClientService {
   private readonly logger: Logger;
   private readonly CLIENT_STORE_NAME: string;
@@ -101,9 +103,9 @@ export class ClientService {
    * @param userId ID of user to retrieve clients for
    * @returns Resolves with the clients of a user
    */
-  async getClientsByUserIds(userIds: (QualifiedId | string)[]): Promise<QualifiedPublicClients> {
+  async getClientsByUserIds(userIds: (QualifiedId | string)[]): Promise<QualifiedPublicUserMap> {
     // Add 'none' as domain for non-federated users
-    let clients: QualifiedPublicClients = {none: {}};
+    let clients: QualifiedPublicUserMap = {none: {}};
 
     const {qualifiedIds, stringIds} = userIds.reduce(
       (result, userId) => {
@@ -122,8 +124,8 @@ export class ClientService {
     }
 
     if (qualifiedIds.length) {
-      const listedClients = await this.apiClient.user.api.postListClients(qualifiedIds);
-      clients = {...clients, ...listedClients};
+      const listedClients = await this.apiClient.user.api.postListClients({qualified_users: qualifiedIds});
+      clients = {...clients, ...listedClients.qualified_user_map};
     }
 
     return clients;

src/script/user/UserRepository.ts

@@ -33,7 +33,7 @@ import {WebAppEvents} from '@wireapp/webapp-events';
 import type {AccentColor} from '@wireapp/commons';
 import type {AxiosError} from 'axios';
 import type {BackendError, TraceState} from '@wireapp/api-client/src/http';
-import type {QualifiedPublicClients, PublicClient} from '@wireapp/api-client/src/client';
+import type {PublicClient} from '@wireapp/api-client/src/client';
 import type {User as APIClientUser, QualifiedHandle} from '@wireapp/api-client/src/user';
 
 import {chunk, partition} from 'Util/ArrayUtil';
@@ -68,6 +68,7 @@ import type {PropertiesRepository} from '../properties/PropertiesRepository';
 import type {SelfService} from '../self/SelfService';
 import type {ServerTimeHandler} from '../time/serverTimeHandler';
 import type {UserService} from './UserService';
+import {QualifiedPublicUserMap} from '../client/ClientService';
 
 export class UserRepository {
   private readonly logger: Logger;
@@ -176,23 +177,23 @@ export class UserRepository {
    * Retrieves meta information about all the clients of a given user.
    */
   getClientsByUserIds(userIds: (QualifiedId | string)[], updateClients: true): Promise<QualifiedUserClientMap>;
-  getClientsByUserIds(userIds: (QualifiedId | string)[], updateClients: false): Promise<QualifiedPublicClients>;
+  getClientsByUserIds(userIds: (QualifiedId | string)[], updateClients: false): Promise<QualifiedPublicUserMap>;
   getClientsByUserIds(
     userIds: (QualifiedId | string)[],
     updateClients: boolean,
-  ): Promise<QualifiedUserClientMap | QualifiedPublicClients> {
+  ): Promise<QualifiedUserClientMap | QualifiedPublicUserMap> {
     return this.clientRepository.getClientsByUserIds(userIds, updateClients as any);
   }
 
   /**
    * Retrieves meta information about all the clients of a given user.
    */
   getClientsByUsers(userEntities: User[], updateClients: true): Promise<QualifiedUserClientMap>;
-  getClientsByUsers(userEntities: User[], updateClients: false): Promise<QualifiedPublicClients>;
+  getClientsByUsers(userEntities: User[], updateClients: false): Promise<QualifiedPublicUserMap>;
   getClientsByUsers(
     userEntities: User[],
     updateClients: boolean,
-  ): Promise<QualifiedUserClientMap | QualifiedPublicClients> {
+  ): Promise<QualifiedUserClientMap | QualifiedPublicUserMap> {
     const userIds: (QualifiedId | string)[] = userEntities.map(userEntity => {
       return userEntity.domain ? {domain: userEntity.domain, id: userEntity.id} : userEntity.id;
     });