@wireapp/core 17.24.0 → 17.24.1

package/src/main/conversation/message/UserClientsUtil.d.ts

@@ -0,0 +1,22 @@
+import { QualifiedId } from '@wireapp/api-client/src/user';
+declare type UserClientsContainer<T> = {
+    [userId: string]: T;
+};
+declare type QualifiedUserClientsContainer<T> = {
+    [domain: string]: UserClientsContainer<T>;
+};
+export declare function flattenUserClients<T>(userClients: UserClientsContainer<T>, domain?: string): {
+    data: T;
+    userId: QualifiedId;
+}[];
+/**
+ * Will flatten a container of users=>clients infos to an array
+ *
+ * @param userClients The UserClients (qualified or not) to flatten
+ * @return An array containing the qualified user Ids and the clients info
+ */
+export declare function flattenQualifiedUserClients<T = unknown>(userClients: QualifiedUserClientsContainer<T>): {
+    data: T;
+    userId: QualifiedId;
+}[];
+export {};

package/src/main/conversation/message/UserClientsUtil.js

@@ -0,0 +1,38 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2021 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.flattenQualifiedUserClients = exports.flattenUserClients = void 0;
+function flattenUserClients(userClients, domain = '') {
+    return Object.entries(userClients).map(([id, data]) => ({ data, userId: { domain, id } }));
+}
+exports.flattenUserClients = flattenUserClients;
+/**
+ * Will flatten a container of users=>clients infos to an array
+ *
+ * @param userClients The UserClients (qualified or not) to flatten
+ * @return An array containing the qualified user Ids and the clients info
+ */
+function flattenQualifiedUserClients(userClients) {
+    return Object.entries(userClients).reduce((ids, [domain, userClients]) => {
+        return [...ids, ...flattenUserClients(userClients, domain)];
+    }, []);
+}
+exports.flattenQualifiedUserClients = flattenQualifiedUserClients;
+//# sourceMappingURL=UserClientsUtil.js.map

package/src/main/conversation/message/UserClientsUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UserClientsUtil.js","sourceRoot":"","sources":["UserClientsUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;AAOH,SAAgB,kBAAkB,CAChC,WAAoC,EACpC,SAAiB,EAAE;IAEnB,OAAO,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,EAAC,IAAI,EAAE,MAAM,EAAE,EAAC,MAAM,EAAE,EAAE,EAAC,EAAC,CAAC,CAAC,CAAC;AACzF,CAAC;AALD,gDAKC;AAED;;;;;GAKG;AACH,SAAgB,2BAA2B,CACzC,WAA6C;IAE7C,OAAO,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,EAAE;QACvE,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,kBAAkB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;IAC9D,CAAC,EAAE,EAAsC,CAAC,CAAC;AAC7C,CAAC;AAND,kEAMC"}

package/src/main/conversation/message/UserClientsUtil.ts

@@ -0,0 +1,44 @@
+/*
+ * Wire
+ * Copyright (C) 2021 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {QualifiedId} from '@wireapp/api-client/src/user';
+
+type UserClientsContainer<T> = {[userId: string]: T};
+type QualifiedUserClientsContainer<T> = {[domain: string]: UserClientsContainer<T>};
+
+export function flattenUserClients<T>(
+  userClients: UserClientsContainer<T>,
+  domain: string = '',
+): {data: T; userId: QualifiedId}[] {
+  return Object.entries(userClients).map(([id, data]) => ({data, userId: {domain, id}}));
+}
+
+/**
+ * Will flatten a container of users=>clients infos to an array
+ *
+ * @param userClients The UserClients (qualified or not) to flatten
+ * @return An array containing the qualified user Ids and the clients info
+ */
+export function flattenQualifiedUserClients<T = unknown>(
+  userClients: QualifiedUserClientsContainer<T>,
+): {data: T; userId: QualifiedId}[] {
+  return Object.entries(userClients).reduce((ids, [domain, userClients]) => {
+    return [...ids, ...flattenUserClients(userClients, domain)];
+  }, [] as {data: T; userId: QualifiedId}[]);
+}

package/src/main/conversation/message/UserClientsUtils.test.node.d.ts

@@ -0,0 +1 @@
+export {};

package/src/main/conversation/message/UserClientsUtils.test.node.js

@@ -0,0 +1,42 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2021 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const UserClientsUtil_1 = require("./UserClientsUtil");
+describe('userClientsUtils', () => {
+    it('extracts user and data info from qualified payload', () => {
+        const payload = { domain1: { user1: ['client1'], user2: ['client11'] }, domain2: { user3: ['client1', 'client2'] } };
+        const expected = [
+            { data: ['client1'], userId: { domain: 'domain1', id: 'user1' } },
+            { data: ['client11'], userId: { domain: 'domain1', id: 'user2' } },
+            { data: ['client1', 'client2'], userId: { domain: 'domain2', id: 'user3' } },
+        ];
+        expect((0, UserClientsUtil_1.flattenQualifiedUserClients)(payload)).toEqual(expected);
+    });
+    it('extracts user and data info from non-qualified payload', () => {
+        const payload = { user1: ['client1'], user2: ['client11'], user3: ['client1', 'client2'] };
+        const expected = [
+            { data: ['client1'], userId: { domain: '', id: 'user1' } },
+            { data: ['client11'], userId: { domain: '', id: 'user2' } },
+            { data: ['client1', 'client2'], userId: { domain: '', id: 'user3' } },
+        ];
+        expect((0, UserClientsUtil_1.flattenUserClients)(payload)).toEqual(expected);
+    });
+});
+//# sourceMappingURL=UserClientsUtils.test.node.js.map

package/src/main/conversation/message/UserClientsUtils.test.node.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UserClientsUtils.test.node.js","sourceRoot":"","sources":["UserClientsUtils.test.node.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;AAEH,uDAAkF;AAElF,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,MAAM,OAAO,GAAG,EAAC,OAAO,EAAE,EAAC,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,UAAU,CAAC,EAAC,EAAE,OAAO,EAAE,EAAC,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,EAAC,EAAC,CAAC;QAC/G,MAAM,QAAQ,GAAG;YACf,EAAC,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAC,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,EAAC,EAAC;YAC7D,EAAC,IAAI,EAAE,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,EAAC,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,EAAC,EAAC;YAC9D,EAAC,IAAI,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,EAAC,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,EAAC,EAAC;SACzE,CAAC;QAEF,MAAM,CAAC,IAAA,6CAA2B,EAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,MAAM,OAAO,GAAG,EAAC,KAAK,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,EAAC,CAAC;QACzF,MAAM,QAAQ,GAAG;YACf,EAAC,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAC,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,EAAC,EAAC;YACtD,EAAC,IAAI,EAAE,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,EAAC,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,EAAC,EAAC;YACvD,EAAC,IAAI,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,EAAC,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,EAAC,EAAC;SAClE,CAAC;QAEF,MAAM,CAAC,IAAA,oCAAkB,EAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/src/main/conversation/message/UserClientsUtils.test.node.ts

@@ -0,0 +1,44 @@
+/*
+ * Wire
+ * Copyright (C) 2021 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {flattenQualifiedUserClients, flattenUserClients} from './UserClientsUtil';
+
+describe('userClientsUtils', () => {
+  it('extracts user and data info from qualified payload', () => {
+    const payload = {domain1: {user1: ['client1'], user2: ['client11']}, domain2: {user3: ['client1', 'client2']}};
+    const expected = [
+      {data: ['client1'], userId: {domain: 'domain1', id: 'user1'}},
+      {data: ['client11'], userId: {domain: 'domain1', id: 'user2'}},
+      {data: ['client1', 'client2'], userId: {domain: 'domain2', id: 'user3'}},
+    ];
+
+    expect(flattenQualifiedUserClients(payload)).toEqual(expected);
+  });
+
+  it('extracts user and data info from non-qualified payload', () => {
+    const payload = {user1: ['client1'], user2: ['client11'], user3: ['client1', 'client2']};
+    const expected = [
+      {data: ['client1'], userId: {domain: '', id: 'user1'}},
+      {data: ['client11'], userId: {domain: '', id: 'user2'}},
+      {data: ['client1', 'client2'], userId: {domain: '', id: 'user3'}},
+    ];
+
+    expect(flattenUserClients(payload)).toEqual(expected);
+  });
+});

package/src/main/util/TypePredicateUtil.js

@@ -20,7 +20,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isUserClients = exports.isQualifiedUserClients = exports.isQualifiedIdArray = exports.isQualifiedId = exports.isStringArray = void 0;
 function isStringArray(obj) {
-    return Array.isArray(obj) && typeof obj[0] === 'string';
+    return Array.isArray(obj) && (obj.length === 0 || typeof obj[0] === 'string');
 }
 exports.isStringArray = isStringArray;
 function isQualifiedId(obj) {
@@ -37,10 +37,7 @@ function isQualifiedUserClients(obj) {
         const firstUserClientObject = (_a = Object.values(obj)) === null || _a === void 0 ? void 0 : _a[0];
         if (typeof firstUserClientObject === 'object') {
             const firstClientIdArray = Object.values(firstUserClientObject)[0];
-            if (Array.isArray(firstClientIdArray)) {
-                const firstClientId = firstClientIdArray[0];
-                return typeof firstClientId === 'string' || typeof firstClientId === 'undefined';
-            }
+            return isStringArray(firstClientIdArray);
         }
     }
     return false;
@@ -50,10 +47,7 @@ function isUserClients(obj) {
     var _a;
     if (typeof obj === 'object') {
         const firstUserClientArray = (_a = Object.values(obj)) === null || _a === void 0 ? void 0 : _a[0];
-        if (Array.isArray(firstUserClientArray)) {
-            const firstClientId = firstUserClientArray[0];
-            return typeof firstClientId === 'string';
-        }
+        return isStringArray(firstUserClientArray);
     }
     return false;
 }

package/src/main/util/TypePredicateUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"TypePredicateUtil.js","sourceRoot":"","sources":["TypePredicateUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;AAKH,SAAgB,aAAa,CAAC,GAAQ;IACpC,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC;AAC1D,CAAC;AAFD,sCAEC;AAED,SAAgB,aAAa,CAAC,GAAQ;IACpC,OAAO,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,CAAC;AACtE,CAAC;AAFD,sCAEC;AAED,SAAgB,kBAAkB,CAAC,GAAQ;IACzC,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC;AAFD,gDAEC;AAED,SAAgB,sBAAsB,CAAC,GAAQ;;IAC7C,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC3B,MAAM,qBAAqB,GAAG,MAAA,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,0CAAG,CAAC,CAAC,CAAC;QACtD,IAAI,OAAO,qBAAqB,KAAK,QAAQ,EAAE;YAC7C,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC,qBAA+B,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7E,IAAI,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE;gBACrC,MAAM,aAAa,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;gBAC5C,OAAO,OAAO,aAAa,KAAK,QAAQ,IAAI,OAAO,aAAa,KAAK,WAAW,CAAC;aAClF;SACF;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAZD,wDAYC;AAED,SAAgB,aAAa,CAAC,GAAQ;;IACpC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC3B,MAAM,oBAAoB,GAAG,MAAA,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,0CAAG,CAAC,CAAC,CAAC;QACrD,IAAI,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE;YACvC,MAAM,aAAa,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC;YAC9C,OAAO,OAAO,aAAa,KAAK,QAAQ,CAAC;SAC1C;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AATD,sCASC"}
+{"version":3,"file":"TypePredicateUtil.js","sourceRoot":"","sources":["TypePredicateUtil.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;AAKH,SAAgB,aAAa,CAAC,GAAQ;IACpC,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC;AAChF,CAAC;AAFD,sCAEC;AAED,SAAgB,aAAa,CAAC,GAAQ;IACpC,OAAO,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,CAAC;AACtE,CAAC;AAFD,sCAEC;AAED,SAAgB,kBAAkB,CAAC,GAAQ;IACzC,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC;AAFD,gDAEC;AAED,SAAgB,sBAAsB,CAAC,GAAQ;;IAC7C,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC3B,MAAM,qBAAqB,GAAG,MAAA,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,0CAAG,CAAC,CAAC,CAAC;QACtD,IAAI,OAAO,qBAAqB,KAAK,QAAQ,EAAE;YAC7C,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC,qBAA+B,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7E,OAAO,aAAa,CAAC,kBAAkB,CAAC,CAAC;SAC1C;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AATD,wDASC;AAED,SAAgB,aAAa,CAAC,GAAQ;;IACpC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC3B,MAAM,oBAAoB,GAAG,MAAA,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,0CAAG,CAAC,CAAC,CAAC;QACrD,OAAO,aAAa,CAAC,oBAAoB,CAAC,CAAC;KAC5C;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAND,sCAMC"}

package/src/main/util/TypePredicateUtil.ts

@@ -21,7 +21,7 @@ import type {QualifiedUserClients, UserClients} from '@wireapp/api-client/src/co
 import type {QualifiedId} from '@wireapp/api-client/src/user/';
 
 export function isStringArray(obj: any): obj is string[] {
-  return Array.isArray(obj) && typeof obj[0] === 'string';
+  return Array.isArray(obj) && (obj.length === 0 || typeof obj[0] === 'string');
 }
 
 export function isQualifiedId(obj: any): obj is QualifiedId {
@@ -37,10 +37,7 @@ export function isQualifiedUserClients(obj: any): obj is QualifiedUserClients {
     const firstUserClientObject = Object.values(obj)?.[0];
     if (typeof firstUserClientObject === 'object') {
       const firstClientIdArray = Object.values(firstUserClientObject as object)[0];
-      if (Array.isArray(firstClientIdArray)) {
-        const firstClientId = firstClientIdArray[0];
-        return typeof firstClientId === 'string' || typeof firstClientId === 'undefined';
-      }
+      return isStringArray(firstClientIdArray);
     }
   }
   return false;
@@ -49,10 +46,7 @@ export function isQualifiedUserClients(obj: any): obj is QualifiedUserClients {
 export function isUserClients(obj: any): obj is UserClients {
   if (typeof obj === 'object') {
     const firstUserClientArray = Object.values(obj)?.[0];
-    if (Array.isArray(firstUserClientArray)) {
-      const firstClientId = firstUserClientArray[0];
-      return typeof firstClientId === 'string';
-    }
+    return isStringArray(firstUserClientArray);
   }
   return false;
 }