createRedirectToByUserStatus -> createRedirectToForUnauthenticated

packages/app/src/server/middlewares/login-required.js

@@ -1,4 +1,4 @@
-import { createRedirectToByUserStatus } from '~/server/util/createRedirectToByUserStatus';
+import { createRedirectToForUnauthenticated } from '~/server/util/createRedirectToForUnauthenticated';
 import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('growi:middleware:login-required');
@@ -22,7 +22,7 @@ module.exports = (crowi, isGuestAllowed = false, fallback = null) => {
         return next();
       }
 
-      const redirectTo = createRedirectToByUserStatus(req.user.status) ?? '/';
+      const redirectTo = createRedirectToForUnauthenticated(req.user.status) ?? '/login';
       return res.redirect(redirectTo);
     }
 

packages/app/src/server/routes/login-passport.js

@@ -6,7 +6,7 @@ import { SupportedAction } from '~/interfaces/activity';
 import { LoginErrorCode } from '~/interfaces/errors/login-error';
 import { ExternalAccountLoginError } from '~/models/vo/external-account-login-error';
 import { NullUsernameToBeRegisteredError } from '~/server/models/errors';
-import { createRedirectToByUserStatus } from '~/server/util/createRedirectToByUserStatus';
+import { createRedirectToForUnauthenticated } from '~/server/util/createRedirectToForUnauthenticated';
 import loggerFactory from '~/utils/logger';
 
 
@@ -120,8 +120,8 @@ module.exports = function(crowi, app) {
 
     await crowi.activityService.createActivity(parameters);
 
-    const redirectToByUserStatus = createRedirectToByUserStatus(req.user.status);
-    const redirectTo = redirectToByUserStatus ?? res.locals.redirectTo ?? '/';
+    const redirectToForUnauthenticated = createRedirectToForUnauthenticated(req.user.status);
+    const redirectTo = redirectToForUnauthenticated ?? res.locals.redirectTo ?? '/';
 
     if (isExternalAccount) {
       return res.redirect(redirectTo);

packages/app/src/server/util/createRedirectToByUserStatus.ts → packages/app/src/server/util/createRedirectToForUnauthenticated.ts

@@ -1,8 +1,7 @@
 import { USER_STATUS } from '~/interfaces/user';
 import type { IUserStatus } from '~/interfaces/user';
 
-// For unauthorized
-export const createRedirectToByUserStatus = (userStatus: IUserStatus): string | null => {
+export const createRedirectToForUnauthenticated = (userStatus: IUserStatus): string | null => {
   switch (userStatus) {
     case USER_STATUS.REGISTERED:
       return '/login/error/registered';