@protontech/drive-sdk 0.0.12 → 0.1.0

package/src/internal/sharing/sharingManagement.test.ts

@@ -2,7 +2,7 @@ import { getMockLogger } from "../../tests/logger";
 import { Member, MemberRole, NonProtonInvitation, NonProtonInvitationState, ProtonDriveAccount, ProtonInvitation, PublicLink, resultOk } from "../../interface";
 import { SharingAPIService } from "./apiService";
 import { SharingCryptoService } from "./cryptoService";
-import { SharesService, NodesService, NodesEvents } from "./interface";
+import { SharesService, NodesService } from "./interface";
 import { SharingManagement } from "./sharingManagement";
 
 describe("SharingManagement", () => {
@@ -11,7 +11,6 @@ describe("SharingManagement", () => {
     let accountService: ProtonDriveAccount;
     let sharesService: SharesService;
     let nodesService: NodesService;
-    let nodesEvents: NodesEvents;
 
     let sharingManagement: SharingManagement;
 
@@ -82,12 +81,10 @@ describe("SharingManagement", () => {
             getNodeKeys: jest.fn().mockImplementation((nodeUid) => ({ key: "node-key" })),
             getNodePrivateAndSessionKeys: jest.fn().mockImplementation((nodeUid) => ({})),
             getRootNodeEmailKey: jest.fn().mockResolvedValue({ email: "volume-email", addressKey: "volume-key" }),
-        }
-        nodesEvents = {
-            nodeUpdated: jest.fn(),
+            notifyNodeChanged: jest.fn(),
         }
 
-        sharingManagement = new SharingManagement(getMockLogger(), apiService, cryptoService, accountService, sharesService, nodesService, nodesEvents);
+        sharingManagement = new SharingManagement(getMockLogger(), apiService, cryptoService, accountService, sharesService, nodesService);
     });
 
     describe("getSharingInfo", () => {
@@ -175,6 +172,7 @@ describe("SharingManagement", () => {
 
         it("should create share if no exists", async () => {
             nodesService.getNode = jest.fn().mockImplementation((nodeUid) => ({ nodeUid, parentUid: 'parentUid', name: { ok: true, value: "name" } }));
+            nodesService.notifyNodeChanged = jest.fn();
 
             const sharingInfo = await sharingManagement.shareNode(nodeUid, { users: ["email"] });
 
@@ -191,11 +189,7 @@ describe("SharingManagement", () => {
             });
             expect(apiService.updateInvitation).not.toHaveBeenCalled();
             expect(apiService.inviteProtonUser).toHaveBeenCalled();
-            expect(nodesEvents.nodeUpdated).toHaveBeenCalledWith({
-                uid: nodeUid,
-                shareId: "newShareId",
-                isShared: true,
-            });
+            expect(nodesService.notifyNodeChanged).toHaveBeenCalledWith(nodeUid);
         });
     })
 
@@ -264,7 +258,6 @@ describe("SharingManagement", () => {
                 });
                 expect(apiService.updateInvitation).not.toHaveBeenCalled();
                 expect(apiService.inviteProtonUser).toHaveBeenCalled();
-                expect(nodesEvents.nodeUpdated).not.toHaveBeenCalled();
             });
 
             it("should share node with proton email with specific role", async () => {
@@ -283,7 +276,6 @@ describe("SharingManagement", () => {
                 });
                 expect(apiService.updateInvitation).not.toHaveBeenCalled();
                 expect(apiService.inviteProtonUser).toHaveBeenCalled();
-                expect(nodesEvents.nodeUpdated).not.toHaveBeenCalled();
             });
 
             it("should update existing role", async () => {
@@ -300,7 +292,6 @@ describe("SharingManagement", () => {
                 });
                 expect(apiService.updateInvitation).toHaveBeenCalled();
                 expect(apiService.inviteProtonUser).not.toHaveBeenCalled();
-                expect(nodesEvents.nodeUpdated).not.toHaveBeenCalled();
             });
 
             it("should be no-op if no change", async () => {
@@ -314,7 +305,6 @@ describe("SharingManagement", () => {
                 });
                 expect(apiService.updateInvitation).not.toHaveBeenCalled();
                 expect(apiService.inviteProtonUser).not.toHaveBeenCalled();
-                expect(nodesEvents.nodeUpdated).not.toHaveBeenCalled();
             });
         });
 
@@ -340,7 +330,6 @@ describe("SharingManagement", () => {
                 });
                 expect(apiService.updateExternalInvitation).not.toHaveBeenCalled();
                 expect(apiService.inviteExternalUser).toHaveBeenCalled();
-                expect(nodesEvents.nodeUpdated).not.toHaveBeenCalled();
             });
 
             it("should share node with external email with specific role", async () => {
@@ -360,7 +349,6 @@ describe("SharingManagement", () => {
                 });
                 expect(apiService.updateExternalInvitation).not.toHaveBeenCalled();
                 expect(apiService.inviteExternalUser).toHaveBeenCalled();
-                expect(nodesEvents.nodeUpdated).not.toHaveBeenCalled();
             });
 
             it("should update existing role", async () => {
@@ -377,7 +365,6 @@ describe("SharingManagement", () => {
                 });
                 expect(apiService.updateExternalInvitation).toHaveBeenCalled();
                 expect(apiService.inviteExternalUser).not.toHaveBeenCalled();
-                expect(nodesEvents.nodeUpdated).not.toHaveBeenCalled();
             });
 
             it("should be no-op if no change", async () => {
@@ -391,7 +378,6 @@ describe("SharingManagement", () => {
                 });
                 expect(apiService.updateExternalInvitation).not.toHaveBeenCalled();
                 expect(apiService.inviteExternalUser).not.toHaveBeenCalled();
-                expect(nodesEvents.nodeUpdated).not.toHaveBeenCalled();
             });
         });
 
@@ -429,7 +415,6 @@ describe("SharingManagement", () => {
                 expect(apiService.inviteExternalUser).toHaveBeenCalledWith("shareId", expect.objectContaining({
                     inviteeEmail: "email2",
                 }), expect.anything());
-                expect(nodesEvents.nodeUpdated).not.toHaveBeenCalled();
             });
         });
 
@@ -449,7 +434,6 @@ describe("SharingManagement", () => {
                 expect(apiService.updateMember).toHaveBeenCalled();
                 expect(apiService.updateInvitation).not.toHaveBeenCalled();
                 expect(apiService.inviteProtonUser).not.toHaveBeenCalled();
-                expect(nodesEvents.nodeUpdated).not.toHaveBeenCalled();
             });
 
             it("should be no-op if no change via proton user", async () => {
@@ -464,7 +448,6 @@ describe("SharingManagement", () => {
                 expect(apiService.updateMember).not.toHaveBeenCalled();
                 expect(apiService.updateInvitation).not.toHaveBeenCalled();
                 expect(apiService.inviteProtonUser).not.toHaveBeenCalled();
-                expect(nodesEvents.nodeUpdated).not.toHaveBeenCalled();
             });
 
             it("should update member via non-proton user", async () => {
@@ -482,7 +465,6 @@ describe("SharingManagement", () => {
                 expect(apiService.updateMember).toHaveBeenCalled();
                 expect(apiService.updateInvitation).not.toHaveBeenCalled();
                 expect(apiService.inviteProtonUser).not.toHaveBeenCalled();
-                expect(nodesEvents.nodeUpdated).not.toHaveBeenCalled();
             });
 
             it("should be no-op if no change via non-proton user", async () => {
@@ -497,7 +479,6 @@ describe("SharingManagement", () => {
                 expect(apiService.updateMember).not.toHaveBeenCalled();
                 expect(apiService.updateInvitation).not.toHaveBeenCalled();
                 expect(apiService.inviteProtonUser).not.toHaveBeenCalled();
-                expect(nodesEvents.nodeUpdated).not.toHaveBeenCalled();
             });
         });
 
@@ -526,6 +507,7 @@ describe("SharingManagement", () => {
                         expirationTime: undefined,
                         customPassword: undefined,
                         creatorEmail: "volume-email",
+                        numberOfInitializedDownloads: 0,
                     },
                 });
                 expect(cryptoService.generatePublicLinkPassword).toHaveBeenCalled();
@@ -563,6 +545,7 @@ describe("SharingManagement", () => {
                         expirationTime: new Date('2025-01-02'),
                         customPassword: "customPassword",
                         creatorEmail: "volume-email",
+                        numberOfInitializedDownloads: 0,
                     },
                 });
                 expect(cryptoService.generatePublicLinkPassword).toHaveBeenCalled();
@@ -661,7 +644,7 @@ describe("SharingManagement", () => {
         });
     });
 
-    describe("unsahreNode", () => {
+    describe("unshareNode", () => {
         const nodeUid = "volumeId~nodeUid";
 
         let invitation: ProtonInvitation;
@@ -697,6 +680,7 @@ describe("SharingManagement", () => {
                 creationTime: new Date(),
                 role: MemberRole.Viewer,
                 url: "url",
+                numberOfInitializedDownloads: 0,
             }
 
             apiService.getShareInvitations = jest.fn().mockResolvedValue([
@@ -725,7 +709,6 @@ describe("SharingManagement", () => {
             expect(apiService.deleteExternalInvitation).not.toHaveBeenCalled();
             expect(apiService.removeMember).not.toHaveBeenCalled();
             expect(apiService.removePublicLink).not.toHaveBeenCalled();
-            expect(nodesEvents.nodeUpdated).not.toHaveBeenCalled();
         });
 
         it("should delete external invitation", async () => {
@@ -742,7 +725,6 @@ describe("SharingManagement", () => {
             expect(apiService.deleteExternalInvitation).toHaveBeenCalled();
             expect(apiService.removeMember).not.toHaveBeenCalled();
             expect(apiService.removePublicLink).not.toHaveBeenCalled();
-            expect(nodesEvents.nodeUpdated).not.toHaveBeenCalled();
         });
 
         it("should remove member", async () => {
@@ -759,7 +741,6 @@ describe("SharingManagement", () => {
             expect(apiService.deleteExternalInvitation).not.toHaveBeenCalled();
             expect(apiService.removeMember).toHaveBeenCalled();
             expect(apiService.removePublicLink).not.toHaveBeenCalled();
-            expect(nodesEvents.nodeUpdated).not.toHaveBeenCalled();
         });
 
         it("should be no-op if not shared with email", async () => {
@@ -776,7 +757,6 @@ describe("SharingManagement", () => {
             expect(apiService.deleteExternalInvitation).not.toHaveBeenCalled();
             expect(apiService.removeMember).not.toHaveBeenCalled();
             expect(apiService.removePublicLink).not.toHaveBeenCalled();
-            expect(nodesEvents.nodeUpdated).not.toHaveBeenCalled();
         });
 
         it("should remove public link", async () => {
@@ -793,7 +773,6 @@ describe("SharingManagement", () => {
             expect(apiService.deleteExternalInvitation).not.toHaveBeenCalled();
             expect(apiService.removeMember).not.toHaveBeenCalled();
             expect(apiService.removePublicLink).toHaveBeenCalled();
-            expect(nodesEvents.nodeUpdated).not.toHaveBeenCalled();
         });
 
         it("should remove share if all is removed", async () => {
@@ -805,11 +784,7 @@ describe("SharingManagement", () => {
             expect(apiService.deleteExternalInvitation).not.toHaveBeenCalled();
             expect(apiService.removeMember).not.toHaveBeenCalled();
             expect(apiService.removePublicLink).not.toHaveBeenCalled();
-            expect(nodesEvents.nodeUpdated).toHaveBeenCalledWith({
-                uid: nodeUid,
-                shareId: undefined,
-                isShared: false,
-            });
+            expect(nodesService.notifyNodeChanged).toHaveBeenCalled();
         });
 
         it("should remove share if everything is manually removed", async () => {
@@ -824,11 +799,6 @@ describe("SharingManagement", () => {
             expect(apiService.deleteExternalInvitation).toHaveBeenCalled();
             expect(apiService.removeMember).toHaveBeenCalled();
             expect(apiService.removePublicLink).toHaveBeenCalled();
-            expect(nodesEvents.nodeUpdated).toHaveBeenCalledWith({
-                uid: nodeUid,
-                shareId: undefined,
-                isShared: false,
-            });
         });
     });
 

package/src/internal/sharing/sharingManagement.ts

@@ -7,7 +7,7 @@ import { splitNodeUid } from "../uids";
 import { getErrorMessage } from '../errors';
 import { SharingAPIService } from "./apiService";
 import { PUBLIC_LINK_GENERATED_PASSWORD_LENGTH, SharingCryptoService } from "./cryptoService";
-import { SharesService, NodesService, NodesEvents, ShareResultWithCreatorEmail, PublicLinkWithCreatorEmail } from "./interface";
+import { SharesService, NodesService, ShareResultWithCreatorEmail, PublicLinkWithCreatorEmail } from "./interface";
 
 interface InternalShareResult extends ShareResultWithCreatorEmail {
     share: Share;
@@ -40,7 +40,6 @@ export class SharingManagement {
         private account: ProtonDriveAccount,
         private sharesService: SharesService,
         private nodesService: NodesService,
-        private nodesEvents: NodesEvents,
     ) {
         this.logger = logger;
         this.apiService = apiService;
@@ -48,7 +47,6 @@ export class SharingManagement {
         this.account = account;
         this.sharesService = sharesService;
         this.nodesService = nodesService;
-        this.nodesEvents = nodesEvents;
     }
 
     async getSharingInfo(nodeUid: string): Promise<ShareResultWithCreatorEmail | undefined> {
@@ -239,7 +237,7 @@ export class SharingManagement {
 
         if (!settings) {
             this.logger.info(`Unsharing node ${nodeUid}`);
-            await this.deleteShare(nodeUid, currentSharing.share.shareId);
+            await this.deleteShare(currentSharing.share.shareId, nodeUid);
             return;
         }
 
@@ -293,7 +291,7 @@ export class SharingManagement {
             // update local state immediately.
             this.logger.info(`Deleting share ${currentSharing.share.shareId} for node ${nodeUid}`);
             try {
-                await this.deleteShare(nodeUid, currentSharing.share.shareId);
+                await this.deleteShare(currentSharing.share.shareId, nodeUid);
             } catch (error: unknown) {
                 // If deleting the share fails, we don't want to throw an error
                 // as it might be a race condition that other client updated
@@ -359,9 +357,7 @@ export class SharingManagement {
                 base64NameKeyPacket: keys.base64NameKeyPacket,
             },
         );
-
-        await this.nodesEvents.nodeUpdated({ uid: nodeUid, shareId, isShared: true });
-
+        await this.nodesService.notifyNodeChanged(nodeUid);
         return {
             volumeId,
             shareId,
@@ -370,10 +366,9 @@ export class SharingManagement {
         }
     }
 
-    private async deleteShare(nodeUid: string, shareId: string): Promise<void> {
+    private async deleteShare(shareId: string, nodeUid: string): Promise<void> {
         await this.apiService.deleteShare(shareId);
-
-        await this.nodesEvents.nodeUpdated({ uid: nodeUid, shareId: undefined, isShared: false });
+        await this.nodesService.notifyNodeChanged(nodeUid);
     }
 
     private async inviteProtonUser(share: Share, inviteeEmail: string, role: MemberRole, emailOptions: EmailOptions): Promise<ProtonInvitation> {
@@ -486,6 +481,7 @@ export class SharingManagement {
             url: `${publicLink.publicUrl}#${generatedPassword}`,
             customPassword: options.customPassword,
             expirationTime: options.expiration,
+            numberOfInitializedDownloads: 0,
             creatorEmail,
         }
     }

package/src/internal/upload/apiService.ts

@@ -27,8 +27,9 @@ type PostDeleteNodesRequest = Extract<drivePaths['/drive/v2/volumes/{volumeID}/d
 type PostDeleteNodesResponse = drivePaths['/drive/v2/volumes/{volumeID}/delete_multiple']['post']['responses']['200']['content']['application/json'];
 
 export class UploadAPIService {
-    constructor(private apiService: DriveAPIService) {
+    constructor(private apiService: DriveAPIService, private clientUid: string | undefined) {
         this.apiService = apiService;
+        this.clientUid = clientUid;
     }
 
     async checkAvailableHashes(parentNodeUid: string, hashes: string[]): Promise<{
@@ -46,7 +47,7 @@ export class UploadAPIService {
             PostCheckAvailableHashesResponse
         >(`drive/v2/volumes/${volumeId}/links/${parentNodeId}/checkAvailableHashes`, {
             Hashes: hashes,
-            ClientUID: null,
+            ClientUID: this.clientUid ? [this.clientUid] : null,
         });
 
         return {
@@ -64,7 +65,6 @@ export class UploadAPIService {
         armoredEncryptedName: string,
         hash: string,
         mediaType: string,
-        clientUID?: string,
         intendedUploadSize?: number,
         armoredNodeKey: string,
         armoredNodePassphrase: string,
@@ -85,7 +85,7 @@ export class UploadAPIService {
             Name: node.armoredEncryptedName,
             Hash: node.hash,
             MIMEType: node.mediaType,
-            ClientUID: node.clientUID || null,
+            ClientUID: this.clientUid || null,
             IntendedUploadSize: node.intendedUploadSize || null,
             NodeKey: node.armoredNodeKey,
             NodePassphrase: node.armoredNodePassphrase,
@@ -103,7 +103,6 @@ export class UploadAPIService {
 
     async createDraftRevision(nodeUid: string, revision: {
         currentRevisionUid: string,
-        clientUID?: string,
         intendedUploadSize?: number,
     }): Promise<{
         nodeRevisionUid: string,
@@ -116,7 +115,7 @@ export class UploadAPIService {
             PostCreateDraftRevisionResponse
         >(`drive/v2/volumes/${volumeId}/files/${nodeId}/revisions`, {
             CurrentRevisionID: currentRevisionId,
-            ClientUID: revision.clientUID || null,
+            ClientUID: this.clientUid || null,
             IntendedUploadSize: revision.intendedUploadSize || null,
         });