@cooperation/vc-storage 1.0.17 → 1.0.18

package/dist/models/GoogleDriveStorage.js

@@ -59,8 +59,7 @@ export class GoogleDriveStorage {
                 headers: {}, // Add additional headers if required
                 url,
             });
-            console.log(`Content fetched for file ID: ${fileId}`);
-            return response; // This could be text, JSON, or binary, depending on the file type
+            return response;
         }
         catch (error) {
             console.error(`Error fetching content for file ID: ${fileId}:`, error.message);
@@ -133,18 +132,6 @@ export class GoogleDriveStorage {
                 body: formData,
                 url: `https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart&fields=id,parents`,
             });
-            // 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: {},
-                body: JSON.stringify(permissionData),
-            });
             return file;
         }
         catch (error) {
@@ -161,21 +148,6 @@ export class GoogleDriveStorage {
         const metadataUrl = `https://www.googleapis.com/drive/v3/files/${id}?fields=id,name`;
         const dataUrl = `https://www.googleapis.com/drive/v3/files/${id}?alt=media`;
         try {
-            // Initial "touch" request to ensure file accessibility for the current user
-            const touchResponse = await fetch(metadataUrl, {
-                method: 'GET',
-                headers: {
-                    Authorization: `Bearer ${this.accessToken}`,
-                },
-            });
-            if (!touchResponse.ok) {
-                const errorData = await touchResponse.json();
-                console.error(`Failed to "touch" file for accessibility with ID ${id}:`, errorData);
-                return null;
-            }
-            // Fetch file metadata to get the name
-            const metadata = await touchResponse.json();
-            const fileName = metadata.name;
             // Fetch actual file data
             const dataResponse = await fetch(dataUrl, {
                 method: 'GET',
@@ -194,9 +166,6 @@ export class GoogleDriveStorage {
             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') ||
@@ -209,10 +178,9 @@ export class GoogleDriveStorage {
                 fileData = await dataResponse.blob();
             }
             else {
-                fileData = await dataResponse.arrayBuffer(); // Fallback for other binary types
+                fileData = await dataResponse.arrayBuffer();
             }
-            // Return file ID, name, and data
-            return { id: metadata.id, name: fileName, data: fileData };
+            return { data: fileData };
         }
         catch (error) {
             console.error(`Error retrieving file with ID ${id}:`, error.message);
@@ -261,10 +229,12 @@ export class GoogleDriveStorage {
                 // Retrieve all 'VC.json' files from each 'VC-timestamp' subfolder
                 const fileContents = await Promise.all(vcSubfolders.map(async (folder) => {
                     const files = await this.findFilesUnderFolder(folder.id);
+                    console.log('🚀 ~ GoogleDriveStorage ~ vcSubfolders.map ~ files:', files);
                     return Promise.all(files.map(async (file) => {
                         return await this.retrieve(file.id);
                     }));
                 }));
+                console.log('🚀 ~ GoogleDriveStorage ~ getAllFilesByType ~ fileContents:', fileContents);
                 return fileContents;
             }
             // Step 3: Generic handling for other types
@@ -327,8 +297,6 @@ export class GoogleDriveStorage {
     async findFilesUnderFolder(folderId) {
         if (!folderId)
             throw new Error('Folder ID is required');
-        console.log('🚀 ~ GoogleDriveStorage ~ findFilesUnderFolder ~ folderId', folderId);
-        // Fetch files under the folder
         const files = await this.searchFiles(`'${folderId}' in parents`);
         if (files.length === 0) {
             console.log('No files found in the folder.');
@@ -338,7 +306,7 @@ export class GoogleDriveStorage {
         const filesWithContent = await Promise.all(files.map(async (file) => {
             try {
                 const content = await this.getFileContent(file.id);
-                return { ...file, content }; // Merge file metadata with its content
+                return { ...file, content };
             }
             catch (error) {
                 console.error(`Error fetching content for file "${file.name}" (ID: ${file.id}):`, error);
@@ -348,22 +316,24 @@ export class GoogleDriveStorage {
         return filesWithContent;
     }
     async updateFileData(fileId, data) {
-        const fileMetadata = {
-            name: data.fileName,
-            mimeType: data.mimeType,
-        };
-        let uploadUrl = `https://www.googleapis.com/upload/drive/v3/files/${fileId}?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 }));
-        const updatedFile = await this.fetcher({
-            method: 'PATCH',
-            headers: {},
-            body: JSON.stringify(formData),
-            url: `${uploadUrl}&fields=id,parents`,
-        });
-        console.log('File updated:', updatedFile);
-        return updatedFile;
+        try {
+            const updateUrl = `https://www.googleapis.com/drive/v3/files/${fileId}`;
+            const updatedFile = await this.fetcher({
+                method: 'PATCH',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                    name: data.fileName,
+                }),
+                url: updateUrl,
+            });
+            console.log('✅ File renamed successfully:', updatedFile);
+            return updatedFile;
+        }
+        catch (error) {
+            throw error;
+        }
     }
     async getFileParents(fileId) {
         console.log('🚀 ~ GoogleDriveStorage ~ getFileParents ~ fileId', fileId);
@@ -427,21 +397,33 @@ export class GoogleDriveStorage {
         }
     }
     async update(fileId, data) {
-        const fileMetadata = {
-            name: data.fileName,
-            mimeType: data.mimeType,
+        console.log('🚀 ~ GoogleDriveStorage ~ update ~ data:', data);
+        console.log('🚀 ~ GoogleDriveStorage ~ update ~ fileId:', fileId);
+        // ✅ Ensure JSON file type
+        const metadata = {
+            name: data.fileName || 'resume.json',
+            mimeType: 'application/json',
         };
-        let uploadUrl = `https://www.googleapis.com/upload/drive/v3/files/${fileId}?uploadType=multipart`;
+        const uploadUrl = `https://www.googleapis.com/upload/drive/v3/files/${fileId}?uploadType=multipart`;
+        // ✅ Create multipart request to update Google Drive JSON file
         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 }));
-        const updatedFile = await this.fetcher({
-            method: 'PATCH',
-            headers: {},
-            body: JSON.stringify(formData),
-            url: `${uploadUrl}&fields=id,parents`,
-        });
-        console.log('File updated:', updatedFile);
-        return updatedFile;
+        formData.append('metadata', new Blob([JSON.stringify(metadata)], { type: 'application/json' }));
+        formData.append('file', new Blob([JSON.stringify(data.body)], { type: 'application/json' }) // ✅ Ensure JSON format
+        );
+        console.log('🚀 ~ GoogleDriveStorage ~ update ~ FormData:', formData);
+        try {
+            const response = await this.fetcher({
+                method: 'PATCH',
+                headers: {}, // ✅ No Content-Type needed, let FormData set it
+                body: formData, // ✅ Sends JSON file properly
+                url: `${uploadUrl}&fields=id,name,mimeType`,
+            });
+            console.log('✅ File updated successfully:', response);
+            return response;
+        }
+        catch (error) {
+            console.error('❌ Error updating Google Drive file:', error);
+            throw error;
+        }
     }
 }

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

@@ -1,4 +1,3 @@
-import { DataToSaveI } from '../../types';
 interface FileContent {
     name: string;
     content: any;
@@ -44,9 +43,7 @@ export declare class GoogleDriveStorage {
      * @returns file content
      */
     retrieve(id: string): Promise<{
-        name: string;
         data: any;
-        id: string;
     } | null>;
     /**
      * Get folder by folderId, if folderId == null you will have them all
@@ -69,7 +66,9 @@ export declare class GoogleDriveStorage {
     updateFileName(fileId: string, newFileName: string): Promise<any>;
     findFileByName(name: string): Promise<any>;
     findFilesUnderFolder(folderId: string): Promise<any[]>;
-    updateFileData(fileId: string, data: DataToSaveI): Promise<any>;
+    updateFileData(fileId: string, data: {
+        fileName: string;
+    }): Promise<any>;
     getFileParents(fileId: string): Promise<any>;
     updateRelationsFile({ relationsFileId, recommendationFileId }: {
         relationsFileId: string;

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

@@ -10,7 +10,9 @@ export declare const getVCWithRecommendations: ({ vcId, storage }: {
     vcId: string;
     storage: GoogleDriveStorage;
 }) => Promise<{
-    vc: any;
+    vc: {
+        data: any;
+    };
     recommendations: any[];
     relationsFileId: any;
 }>;

package/dist/utils/google.js

@@ -3,15 +3,14 @@ export const getVCWithRecommendations = async ({ vcId, storage }) => {
     const files = await storage.findFilesUnderFolder(vcFolderId);
     const relationsFile = files.find((f) => f.name === 'RELATIONS');
     const relationsContent = await storage.retrieve(relationsFile.id);
-    const relationsData = JSON.parse(relationsContent.data.body);
+    const relationsData = relationsContent.data;
     const [vcFileId, recommendationIds] = [relationsData.vc_id, relationsData.recommendations];
     const vc = await storage.retrieve(vcFileId);
-    const vcData = JSON.parse(vc.data.body);
     const recommendations = await Promise.all(recommendationIds.map(async (rec) => {
         const recFile = await storage.retrieve(rec);
         return recFile;
     }));
-    return { vc: vcData, recommendations, relationsFileId: relationsFile.id };
+    return { vc: vc, recommendations, relationsFileId: relationsFile.id };
 };
 /**
  * Save data to Google Drive in the specified folder type.

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@cooperation/vc-storage",
 	"type": "module",
-	"version": "1.0.17",
+	"version": "1.0.18",
 	"description": "Sign and store your verifiable credentials.",
 	"main": "dist/index.js",
 	"types": "dist/types/index.d.ts",