From c060a5c798b4782b3d919714d5d5088e51fdec53 Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Thu, 24 May 2018 21:19:38 -0700
Subject: [PATCH] id -> documentId

---
 app/models/Document.js    | 5 +----
 server/api/shares.js      | 8 ++++----
 server/api/shares.test.js | 8 ++++----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/models/Document.js b/app/models/Document.js
index a38850be..ba17afbe 100644
--- a/app/models/Document.js
+++ b/app/models/Document.js
@@ -43,8 +43,6 @@ class Document extends BaseModel {
   views: number;
   revision: number;
 
-  data: Object;
-
   /* Computed */
 
   @computed
@@ -104,7 +102,7 @@ class Document extends BaseModel {
   @action
   share = async () => {
     try {
-      const res = await client.post('/shares.create', { id: this.id });
+      const res = await client.post('/shares.create', { documentId: this.id });
       invariant(res && res.data, 'Document API response should be available');
 
       this.shareUrl = res.data.url;
@@ -289,7 +287,6 @@ class Document extends BaseModel {
       data.emoji = emoji;
     }
     if (dirty) this.hasPendingChanges = true;
-    this.data = data;
     extendObservable(this, data);
   }
 
diff --git a/server/api/shares.js b/server/api/shares.js
index 0a3e3898..ce2fb9e1 100644
--- a/server/api/shares.js
+++ b/server/api/shares.js
@@ -45,16 +45,16 @@ router.post('shares.list', auth(), pagination(), async ctx => {
 });
 
 router.post('shares.create', auth(), async ctx => {
-  const { id } = ctx.body;
-  ctx.assertPresent(id, 'id is required');
+  const { documentId } = ctx.body;
+  ctx.assertPresent(documentId, 'documentId is required');
 
   const user = ctx.state.user;
-  const document = await Document.findById(id);
+  const document = await Document.findById(documentId);
   authorize(user, 'share', document);
 
   const [share] = await Share.findOrCreate({
     where: {
-      documentId: document.id,
+      documentId,
       userId: user.id,
       teamId: user.teamId,
     },
diff --git a/server/api/shares.test.js b/server/api/shares.test.js
index 30df40f6..73000777 100644
--- a/server/api/shares.test.js
+++ b/server/api/shares.test.js
@@ -62,7 +62,7 @@ describe('#shares.create', async () => {
   it('should allow creating a share record for document', async () => {
     const { user, document } = await seed();
     const res = await server.post('/api/shares.create', {
-      body: { token: user.getJwtToken(), id: document.id },
+      body: { token: user.getJwtToken(), documentId: document.id },
     });
     const body = await res.json();
 
@@ -78,7 +78,7 @@ describe('#shares.create', async () => {
       userId: user.id,
     });
     const res = await server.post('/api/shares.create', {
-      body: { token: user.getJwtToken(), id: document.id },
+      body: { token: user.getJwtToken(), documentId: document.id },
     });
     const body = await res.json();
 
@@ -89,7 +89,7 @@ describe('#shares.create', async () => {
   it('should require authentication', async () => {
     const { document } = await seed();
     const res = await server.post('/api/shares.create', {
-      body: { id: document.id },
+      body: { documentId: document.id },
     });
     const body = await res.json();
 
@@ -101,7 +101,7 @@ describe('#shares.create', async () => {
     const { document } = await seed();
     const user = await buildUser();
     const res = await server.post('/api/shares.create', {
-      body: { token: user.getJwtToken(), id: document.id },
+      body: { token: user.getJwtToken(), documentId: document.id },
     });
     expect(res.status).toEqual(403);
   });