Merge pull request #128 from ardriveapp/dev

Merge dev into master for v1.0.1 PE-649
ardriveapp · Nov 1, 2021 · 67a6385 · 67a6385
2 parents 1985578 + e719600
commit 67a6385
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ardrive-cli",
-	"version": "1.0.0",
+	"version": "1.0.1",
 	"description": "The ArDrive Command Line Interface (CLI is a Node.js application for terminal-based ArDrive workflows. It also offers utility operations for securely interacting with Arweave wallets and inspecting various Arweave blockchain conditions.",
 	"main": "./lib/index.js",
 	"bin": {

diff --git a/src/ardrive.ts b/src/ardrive.ts
@@ -371,7 +371,8 @@ export class ArDrive extends ArDriveAnonymous {
 
 		const childrenFolderIds = await this.arFsDao.getPublicChildrenFolderIds({
 			folderId,
-			driveId: destFolderDriveId
+			driveId: destFolderDriveId,
+			owner
 		});
 
 		if (childrenFolderIds.includes(newParentFolderId)) {
@@ -438,7 +439,8 @@ export class ArDrive extends ArDriveAnonymous {
 		const childrenFolderIds = await this.arFsDao.getPrivateChildrenFolderIds({
 			folderId,
 			driveId: destFolderDriveId,
-			driveKey
+			driveKey,
+			owner
 		});
 
 		if (childrenFolderIds.includes(newParentFolderId)) {

diff --git a/src/arfsdao.ts b/src/arfsdao.ts
@@ -70,7 +70,8 @@ import {
 	ArFSUploadPrivateFileResult,
 	ArFSCreateDriveResultFactory,
 	ArFSMoveEntityResultFactory,
-	ArFSUploadFileResultFactory
+	ArFSUploadFileResultFactory,
+	WithDriveKey
 } from './arfs_entity_result_factory';
 import {
 	ArFSFileOrFolderEntity,
@@ -82,7 +83,7 @@ import {
 	ArFSPublicFile,
 	ArFSPublicFolder
 } from './arfs_entities';
-import { ArFSDAOAnonymous } from './arfsdao_anonymous';
+import { ArFSAllPublicFoldersOfDriveParams, ArFSDAOAnonymous } from './arfsdao_anonymous';
 import { ArFSFileOrFolderBuilder } from './utils/arfs_builders/arfs_builders';
 import { PrivateKeyData } from './private_key_data';
 import { ArweaveAddress } from './arweave_address';
@@ -127,6 +128,9 @@ export interface UploadPublicFileParams {
 export interface UploadPrivateFileParams extends UploadPublicFileParams {
 	driveKey: DriveKey;
 }
+
+export type ArFSAllPrivateFoldersOfDriveParams = ArFSAllPublicFoldersOfDriveParams & WithDriveKey;
+
 export interface CreateFolderSettings {
 	driveId: DriveID;
 	rewardSettings: RewardSettings;
@@ -147,6 +151,7 @@ export interface CreatePrivateFolderSettings extends CreateFolderSettings {
 interface getPublicChildrenFolderIdsParams {
 	folderId: FolderID;
 	driveId: DriveID;
+	owner: ArweaveAddress;
 }
 interface getPrivateChildrenFolderIdsParams extends getPublicChildrenFolderIdsParams {
 	driveKey: DriveKey;
@@ -688,11 +693,12 @@ export class ArFSDAO extends ArFSDAOAnonymous {
 		return new ArFSPrivateFileBuilder(fileId, this.arweave, driveKey, owner).build();
 	}
 
-	async getAllFoldersOfPrivateDrive(
-		driveId: DriveID,
-		driveKey: DriveKey,
+	async getAllFoldersOfPrivateDrive({
+		driveId,
+		driveKey,
+		owner,
 		latestRevisionsOnly = false
-	): Promise<ArFSPrivateFolder[]> {
+	}: ArFSAllPrivateFoldersOfDriveParams): Promise<ArFSPrivateFolder[]> {
 		let cursor = '';
 		let hasNextPage = true;
 		const allFolders: ArFSPrivateFolder[] = [];
@@ -703,7 +709,8 @@ export class ArFSDAO extends ArFSDAOAnonymous {
 					{ name: 'Drive-Id', value: driveId },
 					{ name: 'Entity-Type', value: 'folder' }
 				],
-				cursor
+				cursor,
+				owner
 			});
 
 			const response = await this.arweave.api.post(graphQLURL, gqlQuery);
@@ -726,6 +733,7 @@ export class ArFSDAO extends ArFSDAOAnonymous {
 	async getPrivateFilesWithParentFolderIds(
 		folderIDs: FolderID[],
 		driveKey: DriveKey,
+		owner: ArweaveAddress,
 		latestRevisionsOnly = false
 	): Promise<ArFSPrivateFile[]> {
 		let cursor = '';
@@ -738,7 +746,8 @@ export class ArFSDAO extends ArFSDAOAnonymous {
 					{ name: 'Parent-Folder-Id', value: folderIDs },
 					{ name: 'Entity-Type', value: 'file' }
 				],
-				cursor
+				cursor,
+				owner
 			});
 
 			const response = await this.arweave.api.post(graphQLURL, gqlQuery);
@@ -874,12 +883,24 @@ export class ArFSDAO extends ArFSDAOAnonymous {
 	async getPrivateChildrenFolderIds({
 		folderId,
 		driveId,
-		driveKey
+		driveKey,
+		owner
 	}: getPrivateChildrenFolderIdsParams): Promise<FolderID[]> {
-		return this.getChildrenFolderIds(folderId, await this.getAllFoldersOfPrivateDrive(driveId, driveKey, true));
+		return this.getChildrenFolderIds(
+			folderId,
+			await this.getAllFoldersOfPrivateDrive({ driveId, driveKey, owner, latestRevisionsOnly: true })
+		);
 	}
-	async getPublicChildrenFolderIds({ folderId, driveId }: getPublicChildrenFolderIdsParams): Promise<FolderID[]> {
-		return this.getChildrenFolderIds(folderId, await this.getAllFoldersOfPublicDrive(driveId, true));
+
+	async getPublicChildrenFolderIds({
+		folderId,
+		owner,
+		driveId
+	}: getPublicChildrenFolderIdsParams): Promise<FolderID[]> {
+		return this.getChildrenFolderIds(
+			folderId,
+			await this.getAllFoldersOfPublicDrive({ driveId, owner, latestRevisionsOnly: true })
+		);
 	}
 
 	/**
@@ -905,7 +926,12 @@ export class ArFSDAO extends ArFSDAOAnonymous {
 
 		// Fetch all of the folder entities within the drive
 		const driveIdOfFolder = folder.driveId;
-		const allFolderEntitiesOfDrive = await this.getAllFoldersOfPrivateDrive(driveIdOfFolder, driveKey, true);
+		const allFolderEntitiesOfDrive = await this.getAllFoldersOfPrivateDrive({
+			driveId: driveIdOfFolder,
+			driveKey,
+			owner,
+			latestRevisionsOnly: true
+		});
 
 		const hierarchy = FolderHierarchy.newFromEntities(allFolderEntitiesOfDrive);
 		const searchFolderIDs = hierarchy.folderIdSubtreeFromFolderId(folderId, maxDepth - 1);
@@ -920,7 +946,12 @@ export class ArFSDAO extends ArFSDAOAnonymous {
 		}
 
 		// Fetch all file entities within all Folders of the drive
-		const childrenFileEntities = await this.getPrivateFilesWithParentFolderIds(searchFolderIDs, driveKey, true);
+		const childrenFileEntities = await this.getPrivateFilesWithParentFolderIds(
+			searchFolderIDs,
+			driveKey,
+			owner,
+			true
+		);
 
 		const children = [...childrenFolderEntities, ...childrenFileEntities];
 

diff --git a/src/arfsdao_anonymous.ts b/src/arfsdao_anonymous.ts
@@ -14,6 +14,12 @@ import { ArweaveAddress } from './arweave_address';
 
 export const graphQLURL = 'https://arweave.net/graphql';
 
+export interface ArFSAllPublicFoldersOfDriveParams {
+	driveId: DriveID;
+	owner: ArweaveAddress;
+	latestRevisionsOnly: boolean;
+}
+
 export interface ArFSListPublicFolderParams {
 	folderId: FolderID;
 	maxDepth: number;
@@ -140,6 +146,7 @@ export class ArFSDAOAnonymous extends ArFSDAOType {
 
 	async getPublicFilesWithParentFolderIds(
 		folderIDs: FolderID[],
+		owner: ArweaveAddress,
 		latestRevisionsOnly = false
 	): Promise<ArFSPublicFile[]> {
 		let cursor = '';
@@ -152,7 +159,8 @@ export class ArFSDAOAnonymous extends ArFSDAOType {
 					{ name: 'Parent-Folder-Id', value: folderIDs },
 					{ name: 'Entity-Type', value: 'file' }
 				],
-				cursor
+				cursor,
+				owner
 			});
 
 			const response = await this.arweave.api.post(graphQLURL, gqlQuery);
@@ -171,7 +179,11 @@ export class ArFSDAOAnonymous extends ArFSDAOType {
 		return latestRevisionsOnly ? allFiles.filter(latestRevisionFilter) : allFiles;
 	}
 
-	async getAllFoldersOfPublicDrive(driveId: DriveID, latestRevisionsOnly = false): Promise<ArFSPublicFolder[]> {
+	async getAllFoldersOfPublicDrive({
+		driveId,
+		owner,
+		latestRevisionsOnly = false
+	}: ArFSAllPublicFoldersOfDriveParams): Promise<ArFSPublicFolder[]> {
 		let cursor = '';
 		let hasNextPage = true;
 		const allFolders: ArFSPublicFolder[] = [];
@@ -182,13 +194,15 @@ export class ArFSDAOAnonymous extends ArFSDAOType {
 					{ name: 'Drive-Id', value: driveId },
 					{ name: 'Entity-Type', value: 'folder' }
 				],
-				cursor
+				cursor,
+				owner
 			});
 
 			const response = await this.arweave.api.post(graphQLURL, gqlQuery);
 			const { data } = response.data;
 			const { transactions } = data;
 			const { edges } = transactions;
+
 			hasNextPage = transactions.pageInfo.hasNextPage;
 			const folders: Promise<ArFSPublicFolder>[] = edges.map(async (edge: GQLEdgeInterface) => {
 				const { node } = edge;
@@ -222,7 +236,11 @@ export class ArFSDAOAnonymous extends ArFSDAOType {
 
 		// Fetch all of the folder entities within the drive
 		const driveIdOfFolder = folder.driveId;
-		const allFolderEntitiesOfDrive = await this.getAllFoldersOfPublicDrive(driveIdOfFolder, true);
+		const allFolderEntitiesOfDrive = await this.getAllFoldersOfPublicDrive({
+			driveId: driveIdOfFolder,
+			owner,
+			latestRevisionsOnly: true
+		});
 
 		// Feed entities to FolderHierarchy
 		const hierarchy = FolderHierarchy.newFromEntities(allFolderEntitiesOfDrive);
@@ -238,7 +256,7 @@ export class ArFSDAOAnonymous extends ArFSDAOType {
 		}
 
 		// Fetch all file entities within all Folders of the drive
-		const childrenFileEntities = await this.getPublicFilesWithParentFolderIds(searchFolderIDs, true);
+		const childrenFileEntities = await this.getPublicFilesWithParentFolderIds(searchFolderIDs, owner, true);
 
 		const children = [...childrenFolderEntities, ...childrenFileEntities];