Merge branch 'dev/7.4.x' into fix/175423-latest-revision-is-displayed-when-directly-accessing-past-revision-url

Author: miya

apps/app/.eslintrc.js

@@ -74,6 +74,20 @@ module.exports = {
     'src/server/routes/apiv3/*.ts',
     'src/server/service/*.ts',
     'src/server/service/*.js',
+    'src/server/service/access-token/**',
+    'src/server/service/config-manager/**',
+    'src/server/service/page/**',
+    'src/server/service/page-listing/**',
+    'src/server/service/revision/**',
+    'src/server/service/s2s-messaging/**',
+    'src/server/service/search-delegator/**',
+    'src/server/service/search-reconnect-context/**',
+    'src/server/service/slack-command-handler/**',
+    'src/server/service/slack-event-handler/**',
+    'src/server/service/socket-io/**',
+    'src/server/service/system-events/**',
+    'src/server/service/user-notification/**',
+    'src/server/service/yjs/**',
   ],
   settings: {
     // resolve path aliases by eslint-import-resolver-typescript

apps/app/src/server/service/access-token/access-token-deletion-cron.ts

@@ -7,14 +7,15 @@ import loggerFactory from '~/utils/logger';
 const logger = loggerFactory('growi:service:access-token-deletion-cron');
 
 export class AccessTokenDeletionCronService {
-
   cronJob: nodeCron.ScheduledTask;
 
   // Default execution at midnight
   accessTokenDeletionCronExpression = '0 15 * * *';
 
   startCron(): void {
-    const cronExp = configManager.getConfig('accessToken:deletionCronExpression');
+    const cronExp = configManager.getConfig(
+      'accessToken:deletionCronExpression',
+    );
     if (cronExp != null) {
       this.accessTokenDeletionCronExpression = cronExp;
     }
@@ -30,23 +31,26 @@ export class AccessTokenDeletionCronService {
     try {
       await AccessToken.deleteExpiredToken();
       logger.info('Expired access tokens have been deleted');
-    }
-    catch (e) {
+    } catch (e) {
       logger.error('Failed to delete expired access tokens:', e);
     }
   }
 
   private generateCronJob() {
-    return nodeCron.schedule(this.accessTokenDeletionCronExpression, async() => {
-      try {
-        await this.executeJob();
-      }
-      catch (e) {
-        logger.error('Error occurred during access token deletion cron job:', e);
-      }
-    });
+    return nodeCron.schedule(
+      this.accessTokenDeletionCronExpression,
+      async () => {
+        try {
+          await this.executeJob();
+        } catch (e) {
+          logger.error(
+            'Error occurred during access token deletion cron job:',
+            e,
+          );
+        }
+      },
+    );
   }
-
 }
 
 export const startCron = (): void => {