fraport/fradrive-old
fraport/fradrive-old
Archived
3
1
Fork 0
Code Issues 65 Pull Requests 5 Actions Packages Projects Releases 197 Wiki Activity

refactor(ldap): move orphan instance

Browse Source
This commit is contained in:
Sarah Vaupel 2024-02-28 12:00:06 +01:00
parent 956c85a9f3
commit 064645d1b3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Ldap/Client/Instances.hs
View File

@ -10,6 +10,7 @@ module Ldap.Client.Instances
import ClassyPrelude import ClassyPrelude
import Data.Aeson.TH
import Data.Data (Data) import Data.Data (Data)
import Database.Persist.TH (derivePersistField) import Database.Persist.TH (derivePersistField)
@ -51,3 +52,5 @@ derivePathPiece ''Scope id "--"
derivePersistField "Dn" derivePersistField "Dn"
derivePersistField "Password" derivePersistField "Password"
derivePersistField "Scope" derivePersistField "Scope"
deriveFromJSON defaultOptions ''Scope

4
src/Settings/Ldap.hs
View File

@ -16,11 +16,11 @@ import Utils.Lens.TH
import Control.Monad.Fail (fail) import Control.Monad.Fail (fail)
import Data.Aeson import Data.Aeson
import Data.Aeson.TH
import qualified Data.Text.Encoding as Text import qualified Data.Text.Encoding as Text
import Data.Time.Clock import Data.Time.Clock
import qualified Ldap.Client as Ldap import qualified Ldap.Client as Ldap
import Ldap.Client.Instances ()
data LdapConf = LdapConf data LdapConf = LdapConf
@ -36,8 +36,6 @@ data LdapConf = LdapConf
makeLenses_ ''LdapConf makeLenses_ ''LdapConf
deriveFromJSON defaultOptions ''Ldap.Scope -- TODO: move to Ldap.Client.Instances
instance FromJSON LdapConf where instance FromJSON LdapConf where
parseJSON = withObject "LdapConf" $ \o -> do parseJSON = withObject "LdapConf" $ \o -> do
ldapConfTls <- o .:? "tls" ldapConfTls <- o .:? "tls"