@wireapp/core 34.0.2 → 34.1.1

package/package.json

@@ -3,14 +3,14 @@
     "./src/main/cryptography/AssetCryptography/crypto.node": "./src/main/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^21.0.1",
+    "@wireapp/api-client": "^21.0.3",
     "@wireapp/commons": "^4.4.10",
     "@wireapp/core-crypto": "0.5.2",
     "@wireapp/cryptobox": "12.8.0",
     "@wireapp/promise-queue": "^1.3.4",
     "@wireapp/protocol-messaging": "1.39.0",
-    "@wireapp/store-engine-dexie": "^1.7.10",
-    "axios": "^0.27.2",
+    "@wireapp/store-engine-dexie": "^1.7.11",
+    "axios": "^1.1.3",
     "bazinga64": "5.11.10",
     "hash.js": "1.1.7",
     "http-status-codes": "2.2.0",
@@ -64,6 +64,6 @@
     "test": "jest",
     "watch": "tsc ---watch"
   },
-  "version": "34.0.2",
-  "gitHead": "2dea54b30cb228378009ff494cbb4ef2c5ade1c4"
+  "version": "34.1.1",
+  "gitHead": "097af2ac03f7edafca8c09724286cd6722f0a452"
 }

package/src/main/Account.js

@@ -80,6 +80,7 @@ const encryptedStore_1 = require("./util/encryptedStore");
 const bazinga64_1 = require("bazinga64");
 const mls_1 = require("./mls");
 const messageSender_1 = require("./conversation/message/messageSender");
+const axios_1 = __importDefault(require("axios"));
 var TOPIC;
 (function (TOPIC) {
     TOPIC["ERROR"] = "Account.TOPIC.ERROR";
@@ -233,7 +234,7 @@ class Account extends events_1.EventEmitter {
                 error.constructor.name === 'CryptoboxError' ||
                 error instanceof store_engine_1.error.RecordNotFoundError ||
                 error.constructor.name === store_engine_1.error.RecordNotFoundError.name;
-            const notFoundOnBackend = ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === http_status_codes_1.StatusCodes.NOT_FOUND;
+            const notFoundOnBackend = axios_1.default.isAxiosError(error) ? ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === http_status_codes_1.StatusCodes.NOT_FOUND : false;
             if (notFoundInDatabase) {
                 this.logger.log(`Could not find valid client in database "${(_b = this.storeEngine) === null || _b === void 0 ? void 0 : _b.storeName}".`);
                 return this.registerClient(loginData, clientInfo, entropyData);

package/src/main/cryptography/CryptographyService.d.ts

@@ -1,5 +1,5 @@
 import { APIClient } from '@wireapp/api-client';
-import { PreKey as SerializedPreKey } from '@wireapp/api-client/src/auth/';
+import { PreKey } from '@wireapp/api-client/src/auth/';
 import { RegisteredClient } from '@wireapp/api-client/src/client/';
 import { OTRRecipients, QualifiedOTRRecipients, QualifiedUserClients, UserClients } from '@wireapp/api-client/src/conversation/';
 import { ConversationOtrMessageAddEvent } from '@wireapp/api-client/src/event';
@@ -49,7 +49,7 @@ export declare class CryptographyService {
         onNewSession?: (sessionId: SessionId) => void;
     }): void;
     static convertBase64RecipientsToArray(recipients: OTRRecipients<string>): OTRRecipients<Uint8Array>;
-    createCryptobox(entropyData?: Uint8Array): Promise<SerializedPreKey[]>;
+    createCryptobox(entropyData?: Uint8Array): Promise<PreKey[]>;
     decrypt(sessionId: string, encodedCiphertext: string): Promise<Uint8Array>;
     encryptQualified(plainText: Uint8Array, preKeyBundles: QualifiedUserPreKeyBundleMap | QualifiedUserClients): Promise<{
         missing: QualifiedUserClients;
@@ -61,6 +61,20 @@ export declare class CryptographyService {
     }>;
     private encryptPayloadForSession;
     initCryptobox(): Promise<void>;
+    /**
+     * Get the fingerprint of the local client.
+     */
+    getLocalFingerprint(): string;
+    /**
+     * Get the fingerprint of a remote client
+     * @param userId ID of user
+     * @param clientId ID of client
+     * @param prekey A prekey can be given to create a session if it doesn't already exist.
+     *   If not provided and the session doesn't exists it will fetch a new prekey from the backend
+     */
+    getRemoteFingerprint(userId: QualifiedId, clientId: string, prekey?: PreKey): Promise<string>;
+    private getOrCreateSession;
+    private getUserPrekey;
     deleteCryptographyStores(): Promise<boolean[]>;
     resetSession(sessionId: string): Promise<void>;
     decryptMessage(otrMessage: ConversationOtrMessageAddEvent): Promise<GenericMessage>;

package/src/main/cryptography/CryptographyService.js

@@ -170,6 +170,37 @@ class CryptographyService {
     async initCryptobox() {
         await this.cryptobox.load();
     }
+    /**
+     * Get the fingerprint of the local client.
+     */
+    getLocalFingerprint() {
+        return this.cryptobox.getIdentity().public_key.fingerprint();
+    }
+    /**
+     * Get the fingerprint of a remote client
+     * @param userId ID of user
+     * @param clientId ID of client
+     * @param prekey A prekey can be given to create a session if it doesn't already exist.
+     *   If not provided and the session doesn't exists it will fetch a new prekey from the backend
+     */
+    async getRemoteFingerprint(userId, clientId, prekey) {
+        const session = await this.getOrCreateSession(userId, clientId, prekey);
+        return session.fingerprint_remote();
+    }
+    async getOrCreateSession(userId, clientId, initialPrekey) {
+        const sessionId = this.constructSessionId(userId, clientId);
+        try {
+            return await this.cryptobox.session_load(sessionId);
+        }
+        catch (error) {
+            const prekey = initialPrekey !== null && initialPrekey !== void 0 ? initialPrekey : (await this.getUserPrekey(userId, clientId)).prekey;
+            const prekeyBuffer = bazinga64_1.Decoder.fromBase64(prekey.key).asBytes;
+            return this.cryptobox.session_from_prekey(sessionId, prekeyBuffer.buffer);
+        }
+    }
+    getUserPrekey(userId, clientId) {
+        return this.apiClient.api.user.getClientPreKey(userId, clientId);
+    }
     deleteCryptographyStores() {
         return this.database.deleteStores();
     }