Merge pull request #1150 from appirio-tech/dev

Sync up changes that include the Topic / Late user join fix...

Author: mtwomey

npm-shrinkwrap.json

@@ -48,10 +48,10 @@
     "isomorphic-fetch": "^2.2.1",
     "lodash": "^4.16.4",
     "moment": "^2.14.1",
+    "query-string": "^4.3.4",
     "react": "^15.6.1",
     "react-addons-css-transition-group": "^15.6.0",
     "react-addons-pure-render-mixin": "^15.6.0",
-    "query-string": "^4.3.4",
     "react-color": "^2.13.1",
     "react-datetime": "2.7.1",
     "react-dom": "^15.6.1",

package.json

@@ -1,6 +1,6 @@
 import _ from 'lodash'
 import { axiosInstance as axios } from './requestInterceptor'
-import { TC_API_URL } from '../config/constants'
+import { TC_API_URL, CONNECT_MESSAGE_API_URL } from '../config/constants'
 
 export function getMembersById (userIds) {
   const _userIdArr = _.map(userIds, _id => `userId:${_id}`)
@@ -29,7 +29,9 @@ export function addProjectMember(projectId, newMember) {
   const url = `${TC_API_URL}/v4/projects/${projectId}/members/`
   return axios.post(url, { param: newMember})
   .then(resp => {
-    return resp.data.result.content
+    return axios.put(`${CONNECT_MESSAGE_API_URL}/v4/topics/syncUsers`,
+    { reference: 'project', referenceId: projectId })
+    .then(() => resp.data.result.content)
   })
 }
 
@@ -42,11 +44,23 @@ export function updateProjectMember(projectId, memberId, updatedProps) {
   })
 }
 
-export function removeProjectMember(projectId, memberId) {
+export function removeProjectMember(projectId, memberId, isUserLeaving) {
   const url = `${TC_API_URL}/v4/projects/${projectId}/members/${memberId}/`
-  return axios.delete(url)
-  .then(resp => { // eslint-disable-line no-unused-vars
-    // return the member id just removed
-    return memberId
+  let promise = { then: fn => fn() }
+  if (isUserLeaving) {
+    promise = axios.put(`${CONNECT_MESSAGE_API_URL}/v4/topics/syncUsers`,
+      { reference: 'project', referenceId: projectId, isUserLeaving })
+  }
+  return promise.then(() => {
+    return axios.delete(url)
+    .then(() => {
+      if (!isUserLeaving) {
+        return axios.put(`${CONNECT_MESSAGE_API_URL}/v4/topics/syncUsers`,
+          { reference: 'project', referenceId: projectId })
+        .then(() => memberId)
+      }
+      // return the member id just removed
+      return memberId
+    })
   })
 }