From 5a78228af31269de4b6a9818cbf699689d6b427f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 7 Feb 2023 00:16:53 +0100
Subject: [PATCH] remove EVENT_PROTOCOL_DISABLED from backend & bare_metal
 deployment

---
 backend/.env.dist                         | 3 ---
 backend/.env.template                     | 3 ---
 backend/src/config/index.ts               | 7 +------
 backend/src/event/EventProtocolEmitter.ts | 6 ------
 deployment/bare_metal/.env.dist           | 5 +----
 5 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/backend/.env.dist b/backend/.env.dist
index ba5b89fa9..3e54b0566 100644
--- a/backend/.env.dist
+++ b/backend/.env.dist
@@ -55,9 +55,6 @@ EMAIL_CODE_REQUEST_TIME=10
 # Webhook
 WEBHOOK_ELOPAGE_SECRET=secret
 
-# EventProtocol
-EVENT_PROTOCOL_DISABLED=false
-
 # SET LOG LEVEL AS NEEDED IN YOUR .ENV
 # POSSIBLE VALUES: all | trace | debug | info | warn | error | fatal
 # LOG_LEVEL=info
diff --git a/backend/.env.template b/backend/.env.template
index f73b87353..e75798325 100644
--- a/backend/.env.template
+++ b/backend/.env.template
@@ -54,9 +54,6 @@ EMAIL_CODE_REQUEST_TIME=$EMAIL_CODE_REQUEST_TIME
 # Webhook
 WEBHOOK_ELOPAGE_SECRET=$WEBHOOK_ELOPAGE_SECRET
 
-# EventProtocol
-EVENT_PROTOCOL_DISABLED=$EVENT_PROTOCOL_DISABLED
-
 # Federation
 FEDERATION_DHT_TOPIC=$FEDERATION_DHT_TOPIC
 FEDERATION_DHT_SEED=$FEDERATION_DHT_SEED
diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index d010b4ab0..63ea9c5b6 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -17,7 +17,7 @@ const constants = {
   LOG_LEVEL: process.env.LOG_LEVEL || 'info',
   CONFIG_VERSION: {
     DEFAULT: 'DEFAULT',
-    EXPECTED: 'v14.2022-12-22',
+    EXPECTED: 'v15.2023-02-07',
     CURRENT: '',
   },
 }
@@ -99,11 +99,6 @@ const webhook = {
   WEBHOOK_ELOPAGE_SECRET: process.env.WEBHOOK_ELOPAGE_SECRET || 'secret',
 }
 
-const eventProtocol = {
-  // global switch to enable writing of EventProtocol-Entries
-  EVENT_PROTOCOL_DISABLED: process.env.EVENT_PROTOCOL_DISABLED === 'true' || false,
-}
-
 // This is needed by graphql-directive-auth
 process.env.APP_SECRET = server.JWT_SECRET
 
diff --git a/backend/src/event/EventProtocolEmitter.ts b/backend/src/event/EventProtocolEmitter.ts
index 9cde4939f..a87e8a256 100644
--- a/backend/src/event/EventProtocolEmitter.ts
+++ b/backend/src/event/EventProtocolEmitter.ts
@@ -1,14 +1,8 @@
 import { Event } from '@/event/Event'
 import { backendLogger as logger } from '@/server/logger'
 import { EventProtocol } from '@entity/EventProtocol'
-import CONFIG from '@/config'
 
 export const writeEvent = async (event: Event): Promise<EventProtocol | null> => {
-  if (CONFIG.EVENT_PROTOCOL_DISABLED) {
-    logger.info('EventProtocol is disabled', CONFIG.EVENT_PROTOCOL_DISABLED)
-    return null
-  }
-
   logger.info('writeEvent', event)
   const dbEvent = new EventProtocol()
   dbEvent.type = event.type
diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist
index e816c9236..9c9c7ac82 100644
--- a/deployment/bare_metal/.env.dist
+++ b/deployment/bare_metal/.env.dist
@@ -27,7 +27,7 @@ COMMUNITY_DESCRIPTION="Gradido Development Stage1 Test Community"
 COMMUNITY_SUPPORT_MAIL=support@supportmail.com
 
 # backend
-BACKEND_CONFIG_VERSION=v14.2022-12-22
+BACKEND_CONFIG_VERSION=v15.2023-02-07
 
 JWT_EXPIRES_IN=10m
 GDT_API_URL=https://gdt.gradido.net
@@ -56,9 +56,6 @@ EMAIL_CODE_REQUEST_TIME=10
 
 WEBHOOK_ELOPAGE_SECRET=secret
 
-# EventProtocol
-EVENT_PROTOCOL_DISABLED=false
-
 # Federation
 # if you set the value of FEDERATION_DHT_TOPIC, the DHT hyperswarm will start to announce and listen
 # on an hash created from this topic