@protontech/drive-sdk 0.9.9 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/crypto/driveCrypto.d.ts +19 -16
- package/dist/crypto/driveCrypto.js +23 -1
- package/dist/crypto/driveCrypto.js.map +1 -1
- package/dist/crypto/driveCrypto.test.js +2 -1
- package/dist/crypto/driveCrypto.test.js.map +1 -1
- package/dist/crypto/hmac.d.ts +3 -3
- package/dist/crypto/hmac.js.map +1 -1
- package/dist/crypto/interface.d.ts +45 -25
- package/dist/crypto/interface.js.map +1 -1
- package/dist/crypto/openPGPCrypto.d.ts +37 -37
- package/dist/crypto/openPGPCrypto.js.map +1 -1
- package/dist/crypto/utils.d.ts +1 -1
- package/dist/diagnostic/telemetry.js +3 -0
- package/dist/diagnostic/telemetry.js.map +1 -1
- package/dist/interface/index.d.ts +4 -3
- package/dist/interface/index.js +3 -1
- package/dist/interface/index.js.map +1 -1
- package/dist/interface/nodes.d.ts +8 -0
- package/dist/interface/photos.d.ts +31 -2
- package/dist/interface/photos.js +14 -0
- package/dist/interface/photos.js.map +1 -1
- package/dist/interface/sharing.d.ts +2 -0
- package/dist/interface/telemetry.d.ts +13 -1
- package/dist/interface/telemetry.js.map +1 -1
- package/dist/interface/thumbnail.d.ts +2 -2
- package/dist/internal/apiService/apiService.d.ts +1 -1
- package/dist/internal/apiService/apiService.js +27 -14
- package/dist/internal/apiService/apiService.js.map +1 -1
- package/dist/internal/apiService/apiService.test.js +33 -5
- package/dist/internal/apiService/apiService.test.js.map +1 -1
- package/dist/internal/apiService/driveTypes.d.ts +2942 -3187
- package/dist/internal/apiService/errors.test.js +17 -7
- package/dist/internal/apiService/errors.test.js.map +1 -1
- package/dist/internal/devices/manager.d.ts +1 -0
- package/dist/internal/devices/manager.js +11 -0
- package/dist/internal/devices/manager.js.map +1 -1
- package/dist/internal/download/apiService.d.ts +1 -1
- package/dist/internal/download/cryptoService.d.ts +4 -4
- package/dist/internal/download/cryptoService.js.map +1 -1
- package/dist/internal/download/fileDownloader.js.map +1 -1
- package/dist/internal/download/fileDownloader.test.js.map +1 -1
- package/dist/internal/download/thumbnailDownloader.js.map +1 -1
- package/dist/internal/nodes/apiService.js.map +1 -1
- package/dist/internal/nodes/cryptoService.d.ts +4 -4
- package/dist/internal/nodes/cryptoService.js +5 -3
- package/dist/internal/nodes/cryptoService.js.map +1 -1
- package/dist/internal/nodes/cryptoService.test.js.map +1 -1
- package/dist/internal/nodes/interface.d.ts +1 -1
- package/dist/internal/nodes/nodesAccess.js +1 -1
- package/dist/internal/nodes/nodesAccess.js.map +1 -1
- package/dist/internal/nodes/nodesManagement.js +0 -1
- package/dist/internal/nodes/nodesManagement.js.map +1 -1
- package/dist/internal/photos/addToAlbum.d.ts +42 -0
- package/dist/internal/photos/addToAlbum.js +178 -0
- package/dist/internal/photos/addToAlbum.js.map +1 -0
- package/dist/internal/photos/addToAlbum.test.js +409 -0
- package/dist/internal/photos/addToAlbum.test.js.map +1 -0
- package/dist/internal/photos/albumsCrypto.d.ts +20 -3
- package/dist/internal/photos/albumsCrypto.js +27 -0
- package/dist/internal/photos/albumsCrypto.js.map +1 -1
- package/dist/internal/photos/{albums.d.ts → albumsManager.d.ts} +6 -4
- package/dist/internal/photos/{albums.js → albumsManager.js} +17 -5
- package/dist/internal/photos/albumsManager.js.map +1 -0
- package/dist/internal/photos/albumsManager.test.d.ts +1 -0
- package/dist/internal/photos/{albums.test.js → albumsManager.test.js} +4 -3
- package/dist/internal/photos/albumsManager.test.js.map +1 -0
- package/dist/internal/photos/apiService.d.ts +22 -2
- package/dist/internal/photos/apiService.js +136 -5
- package/dist/internal/photos/apiService.js.map +1 -1
- package/dist/internal/photos/apiService.test.d.ts +1 -0
- package/dist/internal/photos/apiService.test.js +199 -0
- package/dist/internal/photos/apiService.test.js.map +1 -0
- package/dist/internal/photos/errors.d.ts +4 -0
- package/dist/internal/photos/errors.js +17 -0
- package/dist/internal/photos/errors.js.map +1 -0
- package/dist/internal/photos/index.d.ts +5 -3
- package/dist/internal/photos/index.js +5 -2
- package/dist/internal/photos/index.js.map +1 -1
- package/dist/internal/photos/interface.d.ts +6 -15
- package/dist/internal/photos/interface.js +0 -14
- package/dist/internal/photos/interface.js.map +1 -1
- package/dist/internal/photos/nodes.js +33 -3
- package/dist/internal/photos/nodes.js.map +1 -1
- package/dist/internal/photos/nodes.test.js +25 -5
- package/dist/internal/photos/nodes.test.js.map +1 -1
- package/dist/internal/photos/photosManager.d.ts +22 -0
- package/dist/internal/photos/photosManager.js +101 -0
- package/dist/internal/photos/photosManager.js.map +1 -0
- package/dist/internal/photos/photosManager.test.d.ts +1 -0
- package/dist/internal/photos/photosManager.test.js +222 -0
- package/dist/internal/photos/photosManager.test.js.map +1 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.d.ts +57 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.js +113 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.js.map +1 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.test.d.ts +1 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.test.js +289 -0
- package/dist/internal/photos/photosTransferPayloadBuilder.test.js.map +1 -0
- package/dist/internal/photos/upload.d.ts +2 -2
- package/dist/internal/photos/upload.js +1 -1
- package/dist/internal/photos/upload.js.map +1 -1
- package/dist/internal/shares/apiService.js +1 -0
- package/dist/internal/shares/apiService.js.map +1 -1
- package/dist/internal/shares/interface.d.ts +1 -0
- package/dist/internal/sharing/apiService.d.ts +8 -1
- package/dist/internal/sharing/apiService.js +23 -1
- package/dist/internal/sharing/apiService.js.map +1 -1
- package/dist/internal/sharing/cryptoService.js +8 -4
- package/dist/internal/sharing/cryptoService.js.map +1 -1
- package/dist/internal/sharing/sharingManagement.d.ts +1 -0
- package/dist/internal/sharing/sharingManagement.js +15 -2
- package/dist/internal/sharing/sharingManagement.js.map +1 -1
- package/dist/internal/sharing/sharingManagement.test.js +30 -5
- package/dist/internal/sharing/sharingManagement.test.js.map +1 -1
- package/dist/internal/sharingPublic/nodes.d.ts +2 -2
- package/dist/internal/sharingPublic/nodes.js.map +1 -1
- package/dist/internal/upload/apiService.d.ts +3 -7
- package/dist/internal/upload/apiService.js +0 -4
- package/dist/internal/upload/apiService.js.map +1 -1
- package/dist/internal/upload/blockVerifier.d.ts +2 -2
- package/dist/internal/upload/blockVerifier.js.map +1 -1
- package/dist/internal/upload/chunkStreamReader.d.ts +2 -2
- package/dist/internal/upload/chunkStreamReader.js.map +1 -1
- package/dist/internal/upload/chunkStreamReader.test.js.map +1 -1
- package/dist/internal/upload/cryptoService.d.ts +7 -7
- package/dist/internal/upload/cryptoService.js +4 -4
- package/dist/internal/upload/cryptoService.js.map +1 -1
- package/dist/internal/upload/interface.d.ts +6 -6
- package/dist/internal/upload/manager.d.ts +1 -1
- package/dist/internal/upload/manager.js.map +1 -1
- package/dist/internal/upload/streamUploader.d.ts +1 -1
- package/dist/internal/upload/streamUploader.js +12 -13
- package/dist/internal/upload/streamUploader.js.map +1 -1
- package/dist/internal/upload/streamUploader.test.js +28 -4
- package/dist/internal/upload/streamUploader.test.js.map +1 -1
- package/dist/internal/utils.d.ts +1 -1
- package/dist/protonDriveClient.d.ts +8 -0
- package/dist/protonDriveClient.js +12 -1
- package/dist/protonDriveClient.js.map +1 -1
- package/dist/protonDrivePhotosClient.d.ts +35 -3
- package/dist/protonDrivePhotosClient.js +42 -2
- package/dist/protonDrivePhotosClient.js.map +1 -1
- package/dist/protonDrivePublicLinkClient.js +1 -1
- package/dist/protonDrivePublicLinkClient.js.map +1 -1
- package/dist/transformers.js +2 -0
- package/dist/transformers.js.map +1 -1
- package/package.json +4 -4
- package/src/crypto/driveCrypto.test.ts +2 -1
- package/src/crypto/driveCrypto.ts +50 -16
- package/src/crypto/hmac.ts +4 -4
- package/src/crypto/interface.ts +58 -27
- package/src/crypto/openPGPCrypto.ts +26 -26
- package/src/diagnostic/telemetry.ts +3 -0
- package/src/interface/index.ts +11 -2
- package/src/interface/nodes.ts +1 -0
- package/src/interface/photos.ts +33 -2
- package/src/interface/sharing.ts +2 -0
- package/src/interface/telemetry.ts +15 -1
- package/src/interface/thumbnail.ts +2 -2
- package/src/internal/apiService/apiService.test.ts +38 -6
- package/src/internal/apiService/apiService.ts +39 -14
- package/src/internal/apiService/driveTypes.ts +2942 -3187
- package/src/internal/devices/manager.ts +14 -0
- package/src/internal/download/apiService.ts +1 -1
- package/src/internal/download/cryptoService.ts +4 -4
- package/src/internal/download/fileDownloader.test.ts +4 -4
- package/src/internal/download/fileDownloader.ts +6 -6
- package/src/internal/download/thumbnailDownloader.ts +4 -4
- package/src/internal/nodes/apiService.ts +2 -2
- package/src/internal/nodes/cryptoService.test.ts +2 -2
- package/src/internal/nodes/cryptoService.ts +11 -8
- package/src/internal/nodes/interface.ts +1 -1
- package/src/internal/nodes/nodesAccess.ts +1 -1
- package/src/internal/nodes/nodesManagement.ts +0 -1
- package/src/internal/photos/addToAlbum.test.ts +515 -0
- package/src/internal/photos/addToAlbum.ts +234 -0
- package/src/internal/photos/albumsCrypto.ts +54 -3
- package/src/internal/photos/{albums.test.ts → albumsManager.test.ts} +22 -25
- package/src/internal/photos/{albums.ts → albumsManager.ts} +32 -3
- package/src/internal/photos/apiService.test.ts +233 -0
- package/src/internal/photos/apiService.ts +228 -26
- package/src/internal/photos/errors.ts +11 -0
- package/src/internal/photos/index.ts +6 -3
- package/src/internal/photos/interface.ts +8 -18
- package/src/internal/photos/nodes.test.ts +27 -6
- package/src/internal/photos/nodes.ts +35 -3
- package/src/internal/photos/photosManager.test.ts +266 -0
- package/src/internal/photos/photosManager.ts +144 -0
- package/src/internal/photos/photosTransferPayloadBuilder.test.ts +380 -0
- package/src/internal/photos/photosTransferPayloadBuilder.ts +203 -0
- package/src/internal/photos/upload.ts +8 -3
- package/src/internal/shares/apiService.ts +1 -0
- package/src/internal/shares/interface.ts +1 -0
- package/src/internal/sharing/apiService.ts +49 -5
- package/src/internal/sharing/cryptoService.ts +10 -4
- package/src/internal/sharing/sharingManagement.test.ts +33 -5
- package/src/internal/sharing/sharingManagement.ts +28 -6
- package/src/internal/sharingPublic/nodes.ts +1 -1
- package/src/internal/upload/apiService.ts +10 -12
- package/src/internal/upload/blockVerifier.ts +3 -3
- package/src/internal/upload/chunkStreamReader.test.ts +7 -7
- package/src/internal/upload/chunkStreamReader.ts +3 -3
- package/src/internal/upload/cryptoService.ts +11 -12
- package/src/internal/upload/interface.ts +6 -6
- package/src/internal/upload/manager.ts +2 -2
- package/src/internal/upload/streamUploader.test.ts +33 -4
- package/src/internal/upload/streamUploader.ts +13 -13
- package/src/protonDriveClient.ts +16 -4
- package/src/protonDrivePhotosClient.ts +73 -17
- package/src/protonDrivePublicLinkClient.ts +1 -1
- package/src/transformers.ts +2 -0
- package/dist/internal/photos/albums.js.map +0 -1
- package/dist/internal/photos/albums.test.js.map +0 -1
- /package/dist/internal/photos/{albums.test.d.ts → addToAlbum.test.d.ts} +0 -0
|
@@ -0,0 +1,222 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const interface_1 = require("../../interface");
|
|
4
|
+
const logger_1 = require("../../tests/logger");
|
|
5
|
+
const photosManager_1 = require("./photosManager");
|
|
6
|
+
function createMockPhotoNode(uid, overrides = {}) {
|
|
7
|
+
return {
|
|
8
|
+
uid,
|
|
9
|
+
parentUid: 'volume1~parent',
|
|
10
|
+
hash: 'hash',
|
|
11
|
+
name: (0, interface_1.resultOk)('photo.jpg'),
|
|
12
|
+
photo: {
|
|
13
|
+
captureTime: new Date(),
|
|
14
|
+
mainPhotoNodeUid: undefined,
|
|
15
|
+
relatedPhotoNodeUids: [],
|
|
16
|
+
tags: [],
|
|
17
|
+
albums: [],
|
|
18
|
+
},
|
|
19
|
+
activeRevision: {
|
|
20
|
+
ok: true,
|
|
21
|
+
value: {
|
|
22
|
+
uid: 'rev1',
|
|
23
|
+
state: 'active',
|
|
24
|
+
creationTime: new Date(),
|
|
25
|
+
storageSize: 100,
|
|
26
|
+
signatureEmail: 'test@example.com',
|
|
27
|
+
claimedModificationTime: new Date(),
|
|
28
|
+
claimedSize: 100,
|
|
29
|
+
claimedDigests: { sha1: 'sha1hash' },
|
|
30
|
+
claimedBlockSizes: [100],
|
|
31
|
+
},
|
|
32
|
+
},
|
|
33
|
+
keyAuthor: { ok: true, value: 'test@example.com' },
|
|
34
|
+
...overrides,
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
async function collectUpdateResults(manager, photos, signal) {
|
|
38
|
+
const results = [];
|
|
39
|
+
for await (const result of manager.updatePhotos(photos, signal)) {
|
|
40
|
+
results.push(result);
|
|
41
|
+
}
|
|
42
|
+
return results;
|
|
43
|
+
}
|
|
44
|
+
describe('PhotosManager', () => {
|
|
45
|
+
let logger;
|
|
46
|
+
let apiService;
|
|
47
|
+
let cryptoService;
|
|
48
|
+
let nodesService;
|
|
49
|
+
let manager;
|
|
50
|
+
const volumeRootKeys = {
|
|
51
|
+
key: 'rootKey',
|
|
52
|
+
hashKey: new Uint8Array([1, 2, 3]),
|
|
53
|
+
};
|
|
54
|
+
const signingKeys = {
|
|
55
|
+
type: 'userAddress',
|
|
56
|
+
email: 'test@example.com',
|
|
57
|
+
addressId: 'addressId',
|
|
58
|
+
key: 'signingKey',
|
|
59
|
+
};
|
|
60
|
+
beforeEach(() => {
|
|
61
|
+
logger = (0, logger_1.getMockLogger)();
|
|
62
|
+
apiService = {
|
|
63
|
+
addPhotoTags: jest.fn().mockResolvedValue(undefined),
|
|
64
|
+
removePhotoTags: jest.fn().mockResolvedValue(undefined),
|
|
65
|
+
setPhotoFavorite: jest.fn().mockResolvedValue(undefined),
|
|
66
|
+
};
|
|
67
|
+
cryptoService = {
|
|
68
|
+
encryptPhotoForAlbum: jest.fn().mockResolvedValue({
|
|
69
|
+
contentHash: 'contentHash',
|
|
70
|
+
hash: 'nameHash',
|
|
71
|
+
encryptedName: 'encryptedName',
|
|
72
|
+
nameSignatureEmail: 'test@example.com',
|
|
73
|
+
armoredNodePassphrase: 'passphrase',
|
|
74
|
+
armoredNodePassphraseSignature: 'signature',
|
|
75
|
+
signatureEmail: 'test@example.com',
|
|
76
|
+
}),
|
|
77
|
+
};
|
|
78
|
+
nodesService = {
|
|
79
|
+
getVolumeRootFolder: jest.fn().mockResolvedValue({ uid: 'volume1~root' }),
|
|
80
|
+
getNodeKeys: jest.fn().mockResolvedValue(volumeRootKeys),
|
|
81
|
+
getNodeSigningKeys: jest.fn().mockResolvedValue(signingKeys),
|
|
82
|
+
iterateNodes: jest.fn().mockImplementation(async function* (uids) {
|
|
83
|
+
for (const uid of uids) {
|
|
84
|
+
yield createMockPhotoNode(uid);
|
|
85
|
+
}
|
|
86
|
+
}),
|
|
87
|
+
getNodePrivateAndSessionKeys: jest.fn().mockResolvedValue({
|
|
88
|
+
key: 'nodeKey',
|
|
89
|
+
nameSessionKey: 'sessionKey',
|
|
90
|
+
passphrase: 'passphrase',
|
|
91
|
+
passphraseSessionKey: 'passphraseSessionKey',
|
|
92
|
+
}),
|
|
93
|
+
notifyNodeChanged: jest.fn().mockResolvedValue(undefined),
|
|
94
|
+
};
|
|
95
|
+
manager = new photosManager_1.PhotosManager(logger, apiService, cryptoService, nodesService);
|
|
96
|
+
});
|
|
97
|
+
describe('updatePhotos', () => {
|
|
98
|
+
describe('add tags only', () => {
|
|
99
|
+
it('calls addPhotoTags and notifyNodeChanged for each photo', async () => {
|
|
100
|
+
const results = await collectUpdateResults(manager, [
|
|
101
|
+
{ nodeUid: 'volume1~photo1', tagsToAdd: [interface_1.PhotoTag.Screenshots], tagsToRemove: [] },
|
|
102
|
+
{ nodeUid: 'volume1~photo2', tagsToAdd: [interface_1.PhotoTag.LivePhotos], tagsToRemove: [] },
|
|
103
|
+
]);
|
|
104
|
+
expect(results).toEqual([
|
|
105
|
+
{ uid: 'volume1~photo1', ok: true },
|
|
106
|
+
{ uid: 'volume1~photo2', ok: true },
|
|
107
|
+
]);
|
|
108
|
+
expect(apiService.addPhotoTags).toHaveBeenCalledTimes(2);
|
|
109
|
+
expect(apiService.addPhotoTags).toHaveBeenCalledWith('volume1~photo1', [interface_1.PhotoTag.Screenshots]);
|
|
110
|
+
expect(apiService.addPhotoTags).toHaveBeenCalledWith('volume1~photo2', [interface_1.PhotoTag.LivePhotos]);
|
|
111
|
+
expect(nodesService.getVolumeRootFolder).not.toHaveBeenCalled();
|
|
112
|
+
expect(apiService.setPhotoFavorite).not.toHaveBeenCalled();
|
|
113
|
+
expect(nodesService.notifyNodeChanged).toHaveBeenCalledTimes(2);
|
|
114
|
+
expect(nodesService.notifyNodeChanged).toHaveBeenCalledWith('volume1~photo1');
|
|
115
|
+
expect(nodesService.notifyNodeChanged).toHaveBeenCalledWith('volume1~photo2');
|
|
116
|
+
});
|
|
117
|
+
it('filters Favorites from addTags and calls setPhotoFavorite with payload', async () => {
|
|
118
|
+
const results = await collectUpdateResults(manager, [
|
|
119
|
+
{ nodeUid: 'volume1~photo1', tagsToAdd: [interface_1.PhotoTag.Favorites], tagsToRemove: [] },
|
|
120
|
+
]);
|
|
121
|
+
expect(results).toEqual([{ uid: 'volume1~photo1', ok: true }]);
|
|
122
|
+
expect(nodesService.getVolumeRootFolder).toHaveBeenCalled();
|
|
123
|
+
expect(nodesService.getNodeKeys).toHaveBeenCalledWith('volume1~root');
|
|
124
|
+
expect(nodesService.getNodeSigningKeys).toHaveBeenCalledWith({ nodeUid: 'volume1~root' });
|
|
125
|
+
expect(apiService.setPhotoFavorite).toHaveBeenCalledTimes(1);
|
|
126
|
+
expect(apiService.setPhotoFavorite).toHaveBeenCalledWith('volume1~photo1', expect.objectContaining({
|
|
127
|
+
nodeUid: 'volume1~photo1',
|
|
128
|
+
contentHash: 'contentHash',
|
|
129
|
+
nameHash: 'nameHash',
|
|
130
|
+
relatedPhotos: [],
|
|
131
|
+
}));
|
|
132
|
+
expect(apiService.addPhotoTags).not.toHaveBeenCalled();
|
|
133
|
+
expect(nodesService.notifyNodeChanged).toHaveBeenCalledWith('volume1~photo1');
|
|
134
|
+
});
|
|
135
|
+
it('calls setPhotoFavorite and addPhotoTags when addTags includes Favorites and other tags', async () => {
|
|
136
|
+
const results = await collectUpdateResults(manager, [
|
|
137
|
+
{
|
|
138
|
+
nodeUid: 'volume1~photo1',
|
|
139
|
+
tagsToAdd: [interface_1.PhotoTag.Favorites, interface_1.PhotoTag.Screenshots],
|
|
140
|
+
tagsToRemove: [],
|
|
141
|
+
},
|
|
142
|
+
]);
|
|
143
|
+
expect(results).toEqual([{ uid: 'volume1~photo1', ok: true }]);
|
|
144
|
+
expect(apiService.setPhotoFavorite).toHaveBeenCalledWith('volume1~photo1', expect.any(Object));
|
|
145
|
+
expect(apiService.addPhotoTags).toHaveBeenCalledWith('volume1~photo1', [interface_1.PhotoTag.Screenshots]);
|
|
146
|
+
});
|
|
147
|
+
it('calls setPhotoFavorite when payload builder returns PhotoAlreadyInTargetError (photo already in root)', async () => {
|
|
148
|
+
nodesService.iterateNodes.mockImplementation(async function* (uids) {
|
|
149
|
+
for (const uid of uids) {
|
|
150
|
+
yield createMockPhotoNode(uid, { parentUid: 'volume1~root' });
|
|
151
|
+
}
|
|
152
|
+
});
|
|
153
|
+
const results = await collectUpdateResults(manager, [
|
|
154
|
+
{ nodeUid: 'volume1~photo1', tagsToAdd: [interface_1.PhotoTag.Favorites], tagsToRemove: [] },
|
|
155
|
+
]);
|
|
156
|
+
expect(results).toEqual([{ uid: 'volume1~photo1', ok: true }]);
|
|
157
|
+
expect(apiService.setPhotoFavorite).toHaveBeenCalledWith('volume1~photo1', undefined);
|
|
158
|
+
expect(nodesService.notifyNodeChanged).toHaveBeenCalledWith('volume1~photo1');
|
|
159
|
+
});
|
|
160
|
+
});
|
|
161
|
+
describe('remove tags only', () => {
|
|
162
|
+
it('calls removePhotoTags and notifyNodeChanged for each photo', async () => {
|
|
163
|
+
const results = await collectUpdateResults(manager, [
|
|
164
|
+
{ nodeUid: 'volume1~photo1', tagsToAdd: [], tagsToRemove: [interface_1.PhotoTag.Screenshots] },
|
|
165
|
+
]);
|
|
166
|
+
expect(results).toEqual([{ uid: 'volume1~photo1', ok: true }]);
|
|
167
|
+
expect(apiService.removePhotoTags).toHaveBeenCalledWith('volume1~photo1', [interface_1.PhotoTag.Screenshots]);
|
|
168
|
+
expect(apiService.addPhotoTags).not.toHaveBeenCalled();
|
|
169
|
+
expect(nodesService.getVolumeRootFolder).not.toHaveBeenCalled();
|
|
170
|
+
expect(apiService.setPhotoFavorite).not.toHaveBeenCalled();
|
|
171
|
+
expect(nodesService.notifyNodeChanged).toHaveBeenCalledWith('volume1~photo1');
|
|
172
|
+
});
|
|
173
|
+
});
|
|
174
|
+
describe('add and remove tags together', () => {
|
|
175
|
+
it('calls addPhotoTags and removePhotoTags and notifyNodeChanged', async () => {
|
|
176
|
+
const results = await collectUpdateResults(manager, [
|
|
177
|
+
{
|
|
178
|
+
nodeUid: 'volume1~photo1',
|
|
179
|
+
tagsToAdd: [interface_1.PhotoTag.Panoramas],
|
|
180
|
+
tagsToRemove: [interface_1.PhotoTag.Screenshots],
|
|
181
|
+
},
|
|
182
|
+
]);
|
|
183
|
+
expect(results).toEqual([{ uid: 'volume1~photo1', ok: true }]);
|
|
184
|
+
expect(apiService.addPhotoTags).toHaveBeenCalledWith('volume1~photo1', [interface_1.PhotoTag.Panoramas]);
|
|
185
|
+
expect(apiService.removePhotoTags).toHaveBeenCalledWith('volume1~photo1', [interface_1.PhotoTag.Screenshots]);
|
|
186
|
+
expect(apiService.setPhotoFavorite).not.toHaveBeenCalled();
|
|
187
|
+
expect(nodesService.notifyNodeChanged).toHaveBeenCalledWith('volume1~photo1');
|
|
188
|
+
});
|
|
189
|
+
});
|
|
190
|
+
describe('API failures', () => {
|
|
191
|
+
it('yields error result and logs when setPhotoFavorite fails', async () => {
|
|
192
|
+
const apiError = new Error('Favorite API failed');
|
|
193
|
+
apiService.setPhotoFavorite.mockRejectedValue(apiError);
|
|
194
|
+
const results = await collectUpdateResults(manager, [
|
|
195
|
+
{ nodeUid: 'volume1~photo1', tagsToAdd: [interface_1.PhotoTag.Favorites], tagsToRemove: [] },
|
|
196
|
+
]);
|
|
197
|
+
expect(results).toEqual([{ uid: 'volume1~photo1', ok: false, error: apiError }]);
|
|
198
|
+
expect(logger.error).toHaveBeenCalledWith('Update photos failed for volume1~photo1', apiError);
|
|
199
|
+
expect(nodesService.notifyNodeChanged).not.toHaveBeenCalled();
|
|
200
|
+
});
|
|
201
|
+
it('yields error result when addPhotoTags fails', async () => {
|
|
202
|
+
const apiError = new Error('Add tags failed');
|
|
203
|
+
apiService.addPhotoTags.mockRejectedValue(apiError);
|
|
204
|
+
const results = await collectUpdateResults(manager, [
|
|
205
|
+
{ nodeUid: 'volume1~photo1', tagsToAdd: [interface_1.PhotoTag.Screenshots], tagsToRemove: [] },
|
|
206
|
+
]);
|
|
207
|
+
expect(results).toEqual([{ uid: 'volume1~photo1', ok: false, error: apiError }]);
|
|
208
|
+
expect(nodesService.notifyNodeChanged).not.toHaveBeenCalled();
|
|
209
|
+
});
|
|
210
|
+
it('yields error result when removePhotoTags fails', async () => {
|
|
211
|
+
const apiError = new Error('Remove tags failed');
|
|
212
|
+
apiService.removePhotoTags.mockRejectedValue(apiError);
|
|
213
|
+
const results = await collectUpdateResults(manager, [
|
|
214
|
+
{ nodeUid: 'volume1~photo1', tagsToAdd: [], tagsToRemove: [interface_1.PhotoTag.Videos] },
|
|
215
|
+
]);
|
|
216
|
+
expect(results).toEqual([{ uid: 'volume1~photo1', ok: false, error: apiError }]);
|
|
217
|
+
expect(nodesService.notifyNodeChanged).not.toHaveBeenCalled();
|
|
218
|
+
});
|
|
219
|
+
});
|
|
220
|
+
});
|
|
221
|
+
});
|
|
222
|
+
//# sourceMappingURL=photosManager.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"photosManager.test.js","sourceRoot":"","sources":["../../../src/internal/photos/photosManager.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { ValidationError } from '../../errors';
|
|
2
|
+
import { DecryptedNodeKeys, NodeSigningKeys } from '../nodes/interface';
|
|
3
|
+
import { AlbumsCryptoService } from './albumsCrypto';
|
|
4
|
+
import { PhotosNodesAccess } from './nodes';
|
|
5
|
+
export type TransferEncryptedPhotoPayload = TransferEncryptedRelatedPhotoPayload & {
|
|
6
|
+
relatedPhotos: TransferEncryptedRelatedPhotoPayload[];
|
|
7
|
+
};
|
|
8
|
+
type TransferEncryptedRelatedPhotoPayload = {
|
|
9
|
+
nodeUid: string;
|
|
10
|
+
contentHash: string;
|
|
11
|
+
nameHash: string;
|
|
12
|
+
encryptedName: string;
|
|
13
|
+
nameSignatureEmail: string;
|
|
14
|
+
nodePassphrase: string;
|
|
15
|
+
nodePassphraseSignature?: string;
|
|
16
|
+
signatureEmail?: string;
|
|
17
|
+
};
|
|
18
|
+
/**
|
|
19
|
+
* Item representing a photo to build a payload for.
|
|
20
|
+
* Used when preparing payloads for add-to-album (with optional retry related UIDs)
|
|
21
|
+
* or for favoriting.
|
|
22
|
+
*/
|
|
23
|
+
export type PhotoPayloadItem = {
|
|
24
|
+
photoNodeUid: string;
|
|
25
|
+
/**
|
|
26
|
+
* Additional related photo node UIDs to include (e.g. when retrying after
|
|
27
|
+
* MissingRelatedPhotosError).
|
|
28
|
+
*/
|
|
29
|
+
additionalRelatedPhotoNodeUids?: string[];
|
|
30
|
+
};
|
|
31
|
+
/**
|
|
32
|
+
* Builds encrypted photo payloads (TransferEncryptedPhotoPayload) for a set of
|
|
33
|
+
* photos, including their related photos. Reused by add-to-album and favorite
|
|
34
|
+
* flows, which only differ by the target keys used for encryption.
|
|
35
|
+
*/
|
|
36
|
+
export declare class PhotoTransferPayloadBuilder {
|
|
37
|
+
private readonly cryptoService;
|
|
38
|
+
private readonly nodesService;
|
|
39
|
+
constructor(cryptoService: AlbumsCryptoService, nodesService: PhotosNodesAccess);
|
|
40
|
+
/**
|
|
41
|
+
* Prepares encrypted payloads for the given photo items using the provided
|
|
42
|
+
* target keys and signing keys. Used for add-to-album (album keys) and
|
|
43
|
+
* favoriting (volume root keys).
|
|
44
|
+
*/
|
|
45
|
+
preparePhotoPayloads(items: PhotoPayloadItem[], targetNodeUid: string, targetKeys: DecryptedNodeKeys, signingKeys: NodeSigningKeys, signal?: AbortSignal): Promise<{
|
|
46
|
+
payloads: TransferEncryptedPhotoPayload[];
|
|
47
|
+
errors: Map<string, Error>;
|
|
48
|
+
}>;
|
|
49
|
+
private preparePhotoPayload;
|
|
50
|
+
private prepareRelatedPhotoPayloads;
|
|
51
|
+
private encryptPhotoForTarget;
|
|
52
|
+
}
|
|
53
|
+
export declare class PhotoAlreadyInTargetError extends ValidationError {
|
|
54
|
+
name: string;
|
|
55
|
+
constructor();
|
|
56
|
+
}
|
|
57
|
+
export {};
|
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.PhotoAlreadyInTargetError = exports.PhotoTransferPayloadBuilder = void 0;
|
|
4
|
+
const ttag_1 = require("ttag");
|
|
5
|
+
const errors_1 = require("../../errors");
|
|
6
|
+
/**
|
|
7
|
+
* Builds encrypted photo payloads (TransferEncryptedPhotoPayload) for a set of
|
|
8
|
+
* photos, including their related photos. Reused by add-to-album and favorite
|
|
9
|
+
* flows, which only differ by the target keys used for encryption.
|
|
10
|
+
*/
|
|
11
|
+
class PhotoTransferPayloadBuilder {
|
|
12
|
+
cryptoService;
|
|
13
|
+
nodesService;
|
|
14
|
+
constructor(cryptoService, nodesService) {
|
|
15
|
+
this.cryptoService = cryptoService;
|
|
16
|
+
this.nodesService = nodesService;
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Prepares encrypted payloads for the given photo items using the provided
|
|
20
|
+
* target keys and signing keys. Used for add-to-album (album keys) and
|
|
21
|
+
* favoriting (volume root keys).
|
|
22
|
+
*/
|
|
23
|
+
async preparePhotoPayloads(items, targetNodeUid, targetKeys, signingKeys, signal) {
|
|
24
|
+
const payloads = [];
|
|
25
|
+
const errors = new Map();
|
|
26
|
+
if (!targetKeys.hashKey) {
|
|
27
|
+
throw new Error('Target hash key is required to build photo payloads');
|
|
28
|
+
}
|
|
29
|
+
const additionalRelatedMap = new Map(items.map((item) => [item.photoNodeUid, item.additionalRelatedPhotoNodeUids || []]));
|
|
30
|
+
const nodeUids = items.map((item) => item.photoNodeUid);
|
|
31
|
+
for await (const photoNode of this.nodesService.iterateNodes(nodeUids, signal)) {
|
|
32
|
+
if ('missingUid' in photoNode) {
|
|
33
|
+
errors.set(photoNode.missingUid, new errors_1.ValidationError((0, ttag_1.c)('Error').t `Photo not found`));
|
|
34
|
+
continue;
|
|
35
|
+
}
|
|
36
|
+
if (photoNode.parentUid === targetNodeUid) {
|
|
37
|
+
errors.set(photoNode.uid, new PhotoAlreadyInTargetError());
|
|
38
|
+
continue;
|
|
39
|
+
}
|
|
40
|
+
try {
|
|
41
|
+
const additionalRelated = additionalRelatedMap.get(photoNode.uid) || [];
|
|
42
|
+
const payload = await this.preparePhotoPayload(photoNode, additionalRelated, targetKeys, signingKeys, signal);
|
|
43
|
+
payloads.push(payload);
|
|
44
|
+
}
|
|
45
|
+
catch (error) {
|
|
46
|
+
errors.set(photoNode.uid, error instanceof Error ? error : new Error((0, ttag_1.c)('Error').t `Unknown error`, { cause: error }));
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
return { payloads, errors };
|
|
50
|
+
}
|
|
51
|
+
async preparePhotoPayload(photoNode, additionalRelatedPhotoNodeUids, targetKeys, signingKeys, signal) {
|
|
52
|
+
const photoData = await this.encryptPhotoForTarget(photoNode, targetKeys, signingKeys);
|
|
53
|
+
const relatedNodeUids = [
|
|
54
|
+
...new Set([
|
|
55
|
+
...(photoNode.photo?.relatedPhotoNodeUids || []),
|
|
56
|
+
...additionalRelatedPhotoNodeUids,
|
|
57
|
+
]),
|
|
58
|
+
];
|
|
59
|
+
const relatedPhotos = relatedNodeUids.length > 0
|
|
60
|
+
? await this.prepareRelatedPhotoPayloads(relatedNodeUids, targetKeys, signingKeys, signal)
|
|
61
|
+
: [];
|
|
62
|
+
return {
|
|
63
|
+
...photoData,
|
|
64
|
+
relatedPhotos,
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
async prepareRelatedPhotoPayloads(nodeUids, targetKeys, signingKeys, signal) {
|
|
68
|
+
const payloads = [];
|
|
69
|
+
for await (const photoNode of this.nodesService.iterateNodes(nodeUids, signal)) {
|
|
70
|
+
if ('missingUid' in photoNode) {
|
|
71
|
+
continue;
|
|
72
|
+
}
|
|
73
|
+
const payload = await this.encryptPhotoForTarget(photoNode, targetKeys, signingKeys);
|
|
74
|
+
payloads.push(payload);
|
|
75
|
+
}
|
|
76
|
+
return payloads;
|
|
77
|
+
}
|
|
78
|
+
async encryptPhotoForTarget(photoNode, targetKeys, signingKeys) {
|
|
79
|
+
const nodeKeys = await this.nodesService.getNodePrivateAndSessionKeys(photoNode.uid);
|
|
80
|
+
const contentSha1 = photoNode.activeRevision?.ok
|
|
81
|
+
? photoNode.activeRevision.value.claimedDigests?.sha1
|
|
82
|
+
: undefined;
|
|
83
|
+
if (!contentSha1) {
|
|
84
|
+
throw new Error('Cannot build photo payload without a content hash');
|
|
85
|
+
}
|
|
86
|
+
const encryptedCrypto = await this.cryptoService.encryptPhotoForAlbum(photoNode.name, contentSha1, nodeKeys, { key: targetKeys.key, hashKey: targetKeys.hashKey }, signingKeys);
|
|
87
|
+
const anonymousKey = photoNode.keyAuthor.ok && photoNode.keyAuthor.value === null;
|
|
88
|
+
const keySignatureProperties = !anonymousKey
|
|
89
|
+
? {}
|
|
90
|
+
: {
|
|
91
|
+
signatureEmail: encryptedCrypto.signatureEmail,
|
|
92
|
+
nodePassphraseSignature: encryptedCrypto.armoredNodePassphraseSignature,
|
|
93
|
+
};
|
|
94
|
+
return {
|
|
95
|
+
nodeUid: photoNode.uid,
|
|
96
|
+
contentHash: encryptedCrypto.contentHash,
|
|
97
|
+
nameHash: encryptedCrypto.hash,
|
|
98
|
+
encryptedName: encryptedCrypto.encryptedName,
|
|
99
|
+
nameSignatureEmail: encryptedCrypto.nameSignatureEmail,
|
|
100
|
+
nodePassphrase: encryptedCrypto.armoredNodePassphrase,
|
|
101
|
+
...keySignatureProperties,
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
exports.PhotoTransferPayloadBuilder = PhotoTransferPayloadBuilder;
|
|
106
|
+
class PhotoAlreadyInTargetError extends errors_1.ValidationError {
|
|
107
|
+
name = 'PhotoAlreadyInTargetError';
|
|
108
|
+
constructor() {
|
|
109
|
+
super((0, ttag_1.c)('Error').t `Photo is already in the target album`);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
exports.PhotoAlreadyInTargetError = PhotoAlreadyInTargetError;
|
|
113
|
+
//# sourceMappingURL=photosTransferPayloadBuilder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"photosTransferPayloadBuilder.js","sourceRoot":"","sources":["../../../src/internal/photos/photosTransferPayloadBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|