Merge branch 'develop'v5.4.0

1 files changed, 52 insertions, 0 deletions

diff --git a/src/stores/GlobalErrorStore.js b/src/stores/GlobalErrorStore.js
index 8bdafb68c..aacaa247f 100644
--- a/src/stores/GlobalErrorStore.js
+++ b/src/stores/GlobalErrorStore.js
@@ -5,14 +5,54 @@ import Request from './lib/Request';
 export default class GlobalErrorStore extends Store {
   @observable error = null;
 
+  @observable messages = [];
+
   @observable response = {};
 
   constructor(...args) {
     super(...args);
 
+    window.onerror = (...errorArgs) => {
+      this._handleConsoleError.call(this, ['error', ...errorArgs]);
+    };
+
+    const origConsoleError = console.error;
+    window.console.error = (...errorArgs) => {
+      this._handleConsoleError.call(this, ['error', ...errorArgs]);
+      origConsoleError.apply(this, errorArgs);
+    };
+
+    const origConsoleLog = console.log;
+    window.console.log = (...logArgs) => {
+      this._handleConsoleError.call(this, ['log', ...logArgs]);
+      origConsoleLog.apply(this, logArgs);
+    };
+
+    const origConsoleInfo = console.info;
+    window.console.info = (...infoArgs) => {
+      this._handleConsoleError.call(this, ['info', ...infoArgs]);
+      origConsoleInfo.apply(this, infoArgs);
+    };
+
     Request.registerHook(this._handleRequests);
   }
 
+  _handleConsoleError(type, error, url, line) {
+    if (typeof type === 'object' && type.length && type.length >= 1) {
+      this.messages.push({
+        type: type[0],
+        info: type,
+      });
+    } else {
+      this.messages.push({
+        type,
+        error,
+        url,
+        line,
+      });
+    }
+  }
+
   _handleRequests = action(async (request) => {
     if (request.isError) {
       this.error = request.error;
@@ -28,6 +68,18 @@ export default class GlobalErrorStore extends Store {
           // this.actions.user.logout({ serverLogout: true });
         }
       }
+
+      this.messages.push({
+        type: 'error',
+        request: {
+          result: request.result,
+          wasExecuted: request.wasExecuted,
+          method: request._method,
+        },
+        error: this.error,
+        response: this.response,
+        server: window.ferdi.stores.settings.app.server,
+      });
     } else {
       window.ferdi.stores.app.authRequestFailed = false;
     }