From 2fd3aa8c71d12ea8b1a044b2f92695ad60888a9c Mon Sep 17 00:00:00 2001
From: David Sevilla Martin <me@datitisev.me>
Date: Mon, 16 Dec 2019 18:25:39 -0500
Subject: [PATCH] Update app.request calls to use 'body' instead of 'data' for
 form data

---
 js/src/common/Model.ts                       | 6 +++---
 js/src/common/Session.ts                     | 2 +-
 js/src/common/Store.ts                       | 6 +++---
 js/src/forum/components/AvatarEditor.tsx     | 8 ++++----
 js/src/forum/components/NotificationList.tsx | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/js/src/common/Model.ts b/js/src/common/Model.ts
index 8075173bf..7956d3342 100644
--- a/js/src/common/Model.ts
+++ b/js/src/common/Model.ts
@@ -147,7 +147,7 @@ export default class Model {
     return app.request(Object.assign({
       method: this.exists ? 'PATCH' : 'POST',
       url: app.forum.attribute('apiUrl') + this.apiEndpoint(),
-      data: request
+      body: request
     }, options)).then(
       // If everything went well, we'll make sure the store knows that this
       // model exists now (if it didn't already), and we'll push the data that
@@ -176,13 +176,13 @@ export default class Model {
    * @return {Promise}
    * @public
    */
-  delete(data, options = {}) {
+  delete(body, options = {}) {
     if (!this.exists) return m.deferred.resolve().promise;
 
     return app.request(Object.assign({
       method: 'DELETE',
       url: app.forum.attribute('apiUrl') + this.apiEndpoint(),
-      data
+      body
     }, options)).then(() => {
       this.exists = false;
       this.store.remove(this);
diff --git a/js/src/common/Session.ts b/js/src/common/Session.ts
index 1d948cf2e..41819533a 100644
--- a/js/src/common/Session.ts
+++ b/js/src/common/Session.ts
@@ -27,7 +27,7 @@ export default class Session {
   login(body: { identification: string, password: string }, options = {}) {
     return app.request(Object.assign({
       method: 'POST',
-      url: app.forum.attribute('baseUrl') + '/login',
+      url: `${app.forum.attribute('baseUrl')}/login`,
       body
     }, options));
   }
diff --git a/js/src/common/Store.ts b/js/src/common/Store.ts
index ab9b1683c..c7c54ad00 100644
--- a/js/src/common/Store.ts
+++ b/js/src/common/Store.ts
@@ -78,13 +78,13 @@ export default class Store {
    * @param options
    */
   find<T extends Model = Model>(type: string, id?: number|number[]|any, query = {}, options = {}): Promise<T[]> {
-    let data = query;
+    let body = query;
     let url = `${app.forum.attribute('apiUrl')}/${type}`;
 
     if (id instanceof Array) {
       url += `?filter[id]=${id.join(',')}`;
     } else if (typeof id === 'object') {
-      data = id;
+        body = id;
     } else if (id) {
       url += `/${id}`;
     }
@@ -92,7 +92,7 @@ export default class Store {
     return app.request(Object.assign({
       method: 'GET',
       url,
-      data
+      body
     }, options)).then(this.pushPayload.bind(this));
   }
 
diff --git a/js/src/forum/components/AvatarEditor.tsx b/js/src/forum/components/AvatarEditor.tsx
index 921ebd24f..f00898db9 100644
--- a/js/src/forum/components/AvatarEditor.tsx
+++ b/js/src/forum/components/AvatarEditor.tsx
@@ -158,7 +158,7 @@ export default class AvatarEditor extends Component<AvatarEditorProps> {
     if (this.loading) return;
 
     const user = this.props.user;
-    const data = new FormData();
+    const body = new FormData();
     data.append('avatar', file);
 
     this.loading = true;
@@ -166,9 +166,9 @@ export default class AvatarEditor extends Component<AvatarEditorProps> {
 
     app.request({
       method: 'POST',
-      url: app.forum.attribute('apiUrl') + '/users/' + user.id() + '/avatar',
+      url: `${app.forum.attribute('apiUrl')}/users/${user.id()}/avatar`,
       serialize: raw => raw,
-      data
+      body
     }).then(
       this.success.bind(this),
       this.failure.bind(this)
@@ -186,7 +186,7 @@ export default class AvatarEditor extends Component<AvatarEditorProps> {
 
     app.request({
       method: 'DELETE',
-      url: app.forum.attribute('apiUrl') + '/users/' + user.id() + '/avatar'
+      url: `${app.forum.attribute('apiUrl')}/users/${user.id()}/avatar`
     }).then(
       this.success.bind(this),
       this.failure.bind(this)
diff --git a/js/src/forum/components/NotificationList.tsx b/js/src/forum/components/NotificationList.tsx
index ae7dcec5f..271734757 100644
--- a/js/src/forum/components/NotificationList.tsx
+++ b/js/src/forum/components/NotificationList.tsx
@@ -193,7 +193,7 @@ export default class NotificationList extends Component {
     });
 
     app.request({
-      url: app.forum.attribute('apiUrl') + '/notifications/read',
+      url: `${app.forum.attribute('apiUrl')}/notifications/read`,
       method: 'POST'
     });
   }