Merge pull request #3424 from weseek/feat/4328-5164-escap-execute-extra-api

Feat/4328 5164 fix api condition and api return variable

src/client/js/components/StaffCredit/StaffCredit.jsx

@@ -87,7 +87,7 @@ class StaffCredit extends React.Component {
 
   async componentDidMount() {
     const res = await this.props.appContainer.apiv3Get('/staffs');
-    const contributors = res.data.contributorsCache;
+    const contributors = res.data.contributors;
     this.setState({ contributors });
 
     setTimeout(() => {

src/server/routes/apiv3/staffs.js

@@ -26,7 +26,7 @@ module.exports = (crowi) => {
     const now = new Date();
     const growiCloudUri = await crowi.configManager.getConfig('crowi', 'app:growiCloudUri');
 
-    if (expiredAt == null || isAfter(now, expiredAt) || growiCloudUri != null) {
+    if (growiCloudUri != null && (expiredAt == null || isAfter(now, expiredAt))) {
       const url = new URL('_api/staffCredit', growiCloudUri);
       try {
         const gcContributorsRes = await axios.get(url.toString());
@@ -44,7 +44,7 @@ module.exports = (crowi) => {
         logger.warn('Getting GROWI.cloud staffcredit is failed');
       }
     }
-    return res.apiv3({ contributorsCache });
+    return res.apiv3({ contributors: contributorsCache });
   });
 
   return router;