Move ETHERPAD_COOKIE_RELEASE_THRESHOLD to etherpad object

apps/server/src/modules/collaborative-text-editor/collaborative-text-editor.config.ts

@@ -1,5 +1,5 @@
 export interface CollaborativeTextEditorConfig {
 	ETHERPAD__COOKIE_EXPIRES_SECONDS: number;
-	ETHERPAD_COOKIE_RELEASE_THRESHOLD: number;
+	ETHERPAD__COOKIE_RELEASE_THRESHOLD: number;
 	ETHERPAD__PAD_URI: string;
 }

apps/server/src/modules/collaborative-text-editor/service/collaborative-text-editor.service.ts

@@ -22,7 +22,7 @@ export class CollaborativeTextEditorService {
 		params: GetCollaborativeTextEditorForParentParams
 	): Promise<CollaborativeTextEditor> {
 		const sessionExpiryDate = this.buildSessionExpiryDate();
-		const durationThreshold = Number(this.configService.get('ETHERPAD_COOKIE_RELEASE_THRESHOLD'));
+		const durationThreshold = Number(this.configService.get('ETHERPAD__COOKIE_RELEASE_THRESHOLD'));
 		const { parentId } = params;
 
 		const groupId = await this.collaborativeTextEditorAdapter.getOrCreateGroupId(parentId);

apps/server/src/modules/server/server.config.ts

@@ -229,7 +229,7 @@ const config: ServerConfig = {
 	FEATURE_ETHERPAD_ENABLED: Configuration.get('FEATURE_ETHERPAD_ENABLED') as boolean,
 	ETHERPAD__PAD_URI: Configuration.get('ETHERPAD__PAD_URI') as string,
 	ETHERPAD__COOKIE_EXPIRES_SECONDS: Configuration.get('ETHERPAD__COOKIE_EXPIRES_SECONDS') as number,
-	ETHERPAD_COOKIE_RELEASE_THRESHOLD: Configuration.get('ETHERPAD_COOKIE_RELEASE_THRESHOLD') as number,
+	ETHERPAD__COOKIE_RELEASE_THRESHOLD: Configuration.get('ETHERPAD__COOKIE_RELEASE_THRESHOLD') as number,
 	I18N__AVAILABLE_LANGUAGES: (Configuration.get('I18N__AVAILABLE_LANGUAGES') as string).split(',') as LanguageType[],
 	I18N__DEFAULT_LANGUAGE: Configuration.get('I18N__DEFAULT_LANGUAGE') as unknown as LanguageType,
 	I18N__FALLBACK_LANGUAGE: Configuration.get('I18N__FALLBACK_LANGUAGE') as unknown as LanguageType,

config/default.schema.json

@@ -814,14 +814,14 @@
 					"type": "integer",
 					"default": 28800,
 					"description": "Number of seconds after an etherpad cookie expires."
+				},
+				"COOKIE_RELEASE_THRESHOLD": {
+					"type": "integer",
+					"default": 7200,
+					"description": "If Session Valid time is smaller than this, a new session is created on request."
 				}
 			}
 		},
-		"ETHERPAD_COOKIE_RELEASE_THRESHOLD": {
-			"type": "integer",
-			"default": 7200,
-			"description": "If Session Valid time is smaller than this, a new session is created on request."
-		},
 		"NEXTCLOUD_BASE_URL": {
 			"type": "string",
 			"default": "http://nextcloud.localhost:9090",

src/services/etherpad/utils/EtherpadClient.js

@@ -24,8 +24,8 @@ class EtherpadClient {
 		} else {
 			this.cookieExpiresSeconds = 28800;
 		}
-		if (Configuration.has('ETHERPAD_COOKIE_RELEASE_THRESHOLD')) {
-			this.cookieReleaseThreshold = Configuration.get('ETHERPAD_COOKIE_RELEASE_THRESHOLD');
+		if (Configuration.has('ETHERPAD__COOKIE_RELEASE_THRESHOLD')) {
+			this.cookieReleaseThreshold = Configuration.get('ETHERPAD__COOKIE_RELEASE_THRESHOLD');
 		} else {
 			this.cookieReleaseThreshold = 7200;
 		}