Fixed a bug with syncVCs

tuum-tech · Feb 20, 2024 · d448a1d · d448a1d
1 parent bc224a2
commit d448a1d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -47,7 +47,7 @@
   "bracket-pair-colorizer-2.depreciation-notice": false,
   "editor.guides.bracketPairs": true,
   "editor.codeActionsOnSave": {
-    "source.organizeImports": true
+    "source.organizeImports": "explicit"
   },
   "editor.fontWeight": "normal",
   "editor.indentSize": "tabSize"

diff --git a/packages/site/src/components/cards/ConfigureGoogleAccount.tsx b/packages/site/src/components/cards/ConfigureGoogleAccount.tsx
@@ -58,6 +58,8 @@ const ConfigureGoogleAccount: FC<Props> = ({
       console.error('Login Failed', e);
       dispatch({ type: MetamaskActions.SetError, payload: e });
     },
+    scope:
+      'https://www.googleapis.com/auth/drive.file https://www.googleapis.com/auth/drive.metadata.readonly',
   });
 
   return (

diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/tuum-tech/identify.git"
   },
   "source": {
-    "shasum": "ECg9tSmTGnEohIna/s0ECP3nGSyo1r3sue3QUU8xwlE=",
+    "shasum": "0kbQSeKOe9llJ7Wflw6VdUVGUw/zQEyLTxHrb0jsRF0=",
     "location": {
       "npm": {
         "filePath": "dist/snap.js",

diff --git a/packages/snap/src/plugins/veramo/google-drive-data-store/src/googleDriveVCStore.ts b/packages/snap/src/plugins/veramo/google-drive-data-store/src/googleDriveVCStore.ts
@@ -74,7 +74,8 @@ export class GoogleDriveVCStore extends AbstractDataStore {
         .filter((item: any) => {
           return (
             item.metadata.id === (filter.filter as string) &&
-            item.data.credentialSubject.id?.split(':')[4] === account
+            item.data.credentialSubject.id?.split(':')[4] ===
+              this.state.currentAccount.addrToUseForDid
           );
         });
     }
@@ -95,7 +96,8 @@ export class GoogleDriveVCStore extends AbstractDataStore {
         .filter((item: any) => {
           return (
             item.data.type?.includes(filter.filter as string) &&
-            item.data.credentialSubject.id?.split(':')[4] === account
+            item.data.credentialSubject.id?.split(':')[4] ===
+              this.state.currentAccount.addrToUseForDid
           );
         });
     }
@@ -113,7 +115,10 @@ export class GoogleDriveVCStore extends AbstractDataStore {
           };
         })
         .filter((item: any) => {
-          return item.data.credentialSubject.id?.split(':')[4] === account;
+          return (
+            item.data.credentialSubject.id?.split(':')[4] ===
+            this.state.currentAccount.addrToUseForDid
+          );
         });
     }
 
@@ -130,7 +135,10 @@ export class GoogleDriveVCStore extends AbstractDataStore {
           };
         })
         .filter((item: any) => {
-          return item.data.credentialSubject.id?.split(':')[4] === account;
+          return (
+            item.data.credentialSubject.id?.split(':')[4] ===
+            this.state.currentAccount.addrToUseForDid
+          );
         });
       const filteredObjects = jsonpath.query(objects, filter.filter as string);
       return filteredObjects as IQueryResult[];
@@ -163,7 +171,7 @@ export class GoogleDriveVCStore extends AbstractDataStore {
     for (const vc of vcs) {
       if (
         (vc.vc as VerifiableCredential).credentialSubject.id?.split(':')[4] ===
-        account
+        this.state.currentAccount.addrToUseForDid
       ) {
         const newId = vc.id || uuidv4();
         newVCs = { ...newVCs, [newId]: vc.vc };

diff --git a/packages/snap/src/plugins/veramo/google-drive-data-store/src/googleUtils.ts b/packages/snap/src/plugins/veramo/google-drive-data-store/src/googleUtils.ts
@@ -18,7 +18,6 @@ export const verifyToken = async (accessToken: string): Promise<string> => {
     if (res.status !== 200) {
       throw new Error(data.error_description);
     }
-    console.log('VerifyToken data: ', JSON.stringify(data, null, 4));
 
     return data.email;
   } catch (error) {
@@ -39,7 +38,6 @@ const searchFile = async (accessToken: string, fileName: string) => {
       },
     );
     const data = await res.json();
-    console.log('searchFile data: ', JSON.stringify(data, null, 4));
 
     const count = data.files.length;
 
@@ -109,7 +107,6 @@ export const uploadToGoogleDrive = async (
       );
     }
     const val = await res.json();
-    console.log({ val });
 
     return val;
   } catch (error) {