🔀 Merge pull request #283 from nwingt/develop

Update for avatar upload & fix breaking change on noise-js
likecoin · Apr 28, 2022 · f8b0429 · f8b0429
2 parents 431a91b + 9491c5f
commit f8b0429
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 51 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "@google-cloud/pubsub": "^1.2.0",
     "@likecoin/iscn-js": "0.0.7",
     "@likecoin/likecoin-email-templates": "^1.2.2",
-    "@likecoin/secretd-js": "^0.2.0",
+    "@likecoin/secretd-js": "^0.4.3",
     "@sendgrid/mail": "^6.5.5",
     "agentkeepalive": "^4.1.3",
     "arweave": "^1.10.17",

diff --git a/src/routes/users/registerLogin.js b/src/routes/users/registerLogin.js
@@ -347,7 +347,7 @@ router.post(
       }
 
       await dbRef.doc(user).update({ avatar: avatarUrl });
-      res.sendStatus(200);
+      res.json({ avatar: avatarUrl });
 
       const oldUserObj = await dbRef.doc(user).get();
       const {

diff --git a/src/util/fileupload.js b/src/util/fileupload.js
@@ -11,6 +11,8 @@ import { ValidationError } from './ValidationError';
 const sharp = require('sharp');
 const fileType = require('file-type');
 const sha256 = require('js-sha256');
+// eslint-disable-next-line import/no-extraneous-dependencies
+const md5 = require('md5-hex');
 
 export function uploadFileAndGetLink(file, { filename, mimetype }) {
   const isStream = file && typeof file.pipe === 'function';
@@ -58,7 +60,8 @@ export async function handleAvatarUploadAndGetURL(user, file, avatarSHA256) {
     filename: `likecoin_store_user_${user}_${IS_TESTNET ? 'test' : 'main'}`,
     mimetype: file.mimetype,
   });
-  return avatarUrl;
+  const versionHash = md5(file.buffer).substring(0, 7);
+  return `${avatarUrl}&${versionHash}`;
 }
 
 export async function handleAvatarLinkAndGetURL(user, url) {

diff --git a/test/stub/util/fileupload.js b/test/stub/util/fileupload.js
@@ -10,6 +10,8 @@ import { ValidationError } from './ValidationError';
 const sharp = require('sharp');
 const fileType = require('file-type');
 const sha256 = require('js-sha256');
+// eslint-disable-next-line import/no-extraneous-dependencies
+const md5 = require('md5-hex');
 
 export function uploadFileAndGetLink() {
   return 'fakeAvatarUrl';
@@ -32,7 +34,8 @@ export async function handleAvatarUploadAndGetURL(user, file, avatarSHA256) {
     filename: `likecoin_store_user_${user}_${IS_TESTNET ? 'test' : 'main'}`,
     mimetype: file.mimetype,
   });
-  return avatarUrl;
+  const versionHash = md5(file.buffer).substring(0, 7);
+  return `${avatarUrl}&${versionHash}`;
 }
 
 export async function handleAvatarLinkAndGetURL(user, url) {