From b90d8df4de1432b7f7e0729d6bc4b1096aedc295 Mon Sep 17 00:00:00 2001
From: Rafael Taranto <rafael.taranto@protonmail.com>
Date: Thu, 28 Sep 2023 21:00:42 +0100
Subject: [PATCH] fix: terms and conditions null safety

---
 lib/new-admin/admin-server.js | 3 ++-
 lib/new-settings-loader.js    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/new-admin/admin-server.js b/lib/new-admin/admin-server.js
index fcc2e12a..3b13daf8 100644
--- a/lib/new-admin/admin-server.js
+++ b/lib/new-admin/admin-server.js
@@ -61,7 +61,8 @@ const apolloServer = new ApolloServer({
   playground: false,
   introspection: false,
   formatError: error => {
-    logger.error(error)
+    const exception = error?.extensions?.exception
+    logger.error(error, JSON.stringify(exception || {}))
     return error
   },
   context: async (obj) => buildApolloContext(obj)
diff --git a/lib/new-settings-loader.js b/lib/new-settings-loader.js
index 62b9d3fb..fe9f02b0 100644
--- a/lib/new-settings-loader.js
+++ b/lib/new-settings-loader.js
@@ -40,7 +40,7 @@ const md5hash = text =>
 
 const addTermsHash = configs => {
   const terms = _.omit(['hash'], getTermsConditions(configs))
-  return _.isEmpty(terms) ?
+  return !terms?.text ?
     configs :
     _.flow(
       _.get('text'),