Merge branch 'master' into feat--get-all-attribute-groups

Author: tdeleanu

lib/Request.js

@@ -234,7 +234,12 @@ class Request {
       return error;
     }
 
-    error = new CoreError(error, { statusCode: error.status });
+    const message =
+      error.response && error.response.body && error.response.body.message
+        ? error.response.body.message
+        : error.message || error;
+
+    error = new CoreError(message, { statusCode: error.status });
     return error;
   }
 

lib/Services/cayenne.js

@@ -1010,7 +1010,7 @@ class Cayenne extends Request {
    */
   migrateUser(payload, opts) {
     const path = `/move/users`;
-    opts = { response: 60000, deadline: 90000, ...opts };
+    opts = { response: 300000, deadline: 310000, ...opts };
     opts.payload = payload;
     return this.send('POST', path, opts);
   }

lib/Services/executor.js

@@ -241,7 +241,7 @@ class Executor extends Request {
    */
   migrateUser(payload, opts) {
     const path = `/move/users`;
-    opts = { response: 60000, deadline: 90000, ...opts };
+    opts = { response: 300000, deadline: 310000, ...opts };
     opts.payload = payload;
     return this.send('POST', path, opts);
   }

lib/Services/hermes.js

@@ -175,7 +175,7 @@ class Hermes extends Request {
    */
   migrateUser(payload, opts) {
     const path = `/move/users`;
-    opts = { response: 60000, deadline: 90000, ...opts };
+    opts = { response: 300000, deadline: 310000, ...opts };
     opts.payload = payload;
     return this.send('POST', path, opts);
   }

lib/Services/timekeeper.js

@@ -95,6 +95,17 @@ class Timekeeper extends Request {
 
     return this.send('DELETE', path, { query });
   }
+
+  /**
+   * @param {Object} payload
+   * @param {Object} opts
+   */
+  migrateUser(payload, opts) {
+    const path = `/move/users`;
+    opts = { response: 300000, deadline: 310000, ...opts };
+    opts.payload = payload;
+    return this.send('POST', path, opts);
+  }
 }
 
 module.exports = Timekeeper;