Bugfix/project fix

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "workbench.colorCustomizations": {
+        "activityBar.background": "#521733",
+        "titleBar.activeBackground": "#732147",
+        "titleBar.activeForeground": "#FEFCFD"
+    }
+}

Files-Cloud-Storage/lib/aws/upload.js

@@ -201,9 +201,10 @@ module.exports = class AwsS3FileHelper {
 	 * @param {string} destFilePath - Stored file path - i.e location from bucket - ex - users/profile.png
 	 * @param {string} bucketName - aws s3 storage bucket in which action is peformed over file
 	 * @param  {string} bucketRegion - aws region where bucket will be located, ex - ap-south-1
+	 * @param  {Number} expires - link expiration in seconds
 	 * @returns {Promise<string>} Get downloadable url link
 	 */
-	static async getDownloadableUrl(destFilePath, bucketName, bucketRegion) {
+	static async getDownloadableUrl(destFilePath, bucketName, bucketRegion, expires = '') {
 		if (!destFilePath) {
 			const error = new Error('destFilePath is not passed in parameter')
 			error.code = 500
@@ -227,13 +228,35 @@ module.exports = class AwsS3FileHelper {
 			error.code = 500
 			throw error
 		}
-
 		try {
-			const downloadableUrl = `https://${bucketName}.s3.${bucketRegion}.amazonaws.com/${destFilePath}`
-			return downloadableUrl
+			/* Instantiate S3 class with credentials and region */
+			const s3 = new S3({
+				region: bucketRegion,
+			})
+
+			// Determine expiry
+			const expiry = expires ? parseInt(expires) : 1800;// Default expiry: 5 min (in seconds)
+
+			/* Get the signed URL with the specified expiry */
+			const params = {
+				Bucket: bucketName,
+				Key: destFilePath,
+				Expires: expiry, 
+			}
+
+			const signedUrl = await s3.getSignedUrlPromise('getObject', params)
+
+			return signedUrl
 		} catch (error) {
 			throw error
 		}
+		// keeping this here to enable in 3.0
+		// try {
+		// 	const downloadableUrl = `https://${bucketName}.s3.${bucketRegion}.amazonaws.com/${destFilePath}`
+		// 	return downloadableUrl
+		// } catch (error) {
+		// 	throw error
+		// }
 	}
 
 	/**

Files-Cloud-Storage/lib/gcp/upload.js

@@ -246,6 +246,81 @@ module.exports = class GcpFileHelper {
 		}
 	}
 
+	/**
+      * Get downloadable url of uploaded object
+      * @method
+      * @name getSignedDownloadableUrl
+      * @param  {destFilePath} destFilePath     - Stored file path - location from bucket - ex - users/profile.png
+      * @param  {string} bucketName             - google cloud storage bucket in which action is peformed over file
+      * @param  {string} gcpProjectId           - google cloud storage project id
+      * @param  {string} gcpJsonFilePath        - google cloud storage json configuration file absolute path for connectivity
+      * @param  {string} expiry                 - downloadable url expiration time - In ms from current time - type number | string | Date
+      * @returns {Promise<string>}              - Downloadable url
+      * @see gcpProjectId                       - Get from gcp console
+      * @see gcpJsonFilePath -                  - Download file from manage storage api key section
+    */
+    static async getSignedDownloadableUrl({ destFilePath, bucketName, gcpProjectId, gcpJsonFilePath, expiry }) {
+        // Ensure all parameters are provided
+        if (!destFilePath) {
+            const error = new Error('destFilePath is not passed in parameter')
+            error.code = 500
+            throw error
+        }
+
+        if (typeof destFilePath !== 'string') {
+            const error = new Error('expected destFilePath as string')
+            error.code = 500
+            throw error
+        }
+
+        if (!bucketName) {
+            const error = new Error('bucketName is not passed in parameter')
+            error.code = 500
+            throw error
+        }
+
+        if (!gcpProjectId) {
+            const error = new Error('gcpProjectId is not passed in parameter')
+            error.code = 500
+            throw error
+        }
+
+        if (!gcpJsonFilePath) {
+            const error = new Error('gcpJsonFilePath is not passed in parameter')
+            error.code = 500
+            throw error
+        }
+
+        if (typeof gcpJsonFilePath !== 'string') {
+            const error = new Error('expected gcpJsonFilePath as string')
+            error.code = 500
+            throw error
+        }
+		// Set default expiry time to 15 minutes (if expiry is not provided)
+		const defaultExpiry = 30 * 60 * 1000 // 15 minutes in milliseconds
+		const expires = expiry || (Date.now() + defaultExpiry)
+
+        // Instantiate the cloud storage client
+        const storage = new Storage({
+            projectId: gcpProjectId,
+            keyFilename: gcpJsonFilePath
+        })
+
+        try {
+            // Generate a signed URL for downloading the file
+            const options = {
+                version: 'v4',
+                action: 'read',
+                expires: expires,
+            }
+            const [signedUrl] = await storage.bucket(bucketName).file(destFilePath).getSignedUrl(options)
+
+            return signedUrl; // Return the signed URL for downloading the file
+        } catch (error) {
+            throw error
+        }
+    }
+
 	/**
 	 * Delete a folder and its contents from a GCP bucket.
 	 * @param {string} bucketName - Google Cloud Storage bucket name.

Files-Cloud-Storage/lib/oci/upload.js

@@ -238,10 +238,12 @@ module.exports = class OCIFileHelper {
 	 * @param {string} destFilePath - Stored file path - i.e location from bucket - ex - users/profile.png
 	 * @param {string} bucketName - oci storage bucket in which action is peformed over file
 	 * @param  {string} bucketRegion - oci region where bucket will be located, ex - ap-south-1
+	 * @param  {string} accessKeyId - oci access key id
+	 * @param  {string} secretAccessKey - oci secret access key
 	 * @returns {Promise<string>} Get downloadable url link
 	 */
 
-	static async getDownloadableUrl({ destFilePath, bucketName, endpoint }) {
+	static async getDownloadableUrl({ destFilePath, bucketName, endpoint, expires = '',  accessKeyId = '', secretAccessKey = '', bucketRegion = '' }) {
 		if (!destFilePath) {
 			const error = new Error('destFilePath is not passed in parameter')
 			error.code = 500
@@ -265,13 +267,47 @@ module.exports = class OCIFileHelper {
 			error.code = 500
 			throw error
 		}
-
+		
 		try {
-			let downloadableUrl = `${endpoint}/${bucketName}/${destFilePath}`
+			/* Instantiate S3 class with credentials and region */
+
+			const s3Config = {
+				signatureVersion: 'v4',
+				s3ForcePathStyle: true,
+				endpoint: endpoint,
+			}
+
+			// Add accessKeyId, secretAccessKey, and region if provided
+			if (accessKeyId && secretAccessKey && bucketRegion) {
+				s3Config.accessKeyId = accessKeyId;
+				s3Config.secretAccessKey = secretAccessKey;
+				s3Config.region = bucketRegion;
+			}
+
+			const s3 = new S3(s3Config);
+
+			const expiry = expires ? parseInt(expires) : 1800;// Default expiry: 5min (in seconds)
+			/* Get the signed URL with the specified expiry */
+			const params = {
+				Bucket: bucketName,
+				Key: destFilePath,
+				Expires: expiry
+			}
+
+			const downloadableUrl = await s3.getSignedUrlPromise('getObject', params)
+
 			return { downloadableUrl, filePath: destFilePath }
 		} catch (error) {
-			throw error
+			throw error;
 		}
+
+		// Keeping it here. in 3.0 we have to enable this logic and move above logic to new function
+		// try {
+		// 	let downloadableUrl = `${endpoint}/${bucketName}/${destFilePath}`
+		// 	return { downloadableUrl, filePath: destFilePath }
+		// } catch (error) {
+		// 	throw error
+		// }
 	}
 	/**
 	 * Remove a folder and its contents from an OCI bucket

Files-Cloud-Storage/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "elevate-cloud-storage",
-	"version": "2.1.0",
+	"version": "2.6.4",
 	"description": "This is npm package which exports the functions to upload file in GCP, AWS S3 and AZURE",
 	"main": "index.js",
 	"scripts": {