adjust toaster

src/client/js/components/Me/BasicInfoSettings.jsx

@@ -21,8 +21,13 @@ class BasicInfoSettings extends React.Component {
     this.onClickSubmit = this.onClickSubmit.bind(this);
   }
 
-  componentDidMount() {
-    this.props.personalContainer.retrievePersonalData();
+  async componentDidMount() {
+    try {
+      await this.props.personalContainer.retrieveExternalAccounts();
+    }
+    catch (err) {
+      toastError(err);
+    }
   }
 
   async onClickSubmit() {

src/client/js/components/Me/ExternalAccountLinkedMe.jsx

@@ -4,6 +4,8 @@ import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
 import { createSubscribedElement } from '../UnstatedUtils';
+import { toastError } from '../../util/apiNotification';
+
 import AppContainer from '../../services/AppContainer';
 import PersonalContainer from '../../services/PersonalContainer';
 import ExternalAccountRow from './ExternalAccountRow';
@@ -11,7 +13,12 @@ import ExternalAccountRow from './ExternalAccountRow';
 class ExternalAccountLinkedMe extends React.Component {
 
   async componentDidMount() {
-    this.props.personalContainer.retrieveExternalAccounts();
+    try {
+      await this.props.personalContainer.retrieveExternalAccounts();
+    }
+    catch (err) {
+      toastError(err);
+    }
   }
 
   render() {

src/client/js/services/PersonalContainer.js

@@ -2,8 +2,6 @@ import { Container } from 'unstated';
 
 import loggerFactory from '@alias/logger';
 
-import { toastError } from '../util/apiNotification';
-
 // eslint-disable-next-line no-unused-vars
 const logger = loggerFactory('growi:services:PersonalContainer');
 
@@ -53,9 +51,9 @@ export default class PersonalContainer extends Container {
       });
     }
     catch (err) {
-      this.setState({ retrieveError: err.message });
+      this.setState({ retrieveError: err });
       logger.error(err);
-      toastError(new Error('Failed to fetch data'));
+      throw new Error('Failed to fetch personal data');
     }
   }
 
@@ -70,9 +68,9 @@ export default class PersonalContainer extends Container {
       this.setState({ externalAccounts });
     }
     catch (err) {
-      this.setState({ retrieveError: err.message });
+      this.setState({ retrieveError: err });
       logger.error(err);
-      toastError(new Error('Failed to fetch data'));
+      throw new Error('Failed to fetch external accounts');
     }
   }
 

src/server/routes/apiv3/personal-setting.js

@@ -52,25 +52,25 @@ module.exports = (crowi) => {
   });
 
   /**
- * @swagger
- *
- *    /personal-setting/external-accounts:
- *      get:
- *        tags: [PersonalSetting]
- *        operationId: getExternalAccounts
- *        summary: /personal-setting/external-accounts
- *        description: Get external accounts that linked current user
- *        responses:
- *          200:
- *            description: external accounts
- *            content:
- *              application/json:
- *                schema:
- *                  externalAccounts:
- *                    currentUser:
- *                      type: object
- *                      description: array of external accounts
- */
+   * @swagger
+   *
+   *    /personal-setting/external-accounts:
+   *      get:
+   *        tags: [PersonalSetting]
+   *        operationId: getExternalAccounts
+   *        summary: /personal-setting/external-accounts
+   *        description: Get external accounts that linked current user
+   *        responses:
+   *          200:
+   *            description: external accounts
+   *            content:
+   *              application/json:
+   *                schema:
+   *                  externalAccounts:
+   *                    currentUser:
+   *                      type: object
+   *                      description: array of external accounts
+   */
   router.get('/external-accounts', loginRequiredStrictly, async(req, res) => {
     const userData = req.user;