@cooperation/vc-storage 1.0.8 → 1.0.11

package/dist/models/GoogleDriveStorage.js

@@ -73,12 +73,13 @@ export class GoogleDriveStorage {
             const fileMetadata = {
                 name: data.fileName,
                 parents: [folderId], // Specify the folder ID
-                mimeType: 'application/json', // Use provided MIME type or default to JSON
+                mimeType: data.mimeType,
             };
             let uploadUrl = 'https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart';
             const formData = new FormData();
             formData.append('metadata', new Blob([JSON.stringify(fileMetadata)], { type: 'application/json' }));
             formData.append('file', new Blob([data.body], { type: fileMetadata.mimeType })); // Set file data and MIME type
+            // Upload file to Google Drive
             const file = await this.fetcher({
                 method: 'POST',
                 headers: {},
@@ -86,10 +87,25 @@ export class GoogleDriveStorage {
                 url: uploadUrl,
             });
             console.log('File uploaded successfully:', file.id);
-            return file;
+            // Set the file permission to "Anyone with the link" can view
+            const permissionUrl = `https://www.googleapis.com/drive/v3/files/${file.id}/permissions`;
+            const permissionData = {
+                role: 'reader',
+                type: 'anyone', // Public access
+            };
+            await this.fetcher({
+                method: 'POST',
+                url: permissionUrl,
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify(permissionData),
+            });
+            console.log('Permission set to public for file:', file.id);
+            return { id: file.id };
         }
         catch (error) {
-            console.error('Error uploading file:', error.message);
+            console.error('Error uploading file or setting permission:', error.message);
             return null;
         }
     }
@@ -167,16 +183,66 @@ export class GoogleDriveStorage {
      * @returns file content
      */
     async retrieve(id) {
+        const metadataUrl = `https://www.googleapis.com/drive/v3/files/${id}?fields=name`;
+        const dataUrl = `https://www.googleapis.com/drive/v3/files/${id}?alt=media`;
         try {
-            const file = await this.fetcher({
+            console.log(`Starting retrieval for file ID: ${id}`);
+            // Fetch file metadata to get the name
+            const metadataResponse = await fetch(metadataUrl, {
                 method: 'GET',
-                headers: {},
-                url: `https://www.googleapis.com/drive/v3/files/${id}?alt=media`,
+                headers: {
+                    Authorization: `Bearer ${this.accessToken}`,
+                },
+            });
+            if (!metadataResponse.ok) {
+                const errorData = await metadataResponse.json();
+                console.error(`Failed to retrieve metadata for file ID ${id}:`, errorData);
+                return null;
+            }
+            const metadata = await metadataResponse.json();
+            const fileName = metadata.name;
+            console.log(`File name retrieved: ${fileName}`);
+            // Fetch actual file data
+            const dataResponse = await fetch(dataUrl, {
+                method: 'GET',
+                headers: {
+                    Authorization: `Bearer ${this.accessToken}`,
+                },
             });
-            return file;
+            if (!dataResponse.ok) {
+                const errorData = await dataResponse.json();
+                console.error(`Failed to retrieve file data for ID ${id}:`, errorData);
+                return null;
+            }
+            const contentType = dataResponse.headers.get('Content-Type');
+            console.log(`File content type: ${contentType}`);
+            let fileData;
+            if (contentType?.includes('application/json')) {
+                fileData = await dataResponse.json();
+            }
+            else if (contentType?.includes('text') || contentType?.includes('image/svg+xml')) {
+                fileData = await dataResponse.text(); // Fetch SVG files as text for easy manipulation
+            }
+            else if (contentType?.includes('image') ||
+                contentType?.includes('video') ||
+                contentType?.includes('audio') ||
+                contentType?.includes('application/octet-stream') ||
+                contentType?.includes('application/pdf') ||
+                contentType?.includes('application/msword') ||
+                contentType?.includes('application/vnd.openxmlformats-officedocument.wordprocessingml.document') ||
+                contentType?.includes('application/vnd.ms-excel') ||
+                contentType?.includes('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')) {
+                fileData = await dataResponse.blob();
+            }
+            else {
+                fileData = await dataResponse.arrayBuffer(); // Fallback for other binary types
+            }
+            console.log('🚀 ~ GoogleDriveStorage ~ retrieve ~ fileData:', fileData);
+            // Return file ID, name, and data
+            return { id, name: fileName, data: fileData };
         }
         catch (error) {
-            console.error('Error retrieving file:', error);
+            console.error(`Error retrieving file with ID ${id}:`, error.message);
             return null;
         }
     }
@@ -309,6 +375,31 @@ export class GoogleDriveStorage {
             return []; // Return an empty array on error
         }
     }
+    /**
+     * Update the name of a file in Google Drive
+     * @param fileId - The ID of the file to update
+     * @param newFileName - The new name for the file
+     * @returns The updated file metadata, including the new name
+     */
+    async updateFileName(fileId, newFileName) {
+        try {
+            const metadata = {
+                name: newFileName, // New name for the file
+            };
+            const updatedFile = await this.fetcher({
+                method: 'PATCH',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify(metadata),
+                url: `https://www.googleapis.com/drive/v3/files/${fileId}`,
+            });
+            console.log('File name updated successfully:', updatedFile.name);
+            return updatedFile;
+        }
+        catch (error) {
+            console.error('Error updating file name:', error.message);
+            throw error;
+        }
+    }
     /**
      * Delete file by id
      * @param id

package/dist/types/models/GoogleDriveStorage.d.ts

@@ -45,7 +45,11 @@ export declare class GoogleDriveStorage {
      * @param id
      * @returns file content
      */
-    retrieve(id: string): Promise<any>;
+    retrieve(id: string): Promise<{
+        id: string;
+        name: string;
+        data: any;
+    } | null>;
     /**
      * Get folder by folderId, if folderId == null you will have them all
      * @param id [Optional]
@@ -64,7 +68,14 @@ export declare class GoogleDriveStorage {
      * @param type
      * @returns
      */
-    getAllFilesByType(type: 'KEYPAIRs' | 'VCs' | 'SESSIONs' | 'DIDs' | 'RECOMMENDATIONs'): Promise<FileContent[]>;
+    getAllFilesByType(type: 'KEYPAIRs' | 'VCs' | 'SESSIONs' | 'DIDs' | 'RECOMMENDATIONs' | 'MEDIAs'): Promise<FileContent[]>;
+    /**
+     * Update the name of a file in Google Drive
+     * @param fileId - The ID of the file to update
+     * @param newFileName - The new name for the file
+     * @returns The updated file metadata, including the new name
+     */
+    updateFileName(fileId: string, newFileName: string): Promise<any>;
     /**
      * Delete file by id
      * @param id

package/dist/types/utils/google.d.ts

@@ -14,9 +14,11 @@ export declare function saveToGoogleDrive(storage: GoogleDriveStorage, data: any
  * Upload an image to Google Drive in the Credentials/MEDIAs folder.
  * @param {GoogleDriveStorage} storage - The GoogleDriveStorage instance.
  * @param {File} imageFile - The image file to upload.
- * @returns {Promise<object>} - The uploaded image file object.
+ * @returns {Promise<>} - The uploaded image file object.
  * @throws Will throw an error if the upload operation fails.
  */
-export declare function uploadImageToGoogleDrive(storage: GoogleDriveStorage, imageFile: File): Promise<object>;
+export declare function uploadImageToGoogleDrive(storage: GoogleDriveStorage, imageFile: File): Promise<{
+    id: string;
+}>;
 export declare function generateViewLink(fileId: string): string;
 export declare function extractGoogleDriveFileId(url: string): string | null;

package/dist/utils/google.js

@@ -63,38 +63,28 @@ export async function saveToGoogleDrive(storage, data, type, uuid) {
  * Upload an image to Google Drive in the Credentials/MEDIAs folder.
  * @param {GoogleDriveStorage} storage - The GoogleDriveStorage instance.
  * @param {File} imageFile - The image file to upload.
- * @returns {Promise<object>} - The uploaded image file object.
+ * @returns {Promise<>} - The uploaded image file object.
  * @throws Will throw an error if the upload operation fails.
  */
 export async function uploadImageToGoogleDrive(storage, imageFile) {
     try {
-        // Get all root folders
         const rootFolders = await storage.findFolders();
-        console.log('Root folders:', rootFolders);
-        // Find or create the "Credentials" folder
         let credentialsFolder = rootFolders.find((f) => f.name === 'Credentials');
         let credentialsFolderId;
         if (!credentialsFolder) {
             credentialsFolderId = await storage.createFolder('Credentials');
-            console.log('Created Credentials folder with ID:', credentialsFolderId);
         }
         else {
             credentialsFolderId = credentialsFolder.id;
-            console.log('Found Credentials folder with ID:', credentialsFolderId);
         }
-        // Get subfolders within the "Credentials" folder
         const subfolders = await storage.findFolders(credentialsFolderId);
-        console.log(`Subfolders in Credentials (ID: ${credentialsFolderId}):`, subfolders);
-        // Find or create the "MEDIAs" folder
         let mediasFolder = subfolders.find((f) => f.name === 'MEDIAs');
         let mediasFolderId;
         if (!mediasFolder) {
             mediasFolderId = await storage.createFolder('MEDIAs', credentialsFolderId);
-            console.log('Created MEDIAs folder with ID:', mediasFolderId);
         }
         else {
             mediasFolderId = mediasFolder.id;
-            console.log('Found MEDIAs folder with ID:', mediasFolderId);
         }
         // Prepare the image file data
         const imageData = {
@@ -105,10 +95,6 @@ export async function uploadImageToGoogleDrive(storage, imageFile) {
         // Save the image in the "MEDIAs" folder
         const uploadedImage = await storage.save(imageData, mediasFolderId);
         console.log(`Image uploaded: ${uploadedImage?.id} to MEDIAs folder in Credentials`);
-        if (uploadedImage && uploadedImage.id) {
-            console.log('Sharing image file with second user...');
-            await storage.addCommenterRoleToFile(uploadedImage.id);
-        }
         return uploadedImage;
     }
     catch (error) {

package/dist/utils/presentation.js

@@ -36,7 +36,7 @@ export const createAndSignVerifiablePresentation = async (accessTokens, vcFileId
             }
         }
         // Create Verifiable Presentation (VP) with the retrieved VC
-        const presentation = await engine.createPresentation([verifiableCredential, ...recommendations]); //! do not edit the array order!!
+        const presentation = await engine.createPresentation([verifiableCredential.data, ...recommendations]); //! do not edit the array order!!
         // Use the key pair to sign the presentation
         const signedPresentation = await engine.signPresentation(presentation);
         return { signedPresentation };

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@cooperation/vc-storage",
 	"type": "module",
-	"version": "1.0.8",
+	"version": "1.0.11",
 	"description": "Sign and store your verifiable credentials.",
 	"main": "dist/index.js",
 	"types": "dist/types/index.d.ts",
@@ -16,7 +16,6 @@
 	"author": "cooperation",
 	"license": "ISC",
 	"dependencies": {
-		"@cooperation/vc-storage": "^1.0.6",
 		"@digitalbazaar/did-method-key": "^5.2.0",
 		"@digitalbazaar/ed25519-signature-2020": "^5.3.0",
 		"@digitalbazaar/ed25519-verification-key-2020": "^4.1.0",