From ee6d2789edb22e1c19ed3885a356646abf5aca39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Thu, 16 Jul 2015 18:17:45 +0200 Subject: [PATCH] set csrftokens as constants --- js/components/ascribe_detail/further_details.js | 6 +++--- js/components/ascribe_forms/form_register_piece.js | 4 ++-- .../ascribe_uploader/react_s3_fine_uploader.js | 10 ++++++---- js/components/settings_container.js | 6 +++--- js/constants/application_constants.js | 1 + js/utils/requests.js | 4 ++-- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/js/components/ascribe_detail/further_details.js b/js/components/ascribe_detail/further_details.js index 84684592..0c54f3b0 100644 --- a/js/components/ascribe_detail/further_details.js +++ b/js/components/ascribe_detail/further_details.js @@ -146,7 +146,7 @@ let FileUploader = React.createClass({ session={{ endpoint: AppConstants.serverUrl + 'api/blob/otherdatas/fineuploader_session/', customHeaders: { - 'X-CSRFToken': getCookie('csrftoken') + 'X-CSRFToken': getCookie(AppConstants.csrftoken) }, params: { 'pk': this.props.otherData ? this.props.otherData.id : null @@ -159,7 +159,7 @@ let FileUploader = React.createClass({ signature={{ endpoint: AppConstants.serverUrl + 's3/signature/', customHeaders: { - 'X-CSRFToken': getCookie('csrftoken') + 'X-CSRFToken': getCookie(AppConstants.csrftoken) } }} deleteFile={{ @@ -167,7 +167,7 @@ let FileUploader = React.createClass({ method: 'DELETE', endpoint: AppConstants.serverUrl + 's3/delete', customHeaders: { - 'X-CSRFToken': getCookie('csrftoken') + 'X-CSRFToken': getCookie(AppConstants.csrftoken) } }} areAssetsDownloadable={true} diff --git a/js/components/ascribe_forms/form_register_piece.js b/js/components/ascribe_forms/form_register_piece.js index d3748fc0..00d3c4d4 100644 --- a/js/components/ascribe_forms/form_register_piece.js +++ b/js/components/ascribe_forms/form_register_piece.js @@ -162,7 +162,7 @@ let FileUploader = React.createClass({ signature={{ endpoint: AppConstants.serverUrl + 's3/signature/', customHeaders: { - 'X-CSRFToken': getCookie('csrftoken') + 'X-CSRFToken': getCookie(AppConstants.csrftoken) } }} deleteFile={{ @@ -170,7 +170,7 @@ let FileUploader = React.createClass({ method: 'DELETE', endpoint: AppConstants.serverUrl + 's3/delete', customHeaders: { - 'X-CSRFToken': getCookie('csrftoken') + 'X-CSRFToken': getCookie(AppConstants.csrftoken) } }}/> ); diff --git a/js/components/ascribe_uploader/react_s3_fine_uploader.js b/js/components/ascribe_uploader/react_s3_fine_uploader.js index 1414b853..2620e945 100644 --- a/js/components/ascribe_uploader/react_s3_fine_uploader.js +++ b/js/components/ascribe_uploader/react_s3_fine_uploader.js @@ -13,6 +13,8 @@ import FileDragAndDrop from './file_drag_and_drop'; import GlobalNotificationModel from '../../models/global_notification_model'; import GlobalNotificationActions from '../../actions/global_notification_actions'; +import AppConstants from '../../constants/application_constants'; + var ReactS3FineUploader = React.createClass({ propTypes: { @@ -146,7 +148,7 @@ var ReactS3FineUploader = React.createClass({ return { filesToUpload: [], uploader: new fineUploader.s3.FineUploaderBasic(this.propsToConfig()), - csrfToken: getCookie('csrftoken') + csrfToken: getCookie(AppConstants.csrftoken) }; }, @@ -154,7 +156,7 @@ var ReactS3FineUploader = React.createClass({ // everytime the csrf cookie is changed we'll need to reinitalize // fineuploader and update the actual csrf token componentWillUpdate() { - let potentiallyNewCSRFToken = getCookie('csrftoken'); + let potentiallyNewCSRFToken = getCookie(AppConstants.csrftoken); if(this.state.csrfToken !== potentiallyNewCSRFToken) { this.setState({ uploader: new fineUploader.s3.FineUploaderBasic(this.propsToConfig()), @@ -212,7 +214,7 @@ var ReactS3FineUploader = React.createClass({ headers: { 'Accept': 'application/json', 'Content-Type': 'application/json', - 'X-CSRFToken': getCookie('csrftoken') + 'X-CSRFToken': getCookie(AppConstants.csrftoken) }, credentials: 'include', body: JSON.stringify({ @@ -242,7 +244,7 @@ var ReactS3FineUploader = React.createClass({ headers: { 'Accept': 'application/json', 'Content-Type': 'application/json', - 'X-CSRFToken': getCookie('csrftoken') + 'X-CSRFToken': getCookie(AppConstants.csrftoken) }, credentials: 'include', body: JSON.stringify({ diff --git a/js/components/settings_container.js b/js/components/settings_container.js index b24cf71c..7f1ce692 100644 --- a/js/components/settings_container.js +++ b/js/components/settings_container.js @@ -225,7 +225,7 @@ let FileUploader = React.createClass({ session={{ endpoint: apiUrls.ownership_loans_contract, customHeaders: { - 'X-CSRFToken': getCookie('csrftoken') + 'X-CSRFToken': getCookie(AppConstants.csrftoken) }, cors: { expected: true, @@ -235,7 +235,7 @@ let FileUploader = React.createClass({ signature={{ endpoint: AppConstants.serverUrl + 's3/signature/', customHeaders: { - 'X-CSRFToken': getCookie('csrftoken') + 'X-CSRFToken': getCookie(AppConstants.csrftoken) } }} deleteFile={{ @@ -243,7 +243,7 @@ let FileUploader = React.createClass({ method: 'DELETE', endpoint: AppConstants.serverUrl + 's3/delete', customHeaders: { - 'X-CSRFToken': getCookie('csrftoken') + 'X-CSRFToken': getCookie(AppConstants.csrftoken) } }} areAssetsDownloadable={true} diff --git a/js/constants/application_constants.js b/js/constants/application_constants.js index 0d604945..965ee0e3 100644 --- a/js/constants/application_constants.js +++ b/js/constants/application_constants.js @@ -14,6 +14,7 @@ let constants = { 'acl_loan', 'acl_share', 'acl_transfer', 'acl_unconsign', 'acl_unshare', 'acl_view', 'acl_withdraw_transfer'], + 'csrftoken': 'csrftoken', 'subdomains': [ { 'subdomain': 'cc', diff --git a/js/utils/requests.js b/js/utils/requests.js index 9d2104d1..2137394a 100644 --- a/js/utils/requests.js +++ b/js/utils/requests.js @@ -1,7 +1,7 @@ 'use strict'; import { argsToQueryParams, getCookie } from '../utils/fetch_api_utils'; - +import AppConstants from '../constants/application_constants'; class UrlMapError extends Error {} class ServerError extends Error {} @@ -100,7 +100,7 @@ class Requests { request(verb, url, options) { options = options || {}; let merged = this._merge(this.httpOptions, options); - let csrftoken = getCookie('csrftoken'); + let csrftoken = getCookie(AppConstants.csrftoken); if (csrftoken) { merged.headers['X-CSRFToken'] = csrftoken; }