@protontech/drive-sdk 0.5.0 → 0.6.0

package/dist/internal/sharingPublic/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/sharingPublic/index.ts"],"names":[],"mappings":";;;AA+BA,0DA+BC;AAQD,oEAgCC;AA9FD,oDAAqD;AACrD,0CAA4C;AAC5C,sDAAwD;AACxD,0DAA4D;AAC5D,4DAAwD;AACxD,6CAAuD;AACvD,+CAAyD;AACzD,qDAA+D;AAC/D,mDAA6D;AAC7D,mCAAmD;AACnD,qCAAsD;AAEtD,6CAAgE;AAAvD,sHAAA,2BAA2B,OAAA;AAEpC;;;;;;;;GAQG;AACH,SAAgB,uBAAuB,CACnC,SAA+B,EAC/B,UAA2B,EAC3B,kBAA4C,EAC5C,gBAAwC,EACxC,WAAwB,EACxB,OAA2B,EAC3B,GAAW,EACX,KAAa,EACb,QAAgB;IAEhB,MAAM,GAAG,GAAG,IAAI,oCAAuB,CAAC,SAAS,CAAC,SAAS,CAAC,mBAAmB,CAAC,EAAE,UAAU,CAAC,CAAC;IAC9F,MAAM,WAAW,GAAG,IAAI,sCAAwB,CAAC,SAAS,CAAC,SAAS,CAAC,sBAAsB,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAChH,MAAM,aAAa,GAAG,IAAI,0CAA0B,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,IAAI,mCAA0B,CAAC,GAAG,EAAE,WAAW,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC/F,MAAM,KAAK,GAAG,4BAA4B,CACtC,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,gBAAgB,EAChB,WAAW,EACX,OAAO,EACP,MAAM,EACN,GAAG,EACH,KAAK,CACR,CAAC;IAEF,OAAO;QACH,MAAM;QACN,KAAK;KACR,CAAC;AACN,CAAC;AAED;;;;;GAKG;AACH,SAAgB,4BAA4B,CACxC,SAA+B,EAC/B,UAA2B,EAC3B,kBAA4C,EAC5C,gBAAwC,EACxC,WAAwB,EACxB,OAA2B,EAC3B,aAAyC,EACzC,GAAW,EACX,KAAa;IAEb,MAAM,GAAG,GAAG,IAAI,2BAAc,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC,CAAC;IAC7E,MAAM,KAAK,GAAG,IAAI,kBAAU,CAAC,SAAS,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACrF,MAAM,WAAW,GAAG,IAAI,8BAAgB,CAAC,SAAS,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAC/F,MAAM,cAAc,GAAG,IAAI,4CAA2B,CAAC,SAAS,CAAC,CAAC;IAClE,MAAM,aAAa,GAAG,IAAI,kCAAkB,CAAC,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC9F,MAAM,WAAW,GAAG,IAAI,gCAAwB,CAC5C,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAC5B,GAAG,EACH,KAAK,EACL,WAAW,EACX,aAAa,EACb,aAAa,EACb,GAAG,EACH,KAAK,CACR,CAAC;IACF,MAAM,cAAc,GAAG,IAAI,8BAAa,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;IAExG,OAAO;QACH,MAAM,EAAE,WAAW;QACnB,SAAS,EAAE,cAAc;KAC5B,CAAC;AACN,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/sharingPublic/index.ts"],"names":[],"mappings":";;;AA4BA,0DA+BC;AAQD,oEAqCC;AAhGD,oDAAqD;AACrD,0CAA4C;AAC5C,sDAAwD;AACxD,0DAA4D;AAC5D,4DAAwD;AACxD,qDAA+D;AAC/D,mCAAmD;AACnD,qCAAsD;AAEtD,6CAAgE;AAAvD,sHAAA,2BAA2B,OAAA;AAEpC;;;;;;;;GAQG;AACH,SAAgB,uBAAuB,CACnC,SAA+B,EAC/B,UAA2B,EAC3B,kBAA4C,EAC5C,gBAAwC,EACxC,WAAwB,EACxB,OAA2B,EAC3B,GAAW,EACX,KAAa,EACb,cAA0B,EAC1B,iBAAyB;IAEzB,MAAM,MAAM,GAAG,IAAI,mCAA0B,CAAC,OAAO,EAAE,cAAc,EAAE,iBAAiB,CAAC,CAAC;IAC1F,MAAM,KAAK,GAAG,4BAA4B,CACtC,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,gBAAgB,EAChB,WAAW,EACX,OAAO,EACP,MAAM,EACN,GAAG,EACH,KAAK,EACL,cAAc,EACd,iBAAiB,CACpB,CAAC;IAEF,OAAO;QACH,MAAM;QACN,KAAK;KACR,CAAC;AACN,CAAC;AAED;;;;;GAKG;AACH,SAAgB,4BAA4B,CACxC,SAA+B,EAC/B,UAA2B,EAC3B,kBAA4C,EAC5C,gBAAwC,EACxC,WAAwB,EACxB,OAA2B,EAC3B,aAAyC,EACzC,GAAW,EACX,KAAa,EACb,cAA0B,EAC1B,iBAAyB;IAEzB,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,wCAAwC;IACrE,MAAM,GAAG,GAAG,IAAI,2BAAc,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IACxF,MAAM,KAAK,GAAG,IAAI,kBAAU,CAAC,SAAS,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACrF,MAAM,WAAW,GAAG,IAAI,8BAAgB,CAAC,SAAS,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAC/F,MAAM,cAAc,GAAG,IAAI,4CAA2B,CAAC,SAAS,CAAC,CAAC;IAClE,MAAM,aAAa,GAAG,IAAI,kCAAkB,CAAC,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC9F,MAAM,WAAW,GAAG,IAAI,gCAAwB,CAC5C,SAAS,EACT,GAAG,EACH,KAAK,EACL,WAAW,EACX,aAAa,EACb,aAAa,EACb,GAAG,EACH,KAAK,EACL,cAAc,EACd,iBAAiB,CACpB,CAAC;IACF,MAAM,cAAc,GAAG,IAAI,8BAAa,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;IAExG,OAAO;QACH,MAAM,EAAE,WAAW;QACnB,SAAS,EAAE,cAAc;KAC5B,CAAC;AACN,CAAC"}

package/dist/internal/sharingPublic/nodes.d.ts

@@ -1,13 +1,18 @@
-import { Logger } from "../../interface";
-import { NodeAPIService } from "../nodes/apiService";
-import { NodesCache } from "../nodes/cache";
-import { NodesCryptoCache } from "../nodes/cryptoCache";
-import { NodesCryptoService } from "../nodes/cryptoService";
-import { NodesAccess } from "../nodes/nodesAccess";
-import { SharingPublicSharesManager } from "./shares";
+import { ProtonDriveTelemetry } from '../../interface';
+import { NodeAPIService } from '../nodes/apiService';
+import { NodesCache } from '../nodes/cache';
+import { NodesCryptoCache } from '../nodes/cryptoCache';
+import { NodesCryptoService } from '../nodes/cryptoService';
+import { NodesAccess } from '../nodes/nodesAccess';
+import { SharingPublicSharesManager } from './shares';
+import { DecryptedNode, DecryptedNodeKeys } from '../nodes/interface';
+import { PrivateKey } from '../../crypto';
 export declare class SharingPublicNodesAccess extends NodesAccess {
     private url;
     private token;
-    constructor(logger: Logger, apiService: NodeAPIService, cache: NodesCache, cryptoCache: NodesCryptoCache, cryptoService: NodesCryptoService, sharesService: SharingPublicSharesManager, url: string, token: string);
+    private publicShareKey;
+    private publicRootNodeUid;
+    constructor(telemetry: ProtonDriveTelemetry, apiService: NodeAPIService, cache: NodesCache, cryptoCache: NodesCryptoCache, cryptoService: NodesCryptoService, sharesService: SharingPublicSharesManager, url: string, token: string, publicShareKey: PrivateKey, publicRootNodeUid: string);
+    getParentKeys(node: Pick<DecryptedNode, 'uid' | 'parentUid' | 'shareId'>): Promise<Pick<DecryptedNodeKeys, 'key' | 'hashKey'>>;
     getNodeUrl(nodeUid: string): Promise<string>;
 }

package/dist/internal/sharingPublic/nodes.js

@@ -7,11 +7,29 @@ const uids_1 = require("../uids");
 class SharingPublicNodesAccess extends nodesAccess_1.NodesAccess {
     url;
     token;
-    constructor(logger, apiService, cache, cryptoCache, cryptoService, sharesService, url, token) {
-        super(logger, apiService, cache, cryptoCache, cryptoService, sharesService);
+    publicShareKey;
+    publicRootNodeUid;
+    constructor(telemetry, apiService, cache, cryptoCache, cryptoService, sharesService, url, token, publicShareKey, publicRootNodeUid) {
+        super(telemetry, apiService, cache, cryptoCache, cryptoService, sharesService);
         this.url = url;
         this.token = token;
+        this.publicShareKey = publicShareKey;
+        this.publicRootNodeUid = publicRootNodeUid;
         this.token = token;
+        this.publicShareKey = publicShareKey;
+        this.publicRootNodeUid = publicRootNodeUid;
+    }
+    async getParentKeys(node) {
+        // If we reached the root node of the public link, return the public
+        // share key even if user has access to the parent node. We do not
+        // support access to nodes outside of the public link context.
+        // For other nodes, the client must use the main SDK.
+        if (node.uid === this.publicRootNodeUid) {
+            return {
+                key: this.publicShareKey,
+            };
+        }
+        return super.getParentKeys(node);
     }
     async getNodeUrl(nodeUid) {
         const node = await this.getNode(nodeUid);

package/dist/internal/sharingPublic/nodes.js.map

@@ -1 +1 @@
-{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../../../src/internal/sharingPublic/nodes.ts"],"names":[],"mappings":";;;AAKA,sDAAmD;AACnD,oDAAsE;AACtE,kCAAuC;AAGvC,MAAa,wBAAyB,SAAQ,yBAAW;IAQzC;IACA;IARZ,YACI,MAAc,EACd,UAA0B,EAC1B,KAAiB,EACjB,WAA6B,EAC7B,aAAiC,EACjC,aAAyC,EACjC,GAAW,EACX,KAAa;QAErB,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;QAHpE,QAAG,GAAH,GAAG,CAAQ;QACX,UAAK,GAAL,KAAK,CAAQ;QAGrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAe;QAC5B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACzC,IAAI,IAAA,6BAAgB,EAAC,IAAI,CAAC,SAAS,CAAC,IAAI,IAAA,0BAAa,EAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YACpE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,mBAAY,EAAC,OAAO,CAAC,CAAC;YACzC,MAAM,IAAI,GAAG,IAAA,6BAAgB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;YAChE,OAAO,mCAAmC,IAAI,wBAAwB,IAAI,CAAC,KAAK,WAAW,MAAM,EAAE,CAAC;QACxG,CAAC;QAED,kDAAkD;QAClD,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;CACJ;AA1BD,4DA0BC"}
+{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../../../src/internal/sharingPublic/nodes.ts"],"names":[],"mappings":";;;AAKA,sDAAmD;AACnD,oDAAsE;AACtE,kCAAuC;AAKvC,MAAa,wBAAyB,SAAQ,yBAAW;IAQzC;IACA;IACA;IACA;IAVZ,YACI,SAA+B,EAC/B,UAA0B,EAC1B,KAAiB,EACjB,WAA6B,EAC7B,aAAiC,EACjC,aAAyC,EACjC,GAAW,EACX,KAAa,EACb,cAA0B,EAC1B,iBAAyB;QAEjC,KAAK,CAAC,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;QALvE,QAAG,GAAH,GAAG,CAAQ;QACX,UAAK,GAAL,KAAK,CAAQ;QACb,mBAAc,GAAd,cAAc,CAAY;QAC1B,sBAAiB,GAAjB,iBAAiB,CAAQ;QAGjC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,aAAa,CACf,IAA0D;QAE1D,oEAAoE;QACpE,kEAAkE;QAClE,8DAA8D;QAC9D,qDAAqD;QACrD,IAAI,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACtC,OAAO;gBACH,GAAG,EAAE,IAAI,CAAC,cAAc;aAC3B,CAAC;QACN,CAAC;QAED,OAAO,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAe;QAC5B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACzC,IAAI,IAAA,6BAAgB,EAAC,IAAI,CAAC,SAAS,CAAC,IAAI,IAAA,0BAAa,EAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YACpE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAA,mBAAY,EAAC,OAAO,CAAC,CAAC;YACzC,MAAM,IAAI,GAAG,IAAA,6BAAgB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;YAChE,OAAO,mCAAmC,IAAI,wBAAwB,IAAI,CAAC,KAAK,WAAW,MAAM,EAAE,CAAC;QACxG,CAAC;QAED,kDAAkD;QAClD,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;CACJ;AA9CD,4DA8CC"}

package/dist/internal/sharingPublic/session/apiService.d.ts

@@ -1,5 +1,6 @@
+import { Logger } from '../../../interface';
 import { DriveAPIService } from '../../apiService';
-import { PublicLinkInfo, PublicLinkSrpAuth } from './interface';
+import { PublicLinkInfo, PublicLinkSrpAuth, PublicLinkSession, EncryptedShareCrypto } from './interface';
 /**
  * Provides API communication for managing public link session (not data).
  *
@@ -7,8 +8,9 @@ import { PublicLinkInfo, PublicLinkSrpAuth } from './interface';
  * and vice versa. It should not contain any business logic.
  */
 export declare class SharingPublicSessionAPIService {
+    private logger;
     private apiService;
-    constructor(apiService: DriveAPIService);
+    constructor(logger: Logger, apiService: DriveAPIService);
     /**
      * Start a SRP handshake for public link session.
      */
@@ -21,8 +23,8 @@ export declare class SharingPublicSessionAPIService {
      * the session is newly created.
      */
     authPublicLinkSession(token: string, srp: PublicLinkSrpAuth): Promise<{
-        serverProof: string;
-        sessionUid: string;
-        sessionAccessToken?: string;
+        session: PublicLinkSession;
+        encryptedShare: EncryptedShareCrypto;
+        rootUid: string;
     }>;
 }

package/dist/internal/sharingPublic/session/apiService.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SharingPublicSessionAPIService = void 0;
+const apiService_1 = require("../../apiService");
+const uids_1 = require("../../uids");
 /**
  * Provides API communication for managing public link session (not data).
  *
@@ -8,9 +10,12 @@ exports.SharingPublicSessionAPIService = void 0;
  * and vice versa. It should not contain any business logic.
  */
 class SharingPublicSessionAPIService {
+    logger;
     apiService;
-    constructor(apiService) {
+    constructor(logger, apiService) {
+        this.logger = logger;
         this.apiService = apiService;
+        this.logger = logger;
         this.apiService = apiService;
     }
     /**
@@ -29,6 +34,13 @@ class SharingPublicSessionAPIService {
             isCustomPasswordProtected: (response.Flags & 1) === 1,
             isLegacy: response.Flags === 0 || response.Flags === 1,
             vendorType: response.VendorType,
+            directAccess: response.DirectAccess
+                ? {
+                    nodeUid: (0, uids_1.makeNodeUid)(response.DirectAccess.VolumeID, response.DirectAccess.LinkID),
+                    directRole: (0, apiService_1.permissionsToMemberRole)(this.logger, response.DirectAccess.DirectPermissions),
+                    publicRole: (0, apiService_1.permissionsToMemberRole)(this.logger, response.DirectAccess.PublicPermissions),
+                }
+                : undefined,
         };
     }
     /**
@@ -45,9 +57,18 @@ class SharingPublicSessionAPIService {
             SRPSession: srp.srpSession,
         });
         return {
-            serverProof: response.ServerProof,
-            sessionUid: response.UID,
-            sessionAccessToken: response.AccessToken,
+            session: {
+                serverProof: response.ServerProof,
+                sessionUid: response.UID,
+                sessionAccessToken: response.AccessToken,
+            },
+            encryptedShare: {
+                base64UrlPasswordSalt: response.Share.SharePasswordSalt,
+                armoredKey: response.Share.ShareKey,
+                armoredPassphrase: response.Share.SharePassphrase,
+                publicRole: (0, apiService_1.permissionsToMemberRole)(this.logger, response.Share.PublicPermissions),
+            },
+            rootUid: (0, uids_1.makeNodeUid)(response.Share.VolumeID, response.Share.LinkID),
         };
     }
 }

package/dist/internal/sharingPublic/session/apiService.js.map

@@ -1 +1 @@
-{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../../src/internal/sharingPublic/session/apiService.ts"],"names":[],"mappings":";;;AAaA;;;;;GAKG;AACH,MAAa,8BAA8B;IACnB;IAApB,YAAoB,UAA2B;QAA3B,eAAU,GAAV,UAAU,CAAiB;QAC3C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,qBAAqB,CAAC,KAAa;QACrC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAA4B,cAAc,KAAK,OAAO,CAAC,CAAC;QAClG,OAAO;YACH,GAAG,EAAE;gBACD,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,eAAe,EAAE,QAAQ,CAAC,eAAe;gBACzC,IAAI,EAAE,QAAQ,CAAC,eAAe;gBAC9B,UAAU,EAAE,QAAQ,CAAC,UAAU;aAClC;YACD,yBAAyB,EAAE,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;YACrD,QAAQ,EAAE,QAAQ,CAAC,KAAK,KAAK,CAAC,IAAI,QAAQ,CAAC,KAAK,KAAK,CAAC;YACtD,UAAU,EAAE,QAAQ,CAAC,UAAU;SAClC,CAAC;IACN,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,qBAAqB,CACvB,KAAa,EACb,GAAsB;QAMtB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CACvC,cAAc,KAAK,OAAO,EAC1B;YACI,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,eAAe,EAAE,GAAG,CAAC,eAAe;YACpC,UAAU,EAAE,GAAG,CAAC,UAAU;SAC7B,CACJ,CAAC;QAEF,OAAO;YACH,WAAW,EAAE,QAAQ,CAAC,WAAW;YACjC,UAAU,EAAE,QAAQ,CAAC,GAAG;YACxB,kBAAkB,EAAE,QAAQ,CAAC,WAAW;SAC3C,CAAC;IACN,CAAC;CACJ;AAtDD,wEAsDC"}
+{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../../src/internal/sharingPublic/session/apiService.ts"],"names":[],"mappings":";;;AACA,iDAAwF;AACxF,qCAAyC;AAazC;;;;;GAKG;AACH,MAAa,8BAA8B;IAE3B;IACA;IAFZ,YACY,MAAc,EACd,UAA2B;QAD3B,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAiB;QAEnC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,qBAAqB,CAAC,KAAa;QACrC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAA4B,cAAc,KAAK,OAAO,CAAC,CAAC;QAClG,OAAO;YACH,GAAG,EAAE;gBACD,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,eAAe,EAAE,QAAQ,CAAC,eAAe;gBACzC,IAAI,EAAE,QAAQ,CAAC,eAAe;gBAC9B,UAAU,EAAE,QAAQ,CAAC,UAAU;aAClC;YACD,yBAAyB,EAAE,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;YACrD,QAAQ,EAAE,QAAQ,CAAC,KAAK,KAAK,CAAC,IAAI,QAAQ,CAAC,KAAK,KAAK,CAAC;YACtD,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,YAAY,EAAE,QAAQ,CAAC,YAAY;gBAC/B,CAAC,CAAC;oBACI,OAAO,EAAE,IAAA,kBAAW,EAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC;oBAClF,UAAU,EAAE,IAAA,oCAAuB,EAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,iBAAiB,CAAC;oBACzF,UAAU,EAAE,IAAA,oCAAuB,EAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,iBAAiB,CAAC;iBAC5F;gBACH,CAAC,CAAC,SAAS;SAClB,CAAC;IACN,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,qBAAqB,CACvB,KAAa,EACb,GAAsB;QAMtB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CACvC,cAAc,KAAK,OAAO,EAC1B;YACI,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,eAAe,EAAE,GAAG,CAAC,eAAe;YACpC,UAAU,EAAE,GAAG,CAAC,UAAU;SAC7B,CACJ,CAAC;QAEF,OAAO;YACH,OAAO,EAAE;gBACL,WAAW,EAAE,QAAQ,CAAC,WAAW;gBACjC,UAAU,EAAE,QAAQ,CAAC,GAAG;gBACxB,kBAAkB,EAAE,QAAQ,CAAC,WAAW;aAC3C;YACD,cAAc,EAAE;gBACZ,qBAAqB,EAAE,QAAQ,CAAC,KAAK,CAAC,iBAAiB;gBACvD,UAAU,EAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ;gBACnC,iBAAiB,EAAE,QAAQ,CAAC,KAAK,CAAC,eAAe;gBACjD,UAAU,EAAE,IAAA,oCAAuB,EAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC;aACrF;YACD,OAAO,EAAE,IAAA,kBAAW,EAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;SACvE,CAAC;IACN,CAAC;CACJ;AA1ED,wEA0EC"}

package/dist/internal/sharingPublic/session/interface.d.ts

@@ -1,8 +1,14 @@
+import { MemberRole } from '../../../interface';
 export type PublicLinkInfo = {
     srp: PublicLinkSrpInfo;
     isCustomPasswordProtected: boolean;
     isLegacy: boolean;
     vendorType: number;
+    directAccess?: {
+        nodeUid: string;
+        directRole: MemberRole;
+        publicRole: MemberRole;
+    };
 };
 export type PublicLinkSrpInfo = {
     version: number;
@@ -16,3 +22,14 @@ export type PublicLinkSrpAuth = {
     clientEphemeral: string;
     srpSession: string;
 };
+export type PublicLinkSession = {
+    serverProof: string;
+    sessionUid: string;
+    sessionAccessToken?: string;
+};
+export type EncryptedShareCrypto = {
+    base64UrlPasswordSalt: string;
+    armoredKey: string;
+    armoredPassphrase: string;
+    publicRole: MemberRole;
+};

package/dist/internal/sharingPublic/session/manager.d.ts

@@ -1,5 +1,5 @@
-import { ProtonDriveHTTPClient } from '../../../interface';
-import { SRPModule } from '../../../crypto';
+import { MemberRole, ProtonDriveHTTPClient, ProtonDriveTelemetry } from '../../../interface';
+import { DriveCrypto, PrivateKey, SRPModule } from '../../../crypto';
 import { DriveAPIService } from '../../apiService';
 import { SharingPublicSessionHttpClient } from './httpClient';
 /**
@@ -9,10 +9,11 @@ import { SharingPublicSessionHttpClient } from './httpClient';
  */
 export declare class SharingPublicSessionManager {
     private httpClient;
+    private driveCrypto;
     private srpModule;
     private api;
     private infosPerToken;
-    constructor(httpClient: ProtonDriveHTTPClient, apiService: DriveAPIService, srpModule: SRPModule);
+    constructor(telemetry: ProtonDriveTelemetry, httpClient: ProtonDriveHTTPClient, driveCrypto: DriveCrypto, srpModule: SRPModule, apiService: DriveAPIService);
     /**
      * Get the info for a public link.
      *
@@ -27,6 +28,11 @@ export declare class SharingPublicSessionManager {
         isCustomPasswordProtected: boolean;
         isLegacy: boolean;
         vendorType: number;
+        directAccess?: {
+            nodeUid: string;
+            directRole: MemberRole;
+            publicRole: MemberRole;
+        };
     }>;
     /**
      * Authenticate a public link session.
@@ -43,7 +49,9 @@ export declare class SharingPublicSessionManager {
      */
     auth(url: string, customPassword?: string): Promise<{
         token: string;
-        password: string;
         httpClient: SharingPublicSessionHttpClient;
+        shareKey: PrivateKey;
+        rootUid: string;
     }>;
+    private decryptShareKey;
 }

package/dist/internal/sharingPublic/session/manager.js

@@ -12,15 +12,18 @@ const url_1 = require("./url");
  */
 class SharingPublicSessionManager {
     httpClient;
+    driveCrypto;
     srpModule;
     api;
     infosPerToken = new Map();
-    constructor(httpClient, apiService, srpModule) {
+    constructor(telemetry, httpClient, driveCrypto, srpModule, apiService) {
         this.httpClient = httpClient;
+        this.driveCrypto = driveCrypto;
         this.srpModule = srpModule;
         this.httpClient = httpClient;
+        this.driveCrypto = driveCrypto;
         this.srpModule = srpModule;
-        this.api = new apiService_1.SharingPublicSessionAPIService(apiService);
+        this.api = new apiService_1.SharingPublicSessionAPIService(telemetry.getLogger('sharingPublicSession'), apiService);
     }
     /**
      * Get the info for a public link.
@@ -40,6 +43,7 @@ class SharingPublicSessionManager {
             isCustomPasswordProtected: info.isCustomPasswordProtected,
             isLegacy: info.isLegacy,
             vendorType: info.vendorType,
+            directAccess: info.directAccess,
         };
     }
     /**
@@ -63,13 +67,19 @@ class SharingPublicSessionManager {
         }
         const password = `${urlPassword}${customPassword || ''}`;
         const session = new session_1.SharingPublicLinkSession(this.api, this.srpModule, token, password);
-        await session.auth(info.srp);
+        const { encryptedShare, rootUid } = await session.auth(info.srp);
+        const shareKey = await this.decryptShareKey(encryptedShare, password);
         return {
             token,
-            password,
             httpClient: new httpClient_1.SharingPublicSessionHttpClient(this.httpClient, session),
+            shareKey,
+            rootUid,
         };
     }
+    async decryptShareKey(encryptedShare, password) {
+        const { key: shareKey } = await this.driveCrypto.decryptKeyWithSrpPassword(password, encryptedShare.base64UrlPasswordSalt, encryptedShare.armoredKey, encryptedShare.armoredPassphrase);
+        return shareKey;
+    }
 }
 exports.SharingPublicSessionManager = SharingPublicSessionManager;
 //# sourceMappingURL=manager.js.map

package/dist/internal/sharingPublic/session/manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../src/internal/sharingPublic/session/manager.ts"],"names":[],"mappings":";;;AAGA,6CAA8D;AAC9D,6CAA8D;AAE9D,uCAAqD;AACrD,+BAAmD;AAEnD;;;;GAIG;AACH,MAAa,2BAA2B;IAMxB;IAEA;IAPJ,GAAG,CAAiC;IAEpC,aAAa,GAAgC,IAAI,GAAG,EAAE,CAAC;IAE/D,YACY,UAAiC,EACzC,UAA2B,EACnB,SAAoB;QAFpB,eAAU,GAAV,UAAU,CAAuB;QAEjC,cAAS,GAAT,SAAS,CAAW;QAE5B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAE3B,IAAI,CAAC,GAAG,GAAG,IAAI,2CAA8B,CAAC,UAAU,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,OAAO,CAAC,GAAW;QAKrB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,gCAA0B,EAAC,GAAG,CAAC,CAAC;QAElD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACzD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAEpC,OAAO;YACH,yBAAyB,EAAE,IAAI,CAAC,yBAAyB;YACzD,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC;IACN,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,KAAK,CAAC,IAAI,CACN,GAAW,EACX,cAAuB;QAMvB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,IAAA,gCAA0B,EAAC,GAAG,CAAC,CAAC;QAEzE,IAAI,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,QAAQ,GAAG,GAAG,WAAW,GAAG,cAAc,IAAI,EAAE,EAAE,CAAC;QAEzD,MAAM,OAAO,GAAG,IAAI,kCAAwB,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACxF,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE7B,OAAO;YACH,KAAK;YACL,QAAQ;YACR,UAAU,EAAE,IAAI,2CAA8B,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC;SAC3E,CAAC;IACN,CAAC;CACJ;AAlFD,kEAkFC"}
+{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../src/internal/sharingPublic/session/manager.ts"],"names":[],"mappings":";;;AAGA,6CAA8D;AAC9D,6CAA8D;AAE9D,uCAAqD;AACrD,+BAAmD;AAEnD;;;;GAIG;AACH,MAAa,2BAA2B;IAOxB;IACA;IACA;IARJ,GAAG,CAAiC;IAEpC,aAAa,GAAgC,IAAI,GAAG,EAAE,CAAC;IAE/D,YACI,SAA+B,EACvB,UAAiC,EACjC,WAAwB,EACxB,SAAoB,EAC5B,UAA2B;QAHnB,eAAU,GAAV,UAAU,CAAuB;QACjC,gBAAW,GAAX,WAAW,CAAa;QACxB,cAAS,GAAT,SAAS,CAAW;QAG5B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAE3B,IAAI,CAAC,GAAG,GAAG,IAAI,2CAA8B,CAAC,SAAS,CAAC,SAAS,CAAC,sBAAsB,CAAC,EAAE,UAAU,CAAC,CAAC;IAC3G,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,OAAO,CAAC,GAAW;QAUrB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,gCAA0B,EAAC,GAAG,CAAC,CAAC;QAElD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACzD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAEpC,OAAO;YACH,yBAAyB,EAAE,IAAI,CAAC,yBAAyB;YACzD,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;SAClC,CAAC;IACN,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,KAAK,CAAC,IAAI,CACN,GAAW,EACX,cAAuB;QAOvB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,IAAA,gCAA0B,EAAC,GAAG,CAAC,CAAC;QAEzE,IAAI,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,QAAQ,GAAG,GAAG,WAAW,GAAG,cAAc,IAAI,EAAE,EAAE,CAAC;QAEzD,MAAM,OAAO,GAAG,IAAI,kCAAwB,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACxF,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEjE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QAEtE,OAAO;YACH,KAAK;YACL,UAAU,EAAE,IAAI,2CAA8B,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC;YACxE,QAAQ;YACR,OAAO;SACV,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,cAAoC,EAAE,QAAgB;QAChF,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,yBAAyB,CACtE,QAAQ,EACR,cAAc,CAAC,qBAAqB,EACpC,cAAc,CAAC,UAAU,EACzB,cAAc,CAAC,iBAAiB,CACnC,CAAC;QACF,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ;AAzGD,kEAyGC"}

package/dist/internal/sharingPublic/session/session.d.ts

@@ -1,6 +1,6 @@
 import { SRPModule } from '../../../crypto';
 import { SharingPublicSessionAPIService } from './apiService';
-import { PublicLinkInfo, PublicLinkSrpInfo } from './interface';
+import { EncryptedShareCrypto, PublicLinkInfo, PublicLinkSrpInfo } from './interface';
 /**
  * Session for a public link.
  *
@@ -17,7 +17,10 @@ export declare class SharingPublicLinkSession {
     constructor(apiService: SharingPublicSessionAPIService, srpModule: SRPModule, token: string, password: string);
     reauth(): Promise<void>;
     init(): Promise<PublicLinkInfo>;
-    auth(srp: PublicLinkSrpInfo): Promise<void>;
+    auth(srp: PublicLinkSrpInfo): Promise<{
+        encryptedShare: EncryptedShareCrypto;
+        rootUid: string;
+    }>;
     /**
      * Get the session uid and access token.
      *

package/dist/internal/sharingPublic/session/session.js

@@ -38,11 +38,15 @@ class SharingPublicLinkSession {
             clientEphemeral,
             srpSession: srp.srpSession,
         });
-        if (auth.serverProof !== expectedServerProof) {
+        if (auth.session.serverProof !== expectedServerProof) {
             throw new Error('Invalid server proof');
         }
-        this.sessionUid = auth.sessionUid;
-        this.sessionAccessToken = auth.sessionAccessToken;
+        this.sessionUid = auth.session.sessionUid;
+        this.sessionAccessToken = auth.session.sessionAccessToken;
+        return {
+            encryptedShare: auth.encryptedShare,
+            rootUid: auth.rootUid,
+        };
     }
     /**
      * Get the session uid and access token.

package/dist/internal/sharingPublic/session/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../src/internal/sharingPublic/session/session.ts"],"names":[],"mappings":";;;AAIA;;;;;GAKG;AACH,MAAa,wBAAwB;IAKrB;IACA;IACA;IACA;IAPJ,UAAU,CAAU;IACpB,kBAAkB,CAAU;IAEpC,YACY,UAA0C,EAC1C,SAAoB,EACpB,KAAa,EACb,QAAgB;QAHhB,eAAU,GAAV,UAAU,CAAgC;QAC1C,cAAS,GAAT,SAAS,CAAW;QACpB,UAAK,GAAL,KAAK,CAAQ;QACb,aAAQ,GAAR,QAAQ,CAAQ;QAExB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAC/B,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,IAAI;QACN,OAAO,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAsB;QAC7B,MAAM,EAAE,mBAAmB,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CACrF,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,eAAe,EACnB,GAAG,CAAC,IAAI,EACR,IAAI,CAAC,QAAQ,CAChB,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,EAAE;YACjE,WAAW;YACX,eAAe;YACf,UAAU,EAAE,GAAG,CAAC,UAAU;SAC7B,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,WAAW,KAAK,mBAAmB,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC;IACtD,CAAC;IAED;;;;;;;;OAQG;IACH,IAAI,OAAO;QACP,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO;YACH,GAAG,EAAE,IAAI,CAAC,UAAU;YACpB,WAAW,EAAE,IAAI,CAAC,kBAAkB;SACvC,CAAC;IACN,CAAC;CACJ;AAnED,4DAmEC"}
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../src/internal/sharingPublic/session/session.ts"],"names":[],"mappings":";;;AAIA;;;;;GAKG;AACH,MAAa,wBAAwB;IAKrB;IACA;IACA;IACA;IAPJ,UAAU,CAAU;IACpB,kBAAkB,CAAU;IAEpC,YACY,UAA0C,EAC1C,SAAoB,EACpB,KAAa,EACb,QAAgB;QAHhB,eAAU,GAAV,UAAU,CAAgC;QAC1C,cAAS,GAAT,SAAS,CAAW;QACpB,UAAK,GAAL,KAAK,CAAQ;QACb,aAAQ,GAAR,QAAQ,CAAQ;QAExB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,MAAM;QACR,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAC/B,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,IAAI;QACN,OAAO,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAsB;QAC7B,MAAM,EAAE,mBAAmB,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CACrF,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,eAAe,EACnB,GAAG,CAAC,IAAI,EACR,IAAI,CAAC,QAAQ,CAChB,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,EAAE;YACjE,WAAW;YACX,eAAe;YACf,UAAU,EAAE,GAAG,CAAC,UAAU;SAC7B,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,KAAK,mBAAmB,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;QAC1C,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;QAE1D,OAAO;YACH,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,OAAO,EAAE,IAAI,CAAC,OAAO;SACxB,CAAC;IACN,CAAC;IAED;;;;;;;;OAQG;IACH,IAAI,OAAO;QACP,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO;YACH,GAAG,EAAE,IAAI,CAAC,UAAU;YACpB,WAAW,EAAE,IAAI,CAAC,kBAAkB;SACvC,CAAC;IACN,CAAC;CACJ;AAxED,4DAwEC"}

package/dist/internal/sharingPublic/shares.d.ts

@@ -1,8 +1,5 @@
 import { PrivateKey } from '../../crypto';
 import { MetricVolumeType, ProtonDriveAccount } from '../../interface';
-import { SharingPublicAPIService } from './apiService';
-import { SharingPublicCryptoCache } from './cryptoCache';
-import { SharingPublicCryptoService } from './cryptoService';
 /**
  * Provides high-level actions for managing public link share.
  *
@@ -10,20 +7,16 @@ import { SharingPublicCryptoService } from './cryptoService';
  * service so it can be used in the same way in various modules that use shares.
  */
 export declare class SharingPublicSharesManager {
-    private apiService;
-    private cryptoCache;
-    private cryptoService;
     private account;
-    private token;
-    private promisePublicLinkRoot?;
-    constructor(apiService: SharingPublicAPIService, cryptoCache: SharingPublicCryptoCache, cryptoService: SharingPublicCryptoService, account: ProtonDriveAccount, token: string);
+    private publicShareKey;
+    private publicRootNodeUid;
+    constructor(account: ProtonDriveAccount, publicShareKey: PrivateKey, publicRootNodeUid: string);
     getOwnVolumeIDs(): Promise<{
         volumeId: string;
         rootNodeId: string;
         rootNodeUid: string;
     }>;
     getSharePrivateKey(): Promise<PrivateKey>;
-    private getPublicLinkRoot;
     getContextShareMemberEmailKey(): Promise<{
         email: string;
         addressId: string;

package/dist/internal/sharingPublic/shares.js

@@ -10,47 +10,24 @@ const uids_1 = require("../uids");
  * service so it can be used in the same way in various modules that use shares.
  */
 class SharingPublicSharesManager {
-    apiService;
-    cryptoCache;
-    cryptoService;
     account;
-    token;
-    promisePublicLinkRoot;
-    constructor(apiService, cryptoCache, cryptoService, account, token) {
-        this.apiService = apiService;
-        this.cryptoCache = cryptoCache;
-        this.cryptoService = cryptoService;
+    publicShareKey;
+    publicRootNodeUid;
+    constructor(account, publicShareKey, publicRootNodeUid) {
         this.account = account;
-        this.token = token;
-        this.apiService = apiService;
-        this.cryptoCache = cryptoCache;
-        this.cryptoService = cryptoService;
+        this.publicShareKey = publicShareKey;
+        this.publicRootNodeUid = publicRootNodeUid;
         this.account = account;
-        this.token = token;
+        this.publicShareKey = publicShareKey;
+        this.publicRootNodeUid = publicRootNodeUid;
     }
     // TODO: Rename to getRootIDs everywhere.
     async getOwnVolumeIDs() {
-        const { rootIds } = await this.getPublicLinkRoot();
-        return rootIds;
+        const { volumeId, nodeId: rootNodeId } = (0, uids_1.splitNodeUid)(this.publicRootNodeUid);
+        return { volumeId, rootNodeId, rootNodeUid: this.publicRootNodeUid };
     }
     async getSharePrivateKey() {
-        const { shareKey } = await this.getPublicLinkRoot();
-        return shareKey;
-    }
-    async getPublicLinkRoot() {
-        if (!this.promisePublicLinkRoot) {
-            this.promisePublicLinkRoot = (async () => {
-                const { encryptedNode, encryptedShare } = await this.apiService.getPublicLinkRoot(this.token);
-                const { volumeId, nodeId: rootNodeId } = (0, uids_1.splitNodeUid)(encryptedNode.uid);
-                const shareKey = await this.cryptoService.decryptPublicLinkShareKey(encryptedShare);
-                await this.cryptoCache.setShareKey(shareKey);
-                return {
-                    rootIds: { volumeId, rootNodeId, rootNodeUid: encryptedNode.uid },
-                    shareKey,
-                };
-            })();
-        }
-        return this.promisePublicLinkRoot;
+        return this.publicShareKey;
     }
     async getContextShareMemberEmailKey() {
         const address = await this.account.getOwnPrimaryAddress();

package/dist/internal/sharingPublic/shares.js.map

@@ -1 +1 @@
-{"version":3,"file":"shares.js","sourceRoot":"","sources":["../../../src/internal/sharingPublic/shares.ts"],"names":[],"mappings":";;;AACA,+CAAuE;AACvE,kCAAuC;AAKvC;;;;;GAKG;AACH,MAAa,0BAA0B;IAOvB;IACA;IACA;IACA;IACA;IAVJ,qBAAqB,CAG1B;IAEH,YACY,UAAmC,EACnC,WAAqC,EACrC,aAAyC,EACzC,OAA2B,EAC3B,KAAa;QAJb,eAAU,GAAV,UAAU,CAAyB;QACnC,gBAAW,GAAX,WAAW,CAA0B;QACrC,kBAAa,GAAb,aAAa,CAA4B;QACzC,YAAO,GAAP,OAAO,CAAoB;QAC3B,UAAK,GAAL,KAAK,CAAQ;QAErB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAED,yCAAyC;IACzC,KAAK,CAAC,eAAe;QACjB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACnD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,kBAAkB;QACpB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACpD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,iBAAiB;QAI3B,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC9B,IAAI,CAAC,qBAAqB,GAAG,CAAC,KAAK,IAAI,EAAE;gBACrC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAE9F,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,mBAAY,EAAC,aAAa,CAAC,GAAG,CAAC,CAAC;gBAEzE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,yBAAyB,CAAC,cAAc,CAAC,CAAC;gBACpF,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;gBAE7C,OAAO;oBACH,OAAO,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,CAAC,GAAG,EAAE;oBACjE,QAAQ;iBACX,CAAC;YACN,CAAC,CAAC,EAAE,CAAC;QACT,CAAC;QAED,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,6BAA6B;QAM/B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC;QAC1D,OAAO;YACH,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG;YACrD,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,EAAE;SACzD,CAAC;IACN,CAAC;IAED,KAAK,CAAC,sBAAsB;QACxB,OAAO,4BAAgB,CAAC,YAAY,CAAC;IACzC,CAAC;CACJ;AAxED,gEAwEC"}
+{"version":3,"file":"shares.js","sourceRoot":"","sources":["../../../src/internal/sharingPublic/shares.ts"],"names":[],"mappings":";;;AACA,+CAAuE;AACvE,kCAAuC;AAEvC;;;;;GAKG;AACH,MAAa,0BAA0B;IAEvB;IACA;IACA;IAHZ,YACY,OAA2B,EAC3B,cAA0B,EAC1B,iBAAyB;QAFzB,YAAO,GAAP,OAAO,CAAoB;QAC3B,mBAAc,GAAd,cAAc,CAAY;QAC1B,sBAAiB,GAAjB,iBAAiB,CAAQ;QAEjC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC/C,CAAC;IAED,yCAAyC;IACzC,KAAK,CAAC,eAAe;QACjB,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,mBAAY,EAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC9E,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,kBAAkB;QACpB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,6BAA6B;QAM/B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC;QAC1D,OAAO;YACH,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG;YACrD,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,EAAE;SACzD,CAAC;IACN,CAAC;IAED,KAAK,CAAC,sBAAsB;QACxB,OAAO,4BAAgB,CAAC,YAAY,CAAC;IACzC,CAAC;CACJ;AAvCD,gEAuCC"}

package/dist/internal/upload/apiService.d.ts

@@ -5,15 +5,6 @@ export declare class UploadAPIService {
     protected apiService: DriveAPIService;
     protected clientUid: string | undefined;
     constructor(apiService: DriveAPIService, clientUid: string | undefined);
-    checkAvailableHashes(parentNodeUid: string, hashes: string[]): Promise<{
-        availalbleHashes: string[];
-        pendingHashes: {
-            hash: string;
-            nodeUid: string;
-            revisionUid: string;
-            clientUid?: string;
-        }[];
-    }>;
     createDraft(parentNodeUid: string, node: {
         armoredEncryptedName: string;
         hash: string;

package/dist/internal/upload/apiService.js

@@ -14,22 +14,6 @@ class UploadAPIService {
         this.apiService = apiService;
         this.clientUid = clientUid;
     }
-    async checkAvailableHashes(parentNodeUid, hashes) {
-        const { volumeId, nodeId: parentNodeId } = (0, uids_1.splitNodeUid)(parentNodeUid);
-        const result = await this.apiService.post(`drive/v2/volumes/${volumeId}/links/${parentNodeId}/checkAvailableHashes`, {
-            Hashes: hashes,
-            ClientUID: this.clientUid ? [this.clientUid] : null,
-        });
-        return {
-            availalbleHashes: result.AvailableHashes,
-            pendingHashes: result.PendingHashes.map((hash) => ({
-                hash: hash.Hash,
-                nodeUid: (0, uids_1.makeNodeUid)(volumeId, hash.LinkID),
-                revisionUid: (0, uids_1.makeNodeRevisionUid)(volumeId, hash.LinkID, hash.RevisionID),
-                clientUid: hash.ClientUID || undefined,
-            })),
-        };
-    }
     async createDraft(parentNodeUid, node) {
         // The client shouldn't send the clear text size of the file.
         // The intented upload size is needed only for early validation that

package/dist/internal/upload/apiService.js.map

@@ -1 +1 @@
-{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/upload/apiService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"apiService.js","sourceRoot":"","sources":["../../../src/internal/upload/apiService.ts"],"names":[],"mappings":"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"}

package/dist/internal/upload/controller.d.ts

@@ -1,10 +1,12 @@
 export declare class UploadController {
+    private signal?;
     private paused;
     promise?: Promise<{
         nodeRevisionUid: string;
         nodeUid: string;
     }>;
-    waitIfPaused(): Promise<void>;
+    constructor(signal?: AbortSignal | undefined);
+    waitWhilePaused(): Promise<void>;
     pause(): void;
     resume(): void;
     completion(): Promise<{

package/dist/internal/upload/controller.js

@@ -1,12 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UploadController = void 0;
+const errors_1 = require("../../errors");
 const wait_1 = require("../wait");
 class UploadController {
+    signal;
     paused = false;
     promise;
-    async waitIfPaused() {
-        await (0, wait_1.waitForCondition)(() => !this.paused);
+    constructor(signal) {
+        this.signal = signal;
+        this.signal = signal;
+    }
+    async waitWhilePaused() {
+        try {
+            await (0, wait_1.waitForCondition)(() => !this.paused, this.signal);
+        }
+        catch (error) {
+            if (error instanceof errors_1.AbortError) {
+                return;
+            }
+            throw error;
+        }
     }
     pause() {
         this.paused = true;

package/dist/internal/upload/controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/internal/upload/controller.ts"],"names":[],"mappings":";;;AAAA,kCAA2C;AAE3C,MAAa,gBAAgB;IACjB,MAAM,GAAG,KAAK,CAAC;IAChB,OAAO,CAAyD;IAEvE,KAAK,CAAC,YAAY;QACd,MAAM,IAAA,uBAAgB,EAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACvB,CAAC;IAED,MAAM;QACF,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,UAAU;QACZ,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAClF,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC;IAC9B,CAAC;CACJ;AAtBD,4CAsBC"}
+{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/internal/upload/controller.ts"],"names":[],"mappings":";;;AAAA,yCAA0C;AAC1C,kCAA2C;AAE3C,MAAa,gBAAgB;IAIL;IAHZ,MAAM,GAAG,KAAK,CAAC;IAChB,OAAO,CAAyD;IAEvE,YAAoB,MAAoB;QAApB,WAAM,GAAN,MAAM,CAAc;QACpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,eAAe;QACjB,IAAI,CAAC;YACD,MAAM,IAAA,uBAAgB,EAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,KAAK,YAAY,mBAAU,EAAE,CAAC;gBAC9B,OAAO;YACX,CAAC;YACD,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAED,KAAK;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;IACvB,CAAC;IAED,MAAM;QACF,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,UAAU;QACZ,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAClF,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC;IAC9B,CAAC;CACJ;AAjCD,4CAiCC"}

package/dist/internal/upload/cryptoService.d.ts

@@ -9,10 +9,6 @@ export declare class UploadCryptoService {
         key: PrivateKey;
         hashKey: Uint8Array;
     }, name: string): Promise<NodeCrypto>;
-    generateNameHashes(parentHashKey: Uint8Array, names: string[]): Promise<{
-        name: string;
-        hash: string;
-    }[]>;
     encryptThumbnail(nodeRevisionDraftKeys: NodeRevisionDraftKeys, thumbnail: Thumbnail): Promise<EncryptedThumbnail>;
     encryptBlock(verifyBlock: (encryptedBlock: Uint8Array) => Promise<{
         verificationToken: Uint8Array;

package/dist/internal/upload/cryptoService.js

@@ -30,12 +30,6 @@ class UploadCryptoService {
             signatureAddress,
         };
     }
-    async generateNameHashes(parentHashKey, names) {
-        return Promise.all(names.map(async (name) => ({
-            name,
-            hash: await this.driveCrypto.generateLookupHash(name, parentHashKey),
-        })));
-    }
     async encryptThumbnail(nodeRevisionDraftKeys, thumbnail) {
         const { encryptedData } = await this.driveCrypto.encryptThumbnailBlock(thumbnail.thumbnail, nodeRevisionDraftKeys.contentKeyPacketSessionKey, nodeRevisionDraftKeys.signatureAddress.addressKey);
         const digest = await crypto.subtle.digest('SHA-256', encryptedData);