@wireapp/core 20.4.1 → 20.6.0

package/CHANGELOG.md

@@ -3,6 +3,47 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [20.6.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@20.5.2...@wireapp/core@20.6.0) (2022-01-10)
+
+
+### Features
+
+* **core:** Add asset domain when sending asset message ([#4208](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4208)) ([51f7518](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/51f751834cf6480a47c9a5bf255b4b38d7228f77))
+
+
+
+
+
+## [20.5.2](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@20.5.1...@wireapp/core@20.5.2) (2022-01-10)
+
+**Note:** Version bump only for package @wireapp/core
+
+
+
+
+
+## [20.5.1](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@20.5.0...@wireapp/core@20.5.1) (2022-01-10)
+
+
+### Bug Fixes
+
+* **core:** Return domain when uploading a v4 asset ([#4207](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4207)) ([70a7bbe](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/70a7bbe5ac4ab17cd6f3672a770c37a806f616ff))
+
+
+
+
+
+# [20.5.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@20.4.1...@wireapp/core@20.5.0) (2022-01-10)
+
+
+### Features
+
+* **core:** Add method to download v4 assets ([#4206](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4206)) ([41ab95a](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/41ab95ab1d70e2f5bee4e0b4f7d81f058a381792))
+
+
+
+
+
 ## [20.4.1](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@20.4.0...@wireapp/core@20.4.1) (2022-01-06)
 
 **Note:** Version bump only for package @wireapp/core

package/package.json

@@ -5,7 +5,7 @@
   "dependencies": {
     "@types/long": "4.0.1",
     "@types/node": "~14",
-    "@wireapp/api-client": "16.3.0",
+    "@wireapp/api-client": "16.5.0",
     "@wireapp/cryptobox": "12.7.1",
     "bazinga64": "5.10.0",
     "hash.js": "1.1.7",
@@ -69,6 +69,6 @@
     "test:project": "yarn dist && yarn test",
     "test:node": "nyc jasmine --config=jasmine.json"
   },
-  "version": "20.4.1",
-  "gitHead": "5f916a0ffeea53d3f3e9b99dcb0ef589b2f71b02"
+  "version": "20.6.0",
+  "gitHead": "a3ceb0c59844db867e2dbb5ca3949db809da024c"
 }

package/src/main/conversation/AssetService.d.ts

@@ -3,9 +3,44 @@ import type { APIClient } from '@wireapp/api-client';
 import type { AssetOptions } from '@wireapp/api-client/src/asset';
 import type { ProgressCallback, RequestCancelable } from '@wireapp/api-client/src/http';
 import type { EncryptedAssetUploaded } from '../cryptography/';
+export interface AssetDataV4 {
+    assetKey: string;
+    assetToken: string;
+    assetDomain: string;
+    forceCaching: boolean;
+    version: 4;
+}
+export interface AssetDataV3 {
+    assetKey: string;
+    assetToken: string;
+    forceCaching: boolean;
+    version: 3;
+}
+export interface AssetDataV2 {
+    assetId: string;
+    conversationId: string;
+    forceCaching: boolean;
+    version: 2;
+}
+export interface AssetDataV1 {
+    assetId: string;
+    conversationId: string;
+    forceCaching: boolean;
+    version: 1;
+}
+export declare type AssetUrlData = AssetDataV1 | AssetDataV2 | AssetDataV3 | AssetDataV4;
 export declare class AssetService {
     private readonly apiClient;
     constructor(apiClient: APIClient);
+    /**
+     * Will download an asset on the server.
+     * Will route the request to the right endpoint depending on the asset version
+     *
+     * @param assetData The versioned asset data
+     * @param progressCallback?
+     * @return Resolves when the asset has been uploaded
+     */
+    downloadAsset(assetData: AssetUrlData, progressCallback?: ProgressCallback): RequestCancelable<import("@wireapp/api-client/src/asset").AssetResponse>;
     /**
      * Uploads a raw asset to the backend without encrypting it
      *

package/src/main/conversation/AssetService.js

@@ -24,6 +24,27 @@ class AssetService {
     constructor(apiClient) {
         this.apiClient = apiClient;
     }
+    /**
+     * Will download an asset on the server.
+     * Will route the request to the right endpoint depending on the asset version
+     *
+     * @param assetData The versioned asset data
+     * @param progressCallback?
+     * @return Resolves when the asset has been uploaded
+     */
+    downloadAsset(assetData, progressCallback) {
+        const { forceCaching } = assetData;
+        switch (assetData.version) {
+            case 1:
+                return this.apiClient.asset.api.getAssetV1(assetData.assetId, assetData.conversationId, forceCaching, progressCallback);
+            case 2:
+                return this.apiClient.asset.api.getAssetV2(assetData.assetId, assetData.conversationId, forceCaching, progressCallback);
+            case 3:
+                return this.apiClient.asset.api.getAssetV3(assetData.assetKey, assetData.assetToken, forceCaching, progressCallback);
+            case 4:
+                return this.apiClient.asset.api.getAssetV4(assetData.assetKey, assetData.assetToken, assetData.assetDomain, forceCaching, progressCallback);
+        }
+    }
     /**
      * Uploads a raw asset to the backend without encrypting it
      *
@@ -51,9 +72,10 @@ class AssetService {
         });
         const request = this.uploadRawAsset(cipherText, options, progressCallback);
         return Object.assign(Object.assign({}, request), { response: request.response.then(response => {
-                const { key, token } = response;
+                const { key, token, domain } = response;
                 return {
                     cipherText,
+                    domain,
                     key,
                     keyBytes,
                     sha256,

package/src/main/conversation/ConversationService.js

@@ -273,6 +273,7 @@ class ConversationService {
             assetToken: asset.token,
             otrKey: asset.keyBytes,
             sha256: asset.sha256,
+            assetDomain: asset.domain,
         });
         const assetMessage = protocol_messaging_1.Asset.create({
             expectsReadConfirmation,
@@ -628,7 +629,7 @@ class ConversationService {
         return this.apiClient.conversation.api.getConversationsByIds(conversationIds);
     }
     async getAsset({ assetId, assetToken, otrKey, sha256 }) {
-        const request = await this.apiClient.asset.api.getAssetV3(assetId, assetToken);
+        const request = this.apiClient.asset.api.getAssetV3(assetId, assetToken);
         const encryptedBuffer = (await request.response).buffer;
         return (0, AssetCryptography_1.decryptAsset)({
             cipherText: Buffer.from(encryptedBuffer),

package/src/main/cryptography/AssetCryptography/EncryptedAsset.d.ts

@@ -7,5 +7,6 @@ export interface EncryptedAsset {
 }
 export interface EncryptedAssetUploaded extends EncryptedAsset {
     key: string;
+    domain?: string;
     token: string;
 }