From af42bb8e6774c0cecb0a826d3e3dad9fd70dfa7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Fri, 17 Jul 2015 15:41:09 +0200
Subject: [PATCH] error handling first cut

---
 .eslintrc                                     |  6 +--
 index.html                                    |  3 --
 js/actions/application_actions.js             |  4 +-
 js/actions/coa_actions.js                     |  4 +-
 js/actions/edition_actions.js                 |  2 +-
 js/actions/edition_list_actions.js            |  1 -
 js/actions/license_actions.js                 |  2 +-
 js/actions/loan_contract_actions.js           |  2 +-
 js/actions/piece_actions.js                   |  2 +-
 js/actions/piece_list_actions.js              |  3 +-
 js/actions/user_actions.js                    |  4 +-
 js/actions/wallet_settings_actions.js         |  2 +-
 js/actions/whitelabel_actions.js              |  8 +++-
 js/app.js                                     | 14 +++----
 .../accordion_list_item.js                    |  2 +-
 .../react_s3_fine_uploader.js                 |  1 +
 js/components/header.js                       |  5 ++-
 js/components/register_piece.js               |  2 +-
 js/constants/application_constants.js         |  6 ++-
 js/utils/error_utils.js                       | 39 +++++++++++++++++++
 js/utils/general_utils.js                     |  4 ++
 js/utils/requests.js                          | 35 ++++++-----------
 package.json                                  |  1 +
 ....scss => ascribe_global_notification.scss} |  0
 sass/main.scss                                |  2 +-
 25 files changed, 95 insertions(+), 59 deletions(-)
 create mode 100644 js/utils/error_utils.js
 rename sass/{ascribe-global-notification.scss => ascribe_global_notification.scss} (100%)

diff --git a/.eslintrc b/.eslintrc
index ac35bb10..fa3aca98 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -32,10 +32,10 @@
         "react/wrap-multilines": 1
     },
     "globals": {
-        "Raven": true,
         "Intercom": true,
-        "fetch": true
-    }
+        "fetch": true,
+        "require": true
+    },
     "plugins": [
         "react"
     ],
diff --git a/index.html b/index.html
index 39ebca26..a70a70db 100644
--- a/index.html
+++ b/index.html
@@ -51,9 +51,6 @@
             ga('create', 'UA-60614729-2', 'auto');
         </script>
 
-        <!-- Logging for sentry -->
-        <script src="//cdn.ravenjs.com/1.1.19/raven.min.js"></script>
-
         <!-- Intercom library -->
         <script>
             (function(){var w=window;var ic=w.Intercom;if(typeof ic==="function"){ic('reattach_activator');ic('update',intercomSettings);}else{var d=document;var i=function(){i.c(arguments)};i.q=[];i.c=function(args){i.q.push(args)};w.Intercom=i;function l(){var s=d.createElement('script');s.type='text/javascript';s.async=true;
diff --git a/js/actions/application_actions.js b/js/actions/application_actions.js
index 33932ebd..733746cf 100644
--- a/js/actions/application_actions.js
+++ b/js/actions/application_actions.js
@@ -17,7 +17,7 @@ class ApplicationActions {
                 this.actions.updateApplications(res.applications);
             })
             .catch((err) => {
-                console.log(err);
+                console.logGlobal(err);
             });
     }
     refreshApplicationToken(applicationName) {
@@ -26,7 +26,7 @@ class ApplicationActions {
                 this.actions.updateApplications(res.applications);
             })
             .catch((err) => {
-                console.log(err);
+                console.logGlobal(err);
             });
     }
 }
diff --git a/js/actions/coa_actions.js b/js/actions/coa_actions.js
index ed8971d3..728c6ad2 100644
--- a/js/actions/coa_actions.js
+++ b/js/actions/coa_actions.js
@@ -17,7 +17,7 @@ class CoaActions {
                 this.actions.updateCoa(res.coa);
             })
             .catch((err) => {
-                console.log(err);
+                console.logGlobal(err);
             });
     }
     create(edition) {
@@ -26,7 +26,7 @@ class CoaActions {
                 this.actions.updateCoa(res.coa);
             })
             .catch((err) => {
-                console.log(err);
+                console.logGlobal(err);
             });
     }
 }
diff --git a/js/actions/edition_actions.js b/js/actions/edition_actions.js
index 07fcab1d..473da0e4 100644
--- a/js/actions/edition_actions.js
+++ b/js/actions/edition_actions.js
@@ -17,7 +17,7 @@ class EditionActions {
                 this.actions.updateEdition(res.edition);
             })
             .catch((err) => {
-                console.log(err);
+                console.logGlobal(err);
             });
     }
 }
diff --git a/js/actions/edition_list_actions.js b/js/actions/edition_list_actions.js
index 641c5b01..0ab07b34 100644
--- a/js/actions/edition_list_actions.js
+++ b/js/actions/edition_list_actions.js
@@ -45,7 +45,6 @@ class EditionListActions {
                 })
                 .catch((err) => {
                     reject(err);
-                    //console.log(err);
                 });
         });
         
diff --git a/js/actions/license_actions.js b/js/actions/license_actions.js
index 358c158a..bfeacd34 100644
--- a/js/actions/license_actions.js
+++ b/js/actions/license_actions.js
@@ -17,7 +17,7 @@ class LicenseActions {
                 this.actions.updateLicenses(res.licenses);
             })
             .catch((err) => {
-                console.log(err);
+                console.logGlobal(err);
             });
     }
 }
diff --git a/js/actions/loan_contract_actions.js b/js/actions/loan_contract_actions.js
index 54405810..9757c2a2 100644
--- a/js/actions/loan_contract_actions.js
+++ b/js/actions/loan_contract_actions.js
@@ -32,7 +32,7 @@ class LoanContractActions {
                     }
                 })
                 .catch((err) => {
-                    console.error(err);
+                    console.logGlobal(err);
                     this.actions.updateLoanContract({
                         contractKey: null,
                         contractUrl: null,
diff --git a/js/actions/piece_actions.js b/js/actions/piece_actions.js
index d52b8d43..e3a41f93 100644
--- a/js/actions/piece_actions.js
+++ b/js/actions/piece_actions.js
@@ -18,7 +18,7 @@ class PieceActions {
                 this.actions.updatePiece(res.piece);
             })
             .catch((err) => {
-                console.log(err);
+                console.logGlobal(err);
             });
     }
 }
diff --git a/js/actions/piece_list_actions.js b/js/actions/piece_list_actions.js
index 3c5b44d2..390dfb98 100644
--- a/js/actions/piece_list_actions.js
+++ b/js/actions/piece_list_actions.js
@@ -53,7 +53,8 @@ class PieceListActions {
             .fetchRequestActions()
             .then((res) => {
                 this.actions.updatePieceListRequestActions(res.piece_ids);
-            });
+            })
+            .catch((err) => console.logGlobal(err));
     }
 }
 
diff --git a/js/actions/user_actions.js b/js/actions/user_actions.js
index 65f51d35..b1a006bc 100644
--- a/js/actions/user_actions.js
+++ b/js/actions/user_actions.js
@@ -18,7 +18,7 @@ class UserActions {
                 this.actions.updateCurrentUser(res.users[0]);
             })
             .catch((err) => {
-                console.log(err);
+                console.logGlobal(err);
                 this.actions.updateCurrentUser({});
             });
     }
@@ -28,7 +28,7 @@ class UserActions {
                 this.actions.deleteCurrentUser();
             })
             .catch((err) => {
-                console.log(err);
+                console.logGlobal(err);
             });
     }
 }
diff --git a/js/actions/wallet_settings_actions.js b/js/actions/wallet_settings_actions.js
index 48c8555f..11a21631 100644
--- a/js/actions/wallet_settings_actions.js
+++ b/js/actions/wallet_settings_actions.js
@@ -17,7 +17,7 @@ class WalletSettingsActions {
                 this.actions.updateWalletSettings(res.wallet_settings);
             })
             .catch((err) => {
-                console.log(err);
+                console.logGlobal(err);
             });
     }
 }
diff --git a/js/actions/whitelabel_actions.js b/js/actions/whitelabel_actions.js
index 28d95cb9..41ab1421 100644
--- a/js/actions/whitelabel_actions.js
+++ b/js/actions/whitelabel_actions.js
@@ -14,10 +14,14 @@ class WhitelabelActions {
     fetchWhitelabel() {
         WhitelabelFetcher.fetch()
             .then((res) => {
-                this.actions.updateWhitelabel(res.whitelabel);
+                if(res && res.whitelabel) {
+                    this.actions.updateWhitelabel(res.whitelabel);
+                } else {
+                    this.actions.updateWhitelabel({});
+                }
             })
             .catch((err) => {
-                console.log(err);
+                console.logGlobal(err);
             });
     }
 }
diff --git a/js/app.js b/js/app.js
index 0fc0c191..1bc5d9c0 100644
--- a/js/app.js
+++ b/js/app.js
@@ -14,6 +14,9 @@ import getRoutes from './routes';
 import requests from './utils/requests';
 
 import { getSubdomainSettings } from './utils/constants_utils';
+import { initLogging } from './utils/error_utils';
+
+initLogging();
 
 let headers = {
     'Accept': 'application/json',
@@ -25,18 +28,10 @@ requests.defaults({
     http: {
         headers: headers,
         credentials: 'include'
-    },
-    fatalErrorHandler: (err) => {
-        console.log(err);
     }
 });
 
-Raven.config('https://0955da3388c64ab29bd32c2a429f9ef4@app.getsentry.com/48351', {
-    // pass along the version of your application
-    release: '1.0.0'
-}).install();
 
-window.onerror = Raven.process;
 
 class AppGateway {
 
@@ -57,7 +52,7 @@ class AppGateway {
     }
 
     load(type) {
-        Router.run(getRoutes(type), Router.HistoryLocation, (App, state) => {
+        Router.run(getRoutes(type), Router.HistoryLocation, (App) => {
             if (window.ga) {
                 window.ga('send', 'pageview');
             }
@@ -71,3 +66,4 @@ class AppGateway {
 
 let ag = new AppGateway();
 ag.start();
+
diff --git a/js/components/ascribe_accordion_list/accordion_list_item.js b/js/components/ascribe_accordion_list/accordion_list_item.js
index 54d19078..00235d96 100644
--- a/js/components/ascribe_accordion_list/accordion_list_item.js
+++ b/js/components/ascribe_accordion_list/accordion_list_item.js
@@ -117,7 +117,7 @@ let AccordionListItem = React.createClass({
 
     getLicences() {
         // convert this to acl_view_licences later
-        if (this.state.whitelabel.name === 'Creative Commons France') {
+        if (this.state.whitelabel && this.state.whitelabel.name === 'Creative Commons France') {
             return (
                 <span>
                     <span>, </span>
diff --git a/js/components/ascribe_uploader/react_s3_fine_uploader.js b/js/components/ascribe_uploader/react_s3_fine_uploader.js
index 5e86d043..1c85a659 100644
--- a/js/components/ascribe_uploader/react_s3_fine_uploader.js
+++ b/js/components/ascribe_uploader/react_s3_fine_uploader.js
@@ -1,6 +1,7 @@
 'use strict';
 
 import React from 'react/addons';
+import Raven from 'raven-js';
 
 import { getCookie } from '../../utils/fetch_api_utils';
 import { getLangText } from '../../utils/lang_utils';
diff --git a/js/components/header.js b/js/components/header.js
index 3cf05309..af2171bf 100644
--- a/js/components/header.js
+++ b/js/components/header.js
@@ -2,6 +2,7 @@
 
 import React from 'react';
 import Router from 'react-router';
+import Raven from 'raven-js';
 
 import UserActions from '../actions/user_actions';
 import UserStore from '../stores/user_store';
@@ -69,14 +70,14 @@ let Header = React.createClass({
                 <span>ascribe </span>
                 <span className="glyph-ascribe-spool-chunked ascribe-color"></span>
             </span>);
-        if (this.state.whitelabel.logo){
+        if (this.state.whitelabel && this.state.whitelabel.logo){
             logo = <img className="img-brand" src={this.state.whitelabel.logo} />;
         }
         return logo;
     },
 
     getPoweredBy(){
-        if (this.state.whitelabel.logo) {
+        if (this.state.whitelabel && this.state.whitelabel.logo) {
             return (
                 <li>
                     <a className="pull-right" href="https://www.ascribe.io/" target="_blank">
diff --git a/js/components/register_piece.js b/js/components/register_piece.js
index 58518ab9..37d496a8 100644
--- a/js/components/register_piece.js
+++ b/js/components/register_piece.js
@@ -142,7 +142,7 @@ let RegisterPiece = React.createClass( {
     },
 
     getSpecifyEditions() {
-        if(this.state.whitelabel.acl_editions || Object.keys(this.state.whitelabel).length === 0) {
+        if(this.state.whitelabel && this.state.whitelabel.acl_editions || Object.keys(this.state.whitelabel).length === 0) {
             return (
                 <PropertyCollapsible
                     name="num_editions"
diff --git a/js/constants/application_constants.js b/js/constants/application_constants.js
index ec290f4b..3d3db820 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'],
 
+    'version': 0.1,
     'csrftoken': 'csrftoken2',
     'subdomains': [
         {
@@ -47,7 +48,10 @@ let constants = {
     ],
 
     // in case of whitelabel customization, we store stuff here
-    'whitelabel': {}
+    'whitelabel': {},
+    'raven': {
+        'url': 'https://0955da3388c64ab29bd32c2a429f9ef4@app.getsentry.com/48351'
+    }
 };
 
 export default constants;
diff --git a/js/utils/error_utils.js b/js/utils/error_utils.js
new file mode 100644
index 00000000..4e9de6e2
--- /dev/null
+++ b/js/utils/error_utils.js
@@ -0,0 +1,39 @@
+'use strict';
+
+import Raven from 'raven-js';
+
+import AppConstants from '../constants/application_constants';
+
+
+/**
+ * Logs an error in to the console but also sends it to
+ * Sentry.
+ * Optionally, a comment can be defined.
+ * @param  {Error} error    a Javascript error
+ * @param  {boolean} ignoreSentry Defines whether or not the error should be submitted to Sentry
+ * @param  {string} comment  Will also be submitted to Sentry, but will not be logged
+ */
+function logGlobal(error, ignoreSentry, comment) {
+
+    console.error(error);
+
+    if(!ignoreSentry) {
+        if(comment) {
+            Raven.captureException(error, {extra: { comment }});
+        } else {
+            Raven.captureException(error);
+        }
+    }
+    
+}
+
+export function initLogging() {
+    // Initialize Raven for logging on Sentry
+    Raven.config(AppConstants.raven.url, {
+        release: AppConstants.version
+    }).install();
+
+    window.onerror = Raven.process;
+
+    console.logGlobal = logGlobal;
+}
\ No newline at end of file
diff --git a/js/utils/general_utils.js b/js/utils/general_utils.js
index e74c1e6f..54c7b3ed 100644
--- a/js/utils/general_utils.js
+++ b/js/utils/general_utils.js
@@ -114,6 +114,10 @@ export function mergeOptions(...l) {
 }
 
 /**
+ * Merges a number of objects even if there're having duplicates.
+ *
+ * DOES NOT RETURN AN ERROR!
+ * 
  * Takes a list of object and merges their keys to one object.
  * Uses mergeOptions for two objects.
  * @param  {[type]} l [description]
diff --git a/js/utils/requests.js b/js/utils/requests.js
index e66c8ad5..4341adde 100644
--- a/js/utils/requests.js
+++ b/js/utils/requests.js
@@ -1,11 +1,8 @@
 'use strict';
 
 import { argsToQueryParams, getCookie } from '../utils/fetch_api_utils';
-import AppConstants from '../constants/application_constants';
 
-class UrlMapError extends Error {}
-class ServerError extends Error {}
-class APIError extends Error {}
+import AppConstants from '../constants/application_constants';
 
 
 class Requests {
@@ -22,9 +19,9 @@ class Requests {
 
     unpackResponse(response) {
         if (response.status >= 500) {
-            throw new ServerError();
-        } else if(response.status === 403) {
-            Raven.captureException('csrftoken error');
+            console.logGlobal(new Error(response.status + ': Generic server error - ' + response.statusText));
+        } else if(response.status >= 400 && response.status < 500) {
+            console.logGlobal(new Error(response.status + ': Generic request error - ' + response.statusText));
         }
         return response.text();
     }
@@ -40,19 +37,12 @@ class Requests {
         }
     }
 
-    handleFatalError(err) {
-        this.fatalErrorHandler(err);
-        throw new ServerError(err);
-    }
-
-    handleAPIError(json) {
-        if (json.success === false) {
-            let error = new APIError();
-            error.json = json;
-            //console.error(new Error('The \'success\' property is missing in the server\'s response.'));
-            throw error;
+    handleError(err) {
+        if (err instanceof TypeError) {
+            console.logGlobal('Server did not respond to the request. (Not even displayed a 500)');
+        } else {
+            console.logGlobal(err);
         }
-        return json;
     }
 
     getUrl(url) {
@@ -65,7 +55,7 @@ class Requests {
         if (!url.match(/^http/)) {
             url = this.urlMap[url];
             if (!url) {
-                throw new UrlMapError(`Cannot find a mapping for "${name}"`);
+                throw new Error(`Cannot find a mapping for "${name}"`);
             }
         }
         
@@ -107,11 +97,11 @@ class Requests {
             merged.headers['X-CSRFToken'] = csrftoken;
         }
         merged.method = verb;
+
         return fetch(url, merged)
                     .then(this.unpackResponse)
                     .then(this.customJSONparse)
-                    .catch(this.handleFatalError.bind(this))
-                    .then(this.handleAPIError);
+                    .catch(this.handleError);
     }
 
     get(url, params) {
@@ -143,7 +133,6 @@ class Requests {
     defaults(options) {
         this.httpOptions = options.http || {};
         this.urlMap = options.urlMap || {};
-        this.fatalErrorHandler = options.fatalErrorHandler || (() => {});
     }
 }
 
diff --git a/package.json b/package.json
index d0c48b83..bac4a421 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,7 @@
     "jest-cli": "^0.4.0",
     "lodash": "^3.9.3",
     "object-assign": "^2.0.0",
+    "raven-js": "^1.1.19",
     "react": "^0.13.2",
     "react-bootstrap": "~0.22.6",
     "react-datepicker": "~0.8.0",
diff --git a/sass/ascribe-global-notification.scss b/sass/ascribe_global_notification.scss
similarity index 100%
rename from sass/ascribe-global-notification.scss
rename to sass/ascribe_global_notification.scss
diff --git a/sass/main.scss b/sass/main.scss
index e9c742b4..9fab6aeb 100644
--- a/sass/main.scss
+++ b/sass/main.scss
@@ -21,7 +21,7 @@ $BASE_URL: '<%= BASE_URL %>';
 @import 'ascribe_media_player';
 @import 'ascribe_uploader';
 @import 'ascribe_footer';
-@import 'ascribe-global-notification';
+@import 'ascribe_global_notification';
 @import 'ascribe_piece_register';
 @import 'offset_right';
 @import 'ascribe_settings';