From 7f3798a54732959b38791a868defe9b366b4a709 Mon Sep 17 00:00:00 2001
From: Mattermost Build <build@mattermost.com>
Date: Fri, 17 Apr 2020 04:28:14 +0200
Subject: [PATCH] Automated cherry pick of #4165 (#4166)

* Fix headers when preloading images

* Import isGif

Co-authored-by: Miguel Alatzar <this.migbot@gmail.com>
Co-authored-by: Miguel Alatzar <migbot@users.noreply.github.com>
---
 .../file_attachment_list/file_attachment_image.js        | 9 +++++++--
 app/init/credentials.js                                  | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/components/file_attachment_list/file_attachment_image.js b/app/components/file_attachment_list/file_attachment_image.js
index 5b4c85b6a..1dc326ed6 100644
--- a/app/components/file_attachment_list/file_attachment_image.js
+++ b/app/components/file_attachment_list/file_attachment_image.js
@@ -14,6 +14,7 @@ import {Client4} from 'mattermost-redux/client';
 
 import ProgressiveImage from 'app/components/progressive_image';
 import {changeOpacity} from 'app/utils/theme';
+import {isGif} from 'app/utils/file';
 
 import thumb from 'assets/images/thumb.png';
 
@@ -55,7 +56,7 @@ export default class FileAttachmentImage extends PureComponent {
         super(props);
 
         const {file} = props;
-        if (file && file.id) {
+        if (file && file.id && !file.localPath) {
             const headers = {
                 Authorization: `Bearer ${Client4.getToken()}`,
                 'X-CSRF-Token': Client4.csrf,
@@ -67,6 +68,10 @@ export default class FileAttachmentImage extends PureComponent {
                 {uri: Client4.getFileUrl(file.id), headers},
             ];
 
+            if (isGif(file)) {
+                preloadImages.push({uri: Client4.getFilePreviewUrl(file.id), headers});
+            }
+
             FastImage.preload(preloadImages);
         }
 
@@ -98,7 +103,7 @@ export default class FileAttachmentImage extends PureComponent {
             imageProps.defaultSource = {uri: file.localPath};
         } else if (file.id) {
             imageProps.thumbnailUri = Client4.getFileThumbnailUrl(file.id);
-            imageProps.imageUri = Client4.getFileUrl(file.id);
+            imageProps.imageUri = isGif(file) ? Client4.getFilePreviewUrl(file.id) : Client4.getFileUrl(file.id);
         }
         return imageProps;
     };
diff --git a/app/init/credentials.js b/app/init/credentials.js
index 77c73e92d..ba4dc7f0e 100644
--- a/app/init/credentials.js
+++ b/app/init/credentials.js
@@ -54,7 +54,7 @@ export const getAppCredentials = async () => {
 export const removeAppCredentials = async () => {
     const url = await getCurrentServerUrl();
 
-    Client4.setCSRF(null);
+    Client4.setCSRF('');
     Client4.serverVersion = '';
     Client4.setUserId('');
     Client4.setToken('');