From 8b9c715bed63a617c858941ed09c3cbbf2466965 Mon Sep 17 00:00:00 2001
From: Maksym Mykhailenko <maxceem@gmail.com>
Date: Fri, 15 Mar 2019 17:11:35 +0800
Subject: [PATCH] fully removed system user token usage

---
 config/custom-environment-variables.json |  2 --
 config/default.json                      |  2 --
 src/events/projectMembers/index.js       |  4 ++--
 src/services/messageService.js           |  4 ----
 src/util.js                              | 14 --------------
 5 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json
index c807e407..4260d83e 100644
--- a/config/custom-environment-variables.json
+++ b/config/custom-environment-variables.json
@@ -22,8 +22,6 @@
   "fileServiceEndpoint": "FILE_SERVICE_ENDPOINT",
   "identityServiceEndpoint": "IDENTITY_SERVICE_ENDPOINT",
   "memberServiceEndpoint": "MEMBER_SERVICE_ENDPOINT",
-  "systemUserClientId": "SYSTEM_USER_CLIENT_ID",
-  "systemUserClientSecret": "SYSTEM_USER_CLIENT_SECRET",
   "connectProjectsUrl": "CONNECT_PROJECTS_URL",
   "dbConfig": {
     "masterUrl": "DB_MASTER_URL",
diff --git a/config/default.json b/config/default.json
index 4da2970e..fa994859 100644
--- a/config/default.json
+++ b/config/default.json
@@ -25,8 +25,6 @@
     "timelineIndexName": "timelines",
     "timelineDocType": "timelineV4"
   },
-  "systemUserClientId": "",
-  "systemUserClientSecret": "",
   "connectProjectUrl":"",
   "dbConfig": {
     "masterUrl": "",
diff --git a/src/events/projectMembers/index.js b/src/events/projectMembers/index.js
index bab7e486..5dfca77c 100644
--- a/src/events/projectMembers/index.js
+++ b/src/events/projectMembers/index.js
@@ -48,7 +48,7 @@ const projectMemberAddedHandler = Promise.coroutine(function* a(logger, msg, cha
         // add copilot/update manager permissions operation promise
         const directProjectId = yield models.Project.getDirectProjectId(projectId);
         if (directProjectId) {
-          const token = yield util.getSystemUserToken(logger);
+          const token = yield util.getM2MToken();
           const req = {
             id: origRequestId,
             log: logger,
@@ -119,7 +119,7 @@ const projectMemberRemovedHandler = Promise.coroutine(function* (logger, msg, ch
       if (_.indexOf([PROJECT_MEMBER_ROLE.COPILOT, PROJECT_MEMBER_ROLE.MANAGER], member.role) > -1) {
         const directProjectId = yield models.Project.getDirectProjectId(projectId);
         if (directProjectId) {
-          const token = yield util.getSystemUserToken(logger);
+          const token = yield util.getM2MToken();
           const req = {
             id: origRequestId,
             log: logger,
diff --git a/src/services/messageService.js b/src/services/messageService.js
index 4ea5f04b..949c0134 100644
--- a/src/services/messageService.js
+++ b/src/services/messageService.js
@@ -65,12 +65,8 @@ async function getClient(logger) {
 function createTopic(topic, logger) {
   logger.debug(`createTopic for topic: ${JSON.stringify(topic)}`);
   return getClient(logger).then((msgClient) => {
-  // return util.getSystemUserToken(logger).then((adminToken) => {
     logger.debug('calling message service');
     return msgClient.post('/topics/create', topic)
-    // const httpClient = util.getHttpClient({ id: `topic#create#${topic.referenceId}`, log: logger });
-    // httpClient.defaults.headers.common.Authorization = `Bearer ${adminToken}`;
-    // return httpClient.post(`${config.get('messageApiUrl')}/topics/create`, topic)
       .then((resp) => {
         logger.debug('Topic created successfully');
         logger.debug(`Topic created successfully [status]: ${resp.status}`);
diff --git a/src/util.js b/src/util.js
index 853e71c4..b706f7f8 100644
--- a/src/util.js
+++ b/src/util.js
@@ -261,20 +261,6 @@ _.assignIn(util, {
       });
   },
 
-  getSystemUserToken: (logger, id = 'system') => {
-    const httpClient = util.getHttpClient({ id, log: logger });
-    const url = `${config.get('identityServiceEndpoint')}authorizations`;
-    const formData = `clientId=${config.get('systemUserClientId')}&` +
-      `secret=${encodeURIComponent(config.get('systemUserClientSecret'))}`;
-    return httpClient.post(url, formData,
-      {
-        timeout: 4000,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      },
-    )
-      .then(res => res.data.result.content.token);
-  },
-
   /**
    * Get machine to machine token.
    * @returns {Promise} promise which resolves to the m2m token