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

chore(users): clarify new user auth notifications options

Browse Source
This commit is contained in:
Steffen Jost 2023-01-12 17:32:22 +01:00
parent 00b73bd8b5
commit 92d520060f
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
messages/uniworx/categories/user/de-de-formal.msg
View File

@ -10,6 +10,7 @@ AdminUserEmail: E-Mail-Adresse
AdminUserDisplayEmail: Anzeige-E-Mail AdminUserDisplayEmail: Anzeige-E-Mail
AdminUserIdent: Identifikation AdminUserIdent: Identifikation
AdminUserAuth: Authentifizierung AdminUserAuth: Authentifizierung
AdminUserAuthTooltip: Abhängig von der Auswahl werden neue Benutzer über ihr neues FRADrive Konto benachrichtigt.
AdminUserMatriculation: Matrikelnummer AdminUserMatriculation: Matrikelnummer
AdminUserSex: Geschlecht AdminUserSex: Geschlecht
AdminUserTelephone: Telefonnummer AdminUserTelephone: Telefonnummer

1
messages/uniworx/categories/user/en-eu.msg
View File

@ -10,6 +10,7 @@ AdminUserEmail: Email address
AdminUserDisplayEmail: Display email AdminUserDisplayEmail: Display email
AdminUserIdent: Identification AdminUserIdent: Identification
AdminUserAuth: Authentication AdminUserAuth: Authentication
AdminUserAuthTooltip: New users may be notified about their FRADrive account depending on this choice.
AdminUserMatriculation: Matriculation AdminUserMatriculation: Matriculation
AdminUserSex: Sex AdminUserSex: Sex
AdminUserTelephone: Phone AdminUserTelephone: Phone

4
src/Handler/Users/Add.hs
View File

@ -73,7 +73,7 @@ adminUserForm template = renderAForm FormStandard
<*> aopt (textField & cfStrip) (fslI MsgAdminUserPinPassword) (aufPinPassword <$> template) <*> aopt (textField & cfStrip) (fslI MsgAdminUserPinPassword) (aufPinPassword <$> template)
<*> areq (emailField & cfCI) (fslI MsgAdminUserEmail) (aufEmail <$> template) <*> areq (emailField & cfCI) (fslI MsgAdminUserEmail) (aufEmail <$> template)
<*> areq (textField & cfStrip & cfCI) (fslI MsgAdminUserIdent) (aufIdent <$> template) <*> areq (textField & cfStrip & cfCI) (fslI MsgAdminUserIdent) (aufIdent <$> template)
<*> areq (selectField optionsFinite) (fslI MsgAdminUserAuth) (aufAuth <$> template <|> Just AuthKindLDAP) <*> areq (selectField optionsFinite) (fslI MsgAdminUserAuth & setTooltip MsgAdminUserAuthTooltip) (aufAuth <$> template <|> Just AuthKindLDAP)
addNewUser :: AdminUserForm -> Handler (Maybe UserId) addNewUser :: AdminUserForm -> Handler (Maybe UserId)
addNewUser = addNewUser' True addNewUser = addNewUser' True
@ -127,7 +127,7 @@ addNewUser' notifyusr AdminUserForm{..} = do
runDBJobs . runMaybeT $ do runDBJobs . runMaybeT $ do
uid <- MaybeT $ insertUnique newUser uid <- MaybeT $ insertUnique newUser
lift . queueDBJob $ JobSynchroniseLdapUser uid lift . queueDBJob $ JobSynchroniseLdapUser uid
when notifyusr $ when (notifyusr && aufAuth /= AuthNoLogin) $
lift . queueDBJob . JobQueueNotification $ NotificationUserAuthModeUpdate uid (newUser ^. _userAuthentication) lift . queueDBJob . JobQueueNotification $ NotificationUserAuthModeUpdate uid (newUser ^. _userAuthentication)
when (aufAuth == AuthKindPWHash) $ when (aufAuth == AuthKindPWHash) $
lift . queueDBJob $ JobSendPasswordReset uid lift . queueDBJob $ JobSendPasswordReset uid