Merge branch 'feat/4572-get-contributors-with-gc-api' into feat/4573-add-staff-credit-data

src/server/routes/apiv3/index.js

@@ -46,7 +46,7 @@ module.exports = (crowi) => {
   router.use('/bookmarks', require('./bookmarks')(crowi));
   router.use('/attachment', require('./attachment')(crowi));
 
-  router.use('/growi-cloud', require('./growi-cloud')(crowi));
+  router.use('/staffs', require('./staffs')(crowi));
 
   return router;
 };

src/server/routes/apiv3/growi-cloud.js → src/server/routes/apiv3/staffs.js

@@ -4,9 +4,11 @@ const axios = require('axios');
 
 const router = express.Router();
 
+const contributors = require('../../../client/js/components/StaffCredit/Contributor');
+
 module.exports = (crowi) => {
 
-  router.get('/staff-credit', async(req, res) => {
+  router.get('/', async(req, res) => {
     const growiCloudUri = await crowi.configManager.getConfig('crowi', 'app:growiCloudUri');
     if (growiCloudUri == null) {
       return res.json({});
@@ -14,7 +16,11 @@ module.exports = (crowi) => {
     const url = new URL('_api/staffCredit', growiCloudUri);
     try {
       const gcContributorsRes = await axios.get(url.toString());
-      return res.apiv3(gcContributorsRes.data);
+      // prevent merge gcContributors to contributors more than once
+      if (contributors[1].sectionName !== 'GROWI-cloud') {
+        contributors.splice(1, 0, gcContributorsRes.data);
+      }
+      return res.apiv3({ contributors });
     }
     catch (err) {
       return res.apiv3Err(err, 500);