bugfix

apps/app/src/server/service/acl.ts

@@ -6,17 +6,8 @@ import { configManager } from './config-manager';
 const logger = loggerFactory('growi:service:AclService');
 
 
-const labels = {
-  SECURITY_RESTRICT_GUEST_MODE_DENY: 'Deny',
-  SECURITY_RESTRICT_GUEST_MODE_READONLY: 'Readonly',
-  // --- unused labels ---
-  // SECURITY_REGISTRATION_MODE_OPEN: 'Open',
-  // SECURITY_REGISTRATION_MODE_RESTRICTED: 'Restricted',
-  // SECURITY_REGISTRATION_MODE_CLOSED: 'Closed',
-};
-
-
 export interface AclService {
+  get labels(): { [key: string]: string },
   isAclEnabled(): boolean,
   isWikiModeForced(): boolean,
   isGuestAllowedToRead(): boolean,
@@ -28,6 +19,16 @@ export interface AclService {
  */
 class AclServiceImpl implements AclService {
 
+  get labels() {
+    return {
+      SECURITY_RESTRICT_GUEST_MODE_DENY: 'Deny',
+      SECURITY_RESTRICT_GUEST_MODE_READONLY: 'Readonly',
+      SECURITY_REGISTRATION_MODE_OPEN: 'Open',
+      SECURITY_REGISTRATION_MODE_RESTRICTED: 'Restricted',
+      SECURITY_REGISTRATION_MODE_CLOSED: 'Closed',
+    };
+  }
+
   /**
    * @returns Whether Access Control is enabled or not
    */
@@ -65,13 +66,13 @@ class AclServiceImpl implements AclService {
 
     // 'Readonly' => returns true (allow access to guests)
     // 'Deny', null, undefined, '', ... everything else => returns false (requires login)
-    return guestMode === labels.SECURITY_RESTRICT_GUEST_MODE_READONLY;
+    return guestMode === this.labels.SECURITY_RESTRICT_GUEST_MODE_READONLY;
   }
 
   getGuestModeValue() {
     return this.isGuestAllowedToRead()
-      ? labels.SECURITY_RESTRICT_GUEST_MODE_READONLY
-      : labels.SECURITY_RESTRICT_GUEST_MODE_DENY;
+      ? this.labels.SECURITY_RESTRICT_GUEST_MODE_READONLY
+      : this.labels.SECURITY_RESTRICT_GUEST_MODE_DENY;
   }
 
 }

apps/app/test/integration/models/config.test.js

@@ -1,19 +0,0 @@
-const { getInstance } = require('../setup-crowi');
-
-describe('Config model test', () => {
-  // eslint-disable-next-line no-unused-vars
-  let crowi;
-
-  beforeAll(async() => {
-    crowi = await getInstance();
-  });
-
-  describe('.CONSTANTS', () => {
-    test('AclService has constants', async() => {
-      expect(crowi.aclService.labels.SECURITY_REGISTRATION_MODE_OPEN).toBe('Open');
-      expect(crowi.aclService.labels.SECURITY_REGISTRATION_MODE_RESTRICTED).toBe('Restricted');
-      expect(crowi.aclService.labels.SECURITY_REGISTRATION_MODE_CLOSED).toBe('Closed');
-    });
-  });
-
-});

apps/app/test/integration/service/acl.test.ts

@@ -1,6 +1,17 @@
 import { aclService } from '../../../src/server/service/acl';
 import { configManager } from '../../../src/server/service/config-manager';
 
+
+describe('AclService', () => {
+  test("has consts 'isLabeledStatement'", () => {
+    expect(aclService.labels.SECURITY_RESTRICT_GUEST_MODE_DENY).toBe('Deny');
+    expect(aclService.labels.SECURITY_RESTRICT_GUEST_MODE_READONLY).toBe('Readonly');
+    expect(aclService.labels.SECURITY_REGISTRATION_MODE_OPEN).toBe('Open');
+    expect(aclService.labels.SECURITY_REGISTRATION_MODE_RESTRICTED).toBe('Restricted');
+    expect(aclService.labels.SECURITY_REGISTRATION_MODE_CLOSED).toBe('Closed');
+  });
+});
+
 describe('AclService test', () => {
 
   const initialEnv = process.env;
@@ -13,7 +24,6 @@ describe('AclService test', () => {
     process.env = initialEnv;
   });
 
-
   describe('isAclEnabled()', () => {
 
     test('to be false when FORCE_WIKI_MODE is undefined', async() => {