lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/release-8.1' into release-8.6

Browse source
This commit is contained in:
Taranto 2023-10-03 16:26:42 +01:00
commit 1a8a5899d3
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/new-admin/admin-server.js
View file

@ -61,7 +61,8 @@ const apolloServer = new ApolloServer({
playground: false, playground: false,
introspection: false, introspection: false,
formatError: error => { formatError: error => {
logger.error(error) const exception = error?.extensions?.exception
logger.error(error, JSON.stringify(exception || {}))
return error return error
}, },
context: async (obj) => buildApolloContext(obj) context: async (obj) => buildApolloContext(obj)

2
lib/new-settings-loader.js
View file

@ -40,7 +40,7 @@ const md5hash = text =>
const addTermsHash = configs => { const addTermsHash = configs => {
const terms = _.omit(['hash'], getTermsConditions(configs)) const terms = _.omit(['hash'], getTermsConditions(configs))
return _.isEmpty(terms) ? return !terms?.text ?
configs : configs :
_.flow( _.flow(
_.get('text'), _.get('text'),