Shun Miyazawa %!s(int64=3) %!d(string=hai) anos
pai
achega
68a74b8975
Modificáronse 1 ficheiros con 5 adicións e 4 borrados
  1. 5 4
      packages/app/src/pages/utils/commons.ts

+ 5 - 4
packages/app/src/pages/utils/commons.ts

@@ -45,16 +45,17 @@ export const getServerSideCommonProps: GetServerSideProps<CommonProps> = async(c
     currentUser = user.toObject();
   }
 
+  // Redirect destination for page transition by next/link
   let redirectDestination: string | null = null;
-  if (!isMaintenanceMode && currentPathname === '/maintenance') {
+  if (!crowi.aclService.isGuestAllowedToRead() && currentUser == null) {
+    redirectDestination = '/login';
+  }
+  else if (!isMaintenanceMode && currentPathname === '/maintenance') {
     redirectDestination = '/';
   }
   else if (isMaintenanceMode && !currentPathname.match('/admin/*') && !(currentPathname === '/maintenance')) {
     redirectDestination = '/maintenance';
   }
-  else if (!crowi.aclService.isGuestAllowedToRead() && currentUser == null) {
-    redirectDestination = '/login';
-  }
   else {
     redirectDestination = null;
   }