From 31f657a15f9a3614e83b719d67ac4ce25e021cb9 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sat, 13 Jan 2024 01:14:54 +0100 Subject: [PATCH] chore(settings): fix oauth2 config json parsers --- src/Settings.hs | 2 +- src/Settings/OAuth2.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Settings.hs b/src/Settings.hs index 753dd56d0..8c89aa3ce 100644 --- a/src/Settings.hs +++ b/src/Settings.hs @@ -298,7 +298,7 @@ makePrisms ''JobMode makeLenses_ ''JobMode deriveFromJSON defaultOptions - { constructorTagModifier = camelToPathPiece' 2 + { constructorTagModifier = toLower . dropPrefix "UserDb" , sumEncoding = TaggedObject "protocol" "config" } ''UserDbConf diff --git a/src/Settings/OAuth2.hs b/src/Settings/OAuth2.hs index 53877b0dd..98e1908b4 100644 --- a/src/Settings/OAuth2.hs +++ b/src/Settings/OAuth2.hs @@ -10,7 +10,7 @@ module Settings.OAuth2 import ClassyPrelude import Utils.Lens.TH -import Utils.PathPiece (camelToPathPiece') +import Utils.PathPiece (camelToPathPiece) import Data.Aeson import Data.Aeson.TH @@ -28,5 +28,5 @@ data OAuth2Conf = OAuth2Conf makeLenses_ ''OAuth2Conf deriveFromJSON defaultOptions - { fieldLabelModifier = camelToPathPiece' 1 + { fieldLabelModifier = camelToPathPiece . dropPrefix "oauth2" } ''OAuth2Conf