kaori 4 лет назад
Родитель
Сommit
ca2ffb6f5f

+ 1 - 1
packages/app/src/components/MaintenanceModeContent.tsx

@@ -14,7 +14,7 @@ const MaintenanceModeContent = () => {
 
 
   const logoutHandler = async() => {
   const logoutHandler = async() => {
     try {
     try {
-      apiv3Post('/logout');
+      await apiv3Post('/logout');
       window.location.reload();
       window.location.reload();
     }
     }
     catch (err) {
     catch (err) {

+ 2 - 2
packages/app/src/components/Navbar/PersonalDropdown.jsx

@@ -39,14 +39,14 @@ const PersonalDropdown = (props) => {
   const { data: isPreferDrawerModeOnEdit, mutate: mutatePreferDrawerModeOnEdit } = usePreferDrawerModeOnEditByUser();
   const { data: isPreferDrawerModeOnEdit, mutate: mutatePreferDrawerModeOnEdit } = usePreferDrawerModeOnEditByUser();
   const { scheduleToPut } = useUserUISettings();
   const { scheduleToPut } = useUserUISettings();
 
 
-  const logoutHandler = () => {
+  const logoutHandler = async() => {
     const { interceptorManager } = appContainer;
     const { interceptorManager } = appContainer;
 
 
     const context = {};
     const context = {};
     interceptorManager.process('logout', context);
     interceptorManager.process('logout', context);
 
 
     try {
     try {
-      appContainer.apiv3Post('/logout');
+      await appContainer.apiv3Post('/logout');
       window.location.reload();
       window.location.reload();
     }
     }
     catch (err) {
     catch (err) {

+ 2 - 1
packages/app/src/server/routes/apiv3/logout.js

@@ -8,7 +8,8 @@ const router = express.Router();
 
 
 module.exports = (crowi) => {
 module.exports = (crowi) => {
   router.post('/', async(req, res) => {
   router.post('/', async(req, res) => {
-    return req.session.destroy();
+    req.session.destroy();
+    return res.send();
   });
   });
 
 
   return router;
   return router;