Merge pull request #4158 from withspectrum/2.4.53-fix-3

2.4.53 fix 3

Author: brianlovin

api/apollo-server.js

@@ -98,12 +98,28 @@ const server = new ProtectedApolloServer({
           return {
             user: user || null,
             loaders: createLoaders({ cache: false }),
+            getImageSignatureExpiration: () => {
+              const date = new Date();
+              date.setHours(24);
+              date.setMinutes(0);
+              date.setSeconds(0);
+              date.setMilliseconds(0);
+              return date.getTime();
+            },
           };
         })
         .catch(err => {
           console.error(err);
           return {
             loaders: createLoaders({ cache: false }),
+            getImageSignatureExpiration: () => {
+              const date = new Date();
+              date.setHours(24);
+              date.setMinutes(0);
+              date.setSeconds(0);
+              date.setMilliseconds(0);
+              return date.getTime();
+            },
           };
         }),
   },

api/package.json

@@ -24,6 +24,7 @@
     "dataloader": "^1.4.0",
     "debounce": "^1.2.0",
     "debug": "^2.6.8",
+    "decode-uri-component": "^0.2.0",
     "draft-js": "^0.10.5",
     "draft-js-code-editor-plugin": "0.2.1",
     "draft-js-drag-n-drop-plugin": "2.0.0-rc9",

api/utils/s3.js

@@ -41,6 +41,7 @@ export const uploadImage = async (
   const result = await file;
   const { filename, stream, mimetype } = result;
   const sanitized = sanitize(filename);
+  const encoded = encodeURIComponent(sanitized);
   const validMediaTypes = ['image/gif', 'image/jpeg', 'image/png', 'video/mp4'];
   return new Promise(res => {
     // mimetype not in the validMediaType collection
@@ -53,7 +54,7 @@ export const uploadImage = async (
     }
 
     const path = `spectrum-chat/${entity}/${id}`;
-    const fileKey = `${shortid.generate()}-${sanitized}`;
+    const fileKey = `${shortid.generate()}-${encoded}`;
     return s3.upload(
       {
         Bucket: path,
@@ -65,7 +66,7 @@ export const uploadImage = async (
         if (!data || !data.Key)
           throw new UserError('Image upload failed. Please try again.');
         const url = generateImageUrl(data.Key);
-        res(encodeURI(url));
+        res(url);
       }
     );
   });

package.json

@@ -78,6 +78,7 @@
     "dataloader": "^1.3.0",
     "debounce": "^1.2.0",
     "debug": "^2.6.8",
+    "decode-uri-component": "^0.2.0",
     "draft-js": "npm:draft-js-fork-mxstbr",
     "draft-js-code-editor-plugin": "0.2.1",
     "draft-js-drag-n-drop-plugin": "^2.0.3",

shared/imgix/index.js

@@ -1,6 +1,7 @@
 // @flow
 require('now-env');
 import ImgixClient from 'imgix-core-js';
+import decodeUriComponent from 'decode-uri-component';
 
 const IS_PROD = process.env.NODE_ENV === 'production';
 const LEGACY_PREFIX = 'https://spectrum.imgix.net/';
@@ -12,6 +13,7 @@ const isLocalUpload = (url: string): boolean => url.startsWith('/uploads/', 0) &
 const hasLegacyPrefix = (url: string): boolean => url.startsWith(LEGACY_PREFIX, 0)
 // prettier-ignore
 const useProxy = (url: string): boolean => url.indexOf('spectrum.imgix.net') < 0 && url.startsWith('http', 0)
+const isEncoded = (url: string): boolean => url.indexOf('%') >= 0;
 
 /*
   When an image is uploaded to s3, we generate a url to be stored in our db
@@ -50,8 +52,19 @@ export const signImageUrl = (url: string, opts: Opts) => {
 
   if (isLocalUpload(url)) return url;
 
-  let processedUrl = hasLegacyPrefix(url) ? stripLegacyPrefix(url) : url;
+  const processedUrl = hasLegacyPrefix(url) ? stripLegacyPrefix(url) : url;
 
+  // we never have to worry about escaping or unescaping proxied urls e.g. twitter images
   if (useProxy(url)) return signProxy(processedUrl, opts);
-  return signPrimary(processedUrl, opts);
+
+  let decoded = processedUrl;
+  if (isEncoded(processedUrl)) {
+    const pathParts = decoded.split('/');
+    const filename = pathParts.pop();
+    const bucketPath = pathParts.join('/');
+    decoded = bucketPath + '/' + encodeURIComponent(filename);
+    decoded = decodeUriComponent(decoded);
+  }
+
+  return signPrimary(decoded, opts);
 };