From 1db9921dd84af069313dcebfa23036a05ef44e90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Wed, 1 Jul 2015 10:00:53 +0200
Subject: [PATCH] use safe urls for thumbnails and links

---
 .../ascribe_uploader/file_drag_and_drop_preview.js     |  4 ++--
 .../file_drag_and_drop_preview_image.js                |  4 ++--
 .../file_drag_and_drop_preview_other.js                |  4 ++--
 .../ascribe_uploader/react_s3_fine_uploader.js         | 10 +++++++---
 sass/ascribe_uploader.scss                             |  8 ++++++++
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/js/components/ascribe_uploader/file_drag_and_drop_preview.js b/js/components/ascribe_uploader/file_drag_and_drop_preview.js
index 84853018..c58f6a38 100644
--- a/js/components/ascribe_uploader/file_drag_and_drop_preview.js
+++ b/js/components/ascribe_uploader/file_drag_and_drop_preview.js
@@ -57,7 +57,7 @@ let FileDragAndDropPreview = React.createClass({
                                 url={this.props.file.url}
                                 toggleUploadProcess={this.toggleUploadProcess}
                                 areAssetsDownloadable={this.props.areAssetsDownloadable}
-                                downloadFile={this.handleDownloadFile}/>);
+                                downloadUrl={this.props.file.s3UrlSafe}/>);
         } else {
             previewElement = (<FileDragAndDropPreviewOther
                                 onClick={this.handleDeleteFile}
@@ -65,7 +65,7 @@ let FileDragAndDropPreview = React.createClass({
                                 type={this.props.file.type.split('/')[1]}
                                 toggleUploadProcess={this.toggleUploadProcess}
                                 areAssetsDownloadable={this.props.areAssetsDownloadable}
-                                downloadFile={this.handleDownloadFile}/>);
+                                downloadUrl={this.props.file.s3UrlSafe}/>);
         }
 
         return (
diff --git a/js/components/ascribe_uploader/file_drag_and_drop_preview_image.js b/js/components/ascribe_uploader/file_drag_and_drop_preview_image.js
index 1cbf67e6..04d35a47 100644
--- a/js/components/ascribe_uploader/file_drag_and_drop_preview_image.js
+++ b/js/components/ascribe_uploader/file_drag_and_drop_preview_image.js
@@ -10,7 +10,7 @@ let FileDragAndDropPreviewImage = React.createClass({
         progress: React.PropTypes.number,
         url: React.PropTypes.string,
         toggleUploadProcess: React.PropTypes.func,
-        downloadFile: React.PropTypes.func,
+        downloadUrl: React.PropTypes.string,
         areAssetsDownloadable: React.PropTypes.bool
     },
 
@@ -48,7 +48,7 @@ let FileDragAndDropPreviewImage = React.createClass({
             // only if assets are actually downloadable, there should be a download icon if the process is already at
             // 100%. If not, no actionSymbol should be displayed
             if(this.props.areAssetsDownloadable) {
-                actionSymbol = <span className="glyphicon glyphicon-download action-file" aria-hidden="true" title="Download file" onClick={this.props.downloadFile}/>;
+                actionSymbol = <a href={this.props.downloadUrl} target="_blank" className="glyphicon glyphicon-download action-file" aria-hidden="true" title="Download file"/>;
             }
 
         } else {
diff --git a/js/components/ascribe_uploader/file_drag_and_drop_preview_other.js b/js/components/ascribe_uploader/file_drag_and_drop_preview_other.js
index 1fed702f..167df5e0 100644
--- a/js/components/ascribe_uploader/file_drag_and_drop_preview_other.js
+++ b/js/components/ascribe_uploader/file_drag_and_drop_preview_other.js
@@ -11,7 +11,7 @@ let FileDragAndDropPreviewOther = React.createClass({
         progress: React.PropTypes.number,
         areAssetsDownloadable: React.PropTypes.bool,
         toggleUploadProcess: React.PropTypes.func,
-        downloadFile: React.PropTypes.func
+        downloadUrl: React.PropTypes.string
     },
 
     getInitialState() {
@@ -44,7 +44,7 @@ let FileDragAndDropPreviewOther = React.createClass({
             // only if assets are actually downloadable, there should be a download icon if the process is already at
             // 100%. If not, no actionSymbol should be displayed
             if(this.props.areAssetsDownloadable) {
-                actionSymbol = <span className="glyphicon glyphicon-download action-file" aria-hidden="true" title="Download file" onClick={this.props.downloadFile}/>;
+                actionSymbol = <a href={this.props.downloadUrl} target="_blank" className="glyphicon glyphicon-download action-file" aria-hidden="true" title="Download file"/>;
             }
 
         } else {
diff --git a/js/components/ascribe_uploader/react_s3_fine_uploader.js b/js/components/ascribe_uploader/react_s3_fine_uploader.js
index 1ad0a819..2d6928df 100644
--- a/js/components/ascribe_uploader/react_s3_fine_uploader.js
+++ b/js/components/ascribe_uploader/react_s3_fine_uploader.js
@@ -276,6 +276,11 @@ var ReactS3FineUploader = React.createClass({
             return res.json();
         })
         .then((res) =>{
+            if(res.otherdata) {
+                file.s3Url = res.otherdata.url_safe;
+            } else {
+                throw new Error('Could not find a url to download.');
+            }
             defer.success(res.key);
         })
         .catch((err) => {
@@ -327,7 +332,7 @@ var ReactS3FineUploader = React.createClass({
         if(success) {
             // fetch blobs for images
             response = response.map((file) => {
-                file.url = file.s3Url;
+                file.url = file.s3UrlSafe;
                 file.status = 'online';
                 file.progress = 100;
                 return file;
@@ -390,7 +395,7 @@ var ReactS3FineUploader = React.createClass({
         } else {
             let fileToDelete = this.state.filesToUpload[fileId];
             fileToDelete.status = 'deleted';
-            console.log(this.state.uploader.getUploads());
+
             S3Fetcher
                 .deleteFile(fileToDelete.s3Key, fileToDelete.s3Bucket)
                 .then(() => this.onDeleteComplete(fileToDelete.id, null, false))
@@ -420,7 +425,6 @@ var ReactS3FineUploader = React.createClass({
     },
 
     handleUploadFile(files) {
-        console.log(this.state.files);
         // If multiple set and user already uploaded its work,
         // cancel upload
         if(!this.props.multiple && this.state.filesToUpload.filter((file) => file.status !== 'deleted' && file.status !== 'canceled').length > 0) {
diff --git a/sass/ascribe_uploader.scss b/sass/ascribe_uploader.scss
index 92205c30..062c0b49 100644
--- a/sass/ascribe_uploader.scss
+++ b/sass/ascribe_uploader.scss
@@ -97,6 +97,10 @@
     text-shadow: -2px 0 black, 0 2px black, 2px 0 black, 0 -2px black;
     cursor: pointer;
 
+    &:link, &:visited, &:hover, &:active {
+        text-decoration: none;
+    }
+
     &:hover {
         color: #d9534f;
     }
@@ -111,6 +115,10 @@
     text-shadow: -2px 0 black, 0 2px black, 2px 0 black, 0 -2px black;
     cursor: pointer;
 
+    &:link, &:visited, &:hover, &:active {
+        text-decoration: none;
+    }
+
     &:hover {
         color: #d9534f;
     }