@aws-amplify/storage 6.0.20 → 6.0.21-gen2-storage.7da2b89.0

package/dist/esm/types/inputs.d.ts

@@ -1,25 +1,59 @@
+import { StrictUnion } from '@aws-amplify/core/internals/utils';
 import { StorageListAllOptions, StorageListPaginateOptions, StorageOptions } from './options';
-export interface StorageOperationInput<Options extends StorageOptions> {
+export type StorageOperationInputType = StrictUnion<StorageOperationInputKey | StorageOperationInputPath>;
+/** @deprecated Use {@link StorageOperationInputPath} instead. */
+export interface StorageOperationInputKey {
+    /** @deprecated Use `path` instead. */
     key: string;
+}
+export interface StorageOperationInputPath {
+    path: string | (({ identityId }: {
+        identityId?: string;
+    }) => string);
+}
+export interface StorageOperationOptionsInput<Options> {
     options?: Options;
 }
-export type StorageGetPropertiesInput<Options extends StorageOptions> = StorageOperationInput<Options>;
-export interface StorageRemoveInput<Options extends StorageOptions> {
+/** @deprecated Use {@link StorageDownloadDataInputPath} instead. */
+export type StorageDownloadDataInputKey<Options extends StorageOptions> = StorageOperationInputKey & StorageOperationOptionsInput<Options>;
+export type StorageDownloadDataInputPath<Options> = StorageOperationInputPath & StorageOperationOptionsInput<Options>;
+export interface StorageOperationInput<Options extends StorageOptions> {
     key: string;
     options?: Options;
 }
+/** @deprecated Use {@link StorageGetPropertiesInputPath} instead. */
+export type StorageGetPropertiesInputKey<Options extends StorageOptions> = StorageOperationInputKey & StorageOperationInput<Options>;
+export type StorageGetPropertiesInputPath<Options> = StorageOperationInputPath & StorageOperationOptionsInput<Options>;
+export type StorageRemoveInputKey<Options> = StorageOperationInputKey & StorageOperationOptionsInput<Options>;
+export type StorageRemoveInputPath<Options> = StorageOperationInputPath & StorageOperationOptionsInput<Options>;
 export interface StorageListInput<Options extends StorageListAllOptions | StorageListPaginateOptions> {
     prefix?: string;
     options?: Options;
 }
-export type StorageGetUrlInput<Options extends StorageOptions> = StorageOperationInput<Options>;
-export type StorageDownloadDataInput<Options extends StorageOptions> = StorageOperationInput<Options>;
+/** @deprecated Use {@link StorageGetUrlInputPath} instead. */
+export type StorageGetUrlInputKey<Options extends StorageOptions> = StorageOperationInputKey & StorageOperationInput<Options>;
+export type StorageGetUrlInputPath<Options> = StorageOperationInputPath & StorageOperationOptionsInput<Options>;
 export type StorageUploadDataInput<Options extends StorageOptions> = StorageOperationInput<Options> & {
     data: StorageUploadDataPayload;
 };
-export interface StorageCopyInput<SourceOptions extends StorageOptions, DestinationOptions extends StorageOptions> {
-    source: SourceOptions;
-    destination: DestinationOptions;
+/** @deprecated Use {@link StorageCopyInputPath} instead. */
+export interface StorageCopyInputKey<SourceOptions extends StorageOptions, DestinationOptions extends StorageOptions> {
+    source: SourceOptions & {
+        path?: never;
+    };
+    destination: DestinationOptions & {
+        path?: never;
+    };
+}
+export interface StorageCopyInputPath {
+    source: StorageOperationInputPath & {
+        /** @deprecated Use path instead. */
+        key?: never;
+    };
+    destination: StorageOperationInputPath & {
+        /** @deprecated Use path instead. */
+        key?: never;
+    };
 }
 /**
  * The data payload type for upload operation.

package/dist/esm/types/options.d.ts

@@ -1,5 +1,6 @@
 import { StorageAccessLevel } from '@aws-amplify/core';
 export interface StorageOptions {
+    /** @deprecated This may be removed in the next major version. */
     accessLevel?: StorageAccessLevel;
 }
 export type StorageListAllOptions = StorageOptions & {

package/dist/esm/types/outputs.d.ts

@@ -1,9 +1,8 @@
 import { ResponseBodyMixin } from '@aws-amplify/core/internals/aws-client-utils';
-export interface StorageItem {
-    /**
-     * Key of the object
-     */
-    key: string;
+/**
+ * Base type for a storage item.
+ */
+export interface StorageItemBase {
     /**
      * Creation date of the object.
      */
@@ -23,7 +22,24 @@ export interface StorageItem {
      */
     metadata?: Record<string, string>;
 }
-export type StorageDownloadDataOutput<T extends StorageItem> = T & {
+/** @deprecated Use {@link StorageItemPath} instead. */
+export type StorageItemKey = StorageItemBase & {
+    /**
+     * Key of the object.
+     */
+    key: string;
+};
+export type StorageItemPath = StorageItemBase & {
+    /**
+     * Path of the object.
+     */
+    path: string;
+};
+/**
+ * A storage item can be identified either by a key or a path.
+ */
+export type StorageItem = StorageItemKey | StorageItemPath;
+export type StorageDownloadDataOutput<Item extends StorageItem> = Item & {
     body: ResponseBodyMixin;
 };
 export interface StorageGetUrlOutput {

package/package.json

@@ -1,109 +1,109 @@
 {
-	"name": "@aws-amplify/storage",
-	"version": "6.0.20",
-	"description": "Storage category of aws-amplify",
-	"main": "./dist/cjs/index.js",
-	"module": "./dist/esm/index.mjs",
-	"react-native": {
-		"./dist/cjs/index": "./src/index.ts",
-		"fast-xml-parser": "fast-xml-parser",
-		"buffer": "buffer"
-	},
-	"typings": "./dist/esm/index.d.ts",
-	"browser": {
-		"./dist/esm/providers/s3/utils/client/runtime/base64/index.native.mjs": "./dist/esm/providers/s3/utils/client/runtime/base64/index.browser.mjs",
-		"./dist/esm/providers/s3/utils/client/runtime/s3TransferHandler/fetch.mjs": "./dist/esm/providers/s3/utils/client/runtime/s3TransferHandler/xhr.mjs",
-		"./dist/esm/providers/s3/utils/client/runtime/xmlParser/pureJs.mjs": "./dist/esm/providers/s3/utils/client/runtime/xmlParser/dom.mjs",
-		"fast-xml-parser": false,
-		"buffer": false
-	},
-	"sideEffects": false,
-	"publishConfig": {
-		"access": "public"
-	},
-	"scripts": {
-		"test": "npm run lint && jest -w 1 --coverage --logHeapUsage",
-		"build-with-test": "npm test && npm run build",
-		"build:umd": "webpack && webpack --config ./webpack.config.dev.js",
-		"build:esm-cjs": "rollup -c rollup.config.mjs",
-		"build:watch": "npm run build:esm-cjs -- --watch",
-		"build": "npm run clean && npm run build:esm-cjs && npm run build:umd",
-		"clean": "npm run clean:size && rimraf lib-esm lib dist",
-		"clean:size": "rimraf dual-publish-tmp tmp*",
-		"format": "echo \"Not implemented\"",
-		"lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage",
-		"lint:fix": "eslint '**/*.{ts,tsx}' --fix",
-		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 90.31"
-	},
-	"typesVersions": {
-		">=4.2": {
-			"s3": [
-				"./dist/esm/providers/s3/index.d.ts"
-			],
-			"server": [
-				"./dist/esm/server.d.ts"
-			],
-			"s3/server": [
-				"./dist/esm/providers/s3/server.d.ts"
-			]
-		}
-	},
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/aws-amplify/amplify-js.git"
-	},
-	"author": "Amazon Web Services",
-	"license": "Apache-2.0",
-	"bugs": {
-		"url": "https://github.com/aws/aws-amplify/issues"
-	},
-	"homepage": "https://aws-amplify.github.io/",
-	"files": [
-		"dist/cjs",
-		"dist/esm",
-		"src",
-		"server",
-		"s3"
-	],
-	"dependencies": {
-		"@aws-sdk/types": "3.398.0",
-		"@smithy/md5-js": "2.0.7",
-		"buffer": "4.9.2",
-		"fast-xml-parser": "^4.2.5",
-		"tslib": "^2.5.0"
-	},
-	"exports": {
-		".": {
-			"types": "./dist/esm/index.d.ts",
-			"import": "./dist/esm/index.mjs",
-			"require": "./dist/cjs/index.js",
-			"react-native": "./src/index.ts"
-		},
-		"./server": {
-			"types": "./dist/esm/server.d.ts",
-			"import": "./dist/esm/server.mjs",
-			"require": "./dist/cjs/server.js"
-		},
-		"./s3": {
-			"types": "./dist/esm/providers/s3/index.d.ts",
-			"import": "./dist/esm/providers/s3/index.mjs",
-			"require": "./dist/cjs/providers/s3/index.js",
-			"react-native": "./src/providers/s3/index.ts"
-		},
-		"./s3/server": {
-			"types": "./dist/esm/providers/s3/server.d.ts",
-			"import": "./dist/esm/providers/s3/server.mjs",
-			"require": "./dist/cjs/providers/s3/server.js"
-		},
-		"./package.json": "./package.json"
-	},
-	"peerDependencies": {
-		"@aws-amplify/core": "^6.0.0"
-	},
-	"devDependencies": {
-		"@aws-amplify/core": "6.0.20",
-		"@aws-amplify/react-native": "1.0.20",
-		"typescript": "5.0.2"
-	},
-	"gitHead": "bb280d64e6b5aa7679a2a6461dceeb27953ccdb1"
+  "name": "@aws-amplify/storage",
+  "version": "6.0.21-gen2-storage.7da2b89.0+7da2b89",
+  "description": "Storage category of aws-amplify",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.mjs",
+  "react-native": {
+    "./dist/cjs/index": "./src/index.ts",
+    "fast-xml-parser": "fast-xml-parser",
+    "buffer": "buffer"
+  },
+  "typings": "./dist/esm/index.d.ts",
+  "browser": {
+    "./dist/esm/providers/s3/utils/client/runtime/base64/index.native.mjs": "./dist/esm/providers/s3/utils/client/runtime/base64/index.browser.mjs",
+    "./dist/esm/providers/s3/utils/client/runtime/s3TransferHandler/fetch.mjs": "./dist/esm/providers/s3/utils/client/runtime/s3TransferHandler/xhr.mjs",
+    "./dist/esm/providers/s3/utils/client/runtime/xmlParser/pureJs.mjs": "./dist/esm/providers/s3/utils/client/runtime/xmlParser/dom.mjs",
+    "fast-xml-parser": false,
+    "buffer": false
+  },
+  "sideEffects": false,
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "test": "npm run lint && jest -w 1 --coverage --logHeapUsage",
+    "build-with-test": "npm test && npm run build",
+    "build:umd": "webpack && webpack --config ./webpack.config.dev.js",
+    "build:esm-cjs": "rollup -c rollup.config.mjs",
+    "build:watch": "npm run build:esm-cjs -- --watch",
+    "build": "npm run clean && npm run build:esm-cjs && npm run build:umd",
+    "clean": "npm run clean:size && rimraf lib-esm lib dist",
+    "clean:size": "rimraf dual-publish-tmp tmp*",
+    "format": "echo \"Not implemented\"",
+    "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage",
+    "lint:fix": "eslint '**/*.{ts,tsx}' --fix",
+    "ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 90.31"
+  },
+  "typesVersions": {
+    ">=4.2": {
+      "s3": [
+        "./dist/esm/providers/s3/index.d.ts"
+      ],
+      "server": [
+        "./dist/esm/server.d.ts"
+      ],
+      "s3/server": [
+        "./dist/esm/providers/s3/server.d.ts"
+      ]
+    }
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/aws-amplify/amplify-js.git"
+  },
+  "author": "Amazon Web Services",
+  "license": "Apache-2.0",
+  "bugs": {
+    "url": "https://github.com/aws/aws-amplify/issues"
+  },
+  "homepage": "https://aws-amplify.github.io/",
+  "files": [
+    "dist/cjs",
+    "dist/esm",
+    "src",
+    "server",
+    "s3"
+  ],
+  "dependencies": {
+    "@aws-sdk/types": "3.398.0",
+    "@smithy/md5-js": "2.0.7",
+    "buffer": "4.9.2",
+    "fast-xml-parser": "^4.2.5",
+    "tslib": "^2.5.0"
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/esm/index.d.ts",
+      "import": "./dist/esm/index.mjs",
+      "require": "./dist/cjs/index.js",
+      "react-native": "./src/index.ts"
+    },
+    "./server": {
+      "types": "./dist/esm/server.d.ts",
+      "import": "./dist/esm/server.mjs",
+      "require": "./dist/cjs/server.js"
+    },
+    "./s3": {
+      "types": "./dist/esm/providers/s3/index.d.ts",
+      "import": "./dist/esm/providers/s3/index.mjs",
+      "require": "./dist/cjs/providers/s3/index.js",
+      "react-native": "./src/providers/s3/index.ts"
+    },
+    "./s3/server": {
+      "types": "./dist/esm/providers/s3/server.d.ts",
+      "import": "./dist/esm/providers/s3/server.mjs",
+      "require": "./dist/cjs/providers/s3/server.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "peerDependencies": {
+    "@aws-amplify/core": "6.0.21-gen2-storage.7da2b89.0+7da2b89"
+  },
+  "devDependencies": {
+    "@aws-amplify/core": "6.0.21-gen2-storage.7da2b89.0+7da2b89",
+    "@aws-amplify/react-native": "1.0.21-gen2-storage.7da2b89.0+7da2b89",
+    "typescript": "5.0.2"
+  },
+  "gitHead": "7da2b89404ba47b1a3f774a4b799e591b8cbebfb"
 }

package/src/errors/types/validation.ts

@@ -9,11 +9,15 @@ export enum StorageValidationErrorCode {
 	NoKey = 'NoKey',
 	NoSourceKey = 'NoSourceKey',
 	NoDestinationKey = 'NoDestinationKey',
+	NoSourcePath = 'NoSourcePath',
+	NoDestinationPath = 'NoDestinationPath',
 	NoBucket = 'NoBucket',
 	NoRegion = 'NoRegion',
-	UrlExpirationMaxLimitExceed = 'UrlExpirationMaxLimitExceed',
-	ObjectIsTooLarge = 'ObjectIsTooLarge',
+	InvalidStorageOperationInput = 'InvalidStorageOperationInput',
+	InvalidStoragePathInput = 'InvalidStoragePathInput',
 	InvalidUploadSource = 'InvalidUploadSource',
+	ObjectIsTooLarge = 'ObjectIsTooLarge',
+	UrlExpirationMaxLimitExceed = 'UrlExpirationMaxLimitExceed',
 }
 
 export const validationErrorMap: AmplifyErrorMap<StorageValidationErrorCode> = {
@@ -33,6 +37,12 @@ export const validationErrorMap: AmplifyErrorMap<StorageValidationErrorCode> = {
 	[StorageValidationErrorCode.NoDestinationKey]: {
 		message: 'Missing destination key in copy api call.',
 	},
+	[StorageValidationErrorCode.NoSourcePath]: {
+		message: 'Missing source path in copy api call.',
+	},
+	[StorageValidationErrorCode.NoDestinationPath]: {
+		message: 'Missing destination path in copy api call.',
+	},
 	[StorageValidationErrorCode.NoBucket]: {
 		message: 'Missing bucket name while accessing object.',
 	},
@@ -49,4 +59,11 @@ export const validationErrorMap: AmplifyErrorMap<StorageValidationErrorCode> = {
 		message:
 			'Upload source type can only be a `Blob`, `File`, `ArrayBuffer`, or `string`.',
 	},
+	[StorageValidationErrorCode.InvalidStorageOperationInput]: {
+		message:
+			'Path or key parameter must be specified in the input. Both can not be specified at the same time.',
+	},
+	[StorageValidationErrorCode.InvalidStoragePathInput]: {
+		message: 'Input `path` does not allow a leading slash (/).',
+	},
 };

package/src/providers/s3/apis/copy.ts

@@ -3,21 +3,44 @@
 
 import { Amplify } from '@aws-amplify/core';
 
-import { CopyInput, CopyOutput, S3Exception } from '../types';
-import { StorageValidationErrorCode } from '../../../errors/types/validation';
+import {
+	CopyInput,
+	CopyInputKey,
+	CopyInputPath,
+	CopyOutput,
+	CopyOutputKey,
+	CopyOutputPath,
+} from '../types';
 
 import { copy as copyInternal } from './internal/copy';
 
-/**
- * Copy an object from a source object to a new object within the same bucket. Can optionally copy files across
- * different level or identityId (if source object's level is 'protected').
- *
- * @param input - The CopyInput object.
- * @returns Output containing the destination key.
- * @throws service: {@link S3Exception} - Thrown when checking for existence of the object
- * @throws validation: {@link StorageValidationErrorCode } - Thrown when
- * source or destination key are not defined.
- */
-export const copy = async (input: CopyInput): Promise<CopyOutput> => {
-	return copyInternal(Amplify, input);
-};
+interface Copy {
+	/**
+	 * Copy an object from a source to a destination object within the same bucket.
+	 *
+	 * @param input - The CopyInputPath object.
+	 * @returns Output containing the destination object path.
+	 * @throws service: `S3Exception` - Thrown when checking for existence of the object
+	 * @throws validation: `StorageValidationErrorCode` - Thrown when
+	 * source or destination path is not defined.
+	 */
+	(input: CopyInputPath): Promise<CopyOutputPath>;
+	/**
+	 * @deprecated The `key` and `accessLevel` parameters are deprecated and may be removed in the next major version.
+	 * Please use {@link https://docs.amplify.aws/react/build-a-backend/storage/copy | path} instead.
+	 *
+	 * Copy an object from a source to a destination object within the same bucket. Can optionally copy files across
+	 * different accessLevel or identityId (if source object's accessLevel is 'protected').
+	 *
+	 * @param input - The CopyInputKey object.
+	 * @returns Output containing the destination object key.
+	 * @throws service: `S3Exception` - Thrown when checking for existence of the object
+	 * @throws validation: `StorageValidationErrorCode` - Thrown when
+	 * source or destination key is not defined.
+	 */
+	(input: CopyInputKey): Promise<CopyOutputKey>;
+}
+
+export const copy: Copy = <Output extends CopyOutput>(
+	input: CopyInput,
+): Promise<Output> => copyInternal(Amplify, input) as Promise<Output>;

package/src/providers/s3/apis/downloadData.ts

@@ -4,45 +4,97 @@
 import { Amplify } from '@aws-amplify/core';
 import { StorageAction } from '@aws-amplify/core/internals/utils';
 
-import { DownloadDataInput, DownloadDataOutput, S3Exception } from '../types';
+import {
+	DownloadDataInput,
+	DownloadDataInputKey,
+	DownloadDataInputPath,
+	DownloadDataOutput,
+	DownloadDataOutputKey,
+	DownloadDataOutputPath,
+} from '../types';
 import { resolveS3ConfigAndInput } from '../utils/resolveS3ConfigAndInput';
-import { StorageValidationErrorCode } from '../../../errors/types/validation';
-import { createDownloadTask } from '../utils';
+import { createDownloadTask, validateStorageOperationInput } from '../utils';
 import { getObject } from '../utils/client';
 import { getStorageUserAgentValue } from '../utils/userAgent';
 import { logger } from '../../../utils';
+import {
+	StorageDownloadDataOutput,
+	StorageItemKey,
+	StorageItemPath,
+} from '../../../types';
+import { STORAGE_INPUT_KEY } from '../utils/constants';
 
-/**
- * Download S3 object data to memory
- *
- * @param input - The DownloadDataInput object.
- * @returns A cancelable task exposing result promise from `result` property.
- * @throws service: {@link S3Exception} - thrown when checking for existence of the object
- * @throws validation: {@link StorageValidationErrorCode } - Validation errors
- *
- * @example
- * ```ts
- * // Download a file from s3 bucket
- * const { body, eTag } = await downloadData({ key, data: file, options: {
- *   onProgress, // Optional progress callback.
- * } }).result;
- * ```
- * @example
- * ```ts
- * // Cancel a task
- * const downloadTask = downloadData({ key, data: file });
- * //...
- * downloadTask.cancel();
- * try {
- * 	await downloadTask.result;
- * } catch (error) {
- * 	if(isCancelError(error)) {
- *    // Handle error thrown by task cancelation.
- * 	}
- * }
- *```
- */
-export const downloadData = (input: DownloadDataInput): DownloadDataOutput => {
+interface DownloadData {
+	/**
+	 * Download S3 object data to memory
+	 *
+	 * @param input - The DownloadDataInputPath object.
+	 * @returns A cancelable task exposing result promise from `result` property.
+	 * @throws service: `S3Exception` - thrown when checking for existence of the object
+	 * @throws validation: `StorageValidationErrorCode` - Validation errors
+	 *
+	 * @example
+	 * ```ts
+	 * // Download a file from s3 bucket
+	 * const { body, eTag } = await downloadData({ path, options: {
+	 *   onProgress, // Optional progress callback.
+	 * } }).result;
+	 * ```
+	 * @example
+	 * ```ts
+	 * // Cancel a task
+	 * const downloadTask = downloadData({ path });
+	 * //...
+	 * downloadTask.cancel();
+	 * try {
+	 * 	await downloadTask.result;
+	 * } catch (error) {
+	 * 	if(isCancelError(error)) {
+	 *    // Handle error thrown by task cancelation.
+	 * 	}
+	 * }
+	 *```
+	 */
+	(input: DownloadDataInputPath): DownloadDataOutputPath;
+	/**
+	 * @deprecated The `key` and `accessLevel` parameters are deprecated and may be removed in the next major version.
+	 * Please use {@link https://docs.amplify.aws/react/build-a-backend/storage/download/#downloaddata | path} instead.
+	 *
+	 * Download S3 object data to memory
+	 *
+	 * @param input - The DownloadDataInputKey object.
+	 * @returns A cancelable task exposing result promise from `result` property.
+	 * @throws service: `S3Exception` - thrown when checking for existence of the object
+	 * @throws validation: `StorageValidationErrorCode` - Validation errors
+	 *
+	 * @example
+	 * ```ts
+	 * // Download a file from s3 bucket
+	 * const { body, eTag } = await downloadData({ key, options: {
+	 *   onProgress, // Optional progress callback.
+	 * } }).result;
+	 * ```
+	 * @example
+	 * ```ts
+	 * // Cancel a task
+	 * const downloadTask = downloadData({ key });
+	 * //...
+	 * downloadTask.cancel();
+	 * try {
+	 * 	await downloadTask.result;
+	 * } catch (error) {
+	 * 	if(isCancelError(error)) {
+	 *    // Handle error thrown by task cancelation.
+	 * 	}
+	 * }
+	 *```
+	 */
+	(input: DownloadDataInputKey): DownloadDataOutputKey;
+}
+
+export const downloadData: DownloadData = <Output extends DownloadDataOutput>(
+	input: DownloadDataInput,
+): Output => {
 	const abortController = new AbortController();
 
 	const downloadTask = createDownloadTask({
@@ -52,22 +104,25 @@ export const downloadData = (input: DownloadDataInput): DownloadDataOutput => {
 		},
 	});
 
-	return downloadTask;
+	return downloadTask as Output;
 };
 
 const downloadDataJob =
-	(
-		{ options: downloadDataOptions, key }: DownloadDataInput,
-		abortSignal: AbortSignal,
-	) =>
-	async () => {
-		const { bucket, keyPrefix, s3Config } = await resolveS3ConfigAndInput(
-			Amplify,
-			downloadDataOptions,
+	(downloadDataInput: DownloadDataInput, abortSignal: AbortSignal) =>
+	async (): Promise<
+		StorageDownloadDataOutput<StorageItemKey | StorageItemPath>
+	> => {
+		const { options: downloadDataOptions } = downloadDataInput;
+		const { bucket, keyPrefix, s3Config, identityId } =
+			await resolveS3ConfigAndInput(Amplify, downloadDataOptions);
+		const { inputType, objectKey } = validateStorageOperationInput(
+			downloadDataInput,
+			identityId,
 		);
-		const finalKey = keyPrefix + key;
+		const finalKey =
+			inputType === STORAGE_INPUT_KEY ? keyPrefix + objectKey : objectKey;
 
-		logger.debug(`download ${key} from ${finalKey}.`);
+		logger.debug(`download ${objectKey} from ${finalKey}.`);
 
 		const {
 			Body: body,
@@ -93,8 +148,7 @@ const downloadDataJob =
 			},
 		);
 
-		return {
-			key,
+		const result = {
 			body,
 			lastModified,
 			size,
@@ -103,4 +157,8 @@ const downloadDataJob =
 			metadata,
 			versionId,
 		};
+
+		return inputType === STORAGE_INPUT_KEY
+			? { key: objectKey, ...result }
+			: { path: finalKey, ...result };
 	};