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

chore(auth): refactor; add util function

Browse Source
This commit is contained in:
Sarah Vaupel 2024-03-07 05:36:03 +01:00
parent bb03d28b7d
commit 77a9100b2e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/Types/Auth.hs
View File

@ -75,7 +75,7 @@ type UserEduPersonPrincipalName = Text
-- | Used for uniquely storing ExternalUser entries per user and source -- | Used for uniquely storing ExternalUser entries per user and source
data AuthSourceIdent data AuthSourceIdent
= AuthSourceIdAzure = AuthSourceIdAzure
{ authSourceIdAzureClientId :: UUID { authSourceIdAzureClientId :: UUID -- FIXME: use tenant id instead
} }
| AuthSourceIdLdap | AuthSourceIdLdap
{ authSourceIdLdapHost :: Text -- normally either just the hostname, or hostname and port { authSourceIdLdapHost :: Text -- normally either just the hostname, or hostname and port

5
src/Settings.hs
View File

@ -155,6 +155,11 @@ data UserAuthConf =
-- | UserAuthConfNoSource -- ^ allow no external sources at all -- TODO: either this, or make user-auth in settings.yml optional -- | UserAuthConfNoSource -- ^ allow no external sources at all -- TODO: either this, or make user-auth in settings.yml optional
deriving (Show) deriving (Show)
mkAuthSourceIdent :: AuthSourceConf -> AuthSourceIdent
mkAuthSourceIdent = \case
AuthSourceConfAzureAdV2 AzureConf{..} -> AuthSourceIdAzure azureConfClientId
AuthSourceConfLdap LdapConf{..} -> AuthSourceIdLdap ldapConfSourceId
data LmsConf = LmsConf data LmsConf = LmsConf
{ lmsUploadHeader :: Bool { lmsUploadHeader :: Bool
, lmsUploadDelimiter :: Maybe Char , lmsUploadDelimiter :: Maybe Char