From 92d520060f785f188b71539376c24c5d43b5aabf Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Thu, 12 Jan 2023 17:32:22 +0100
Subject: [PATCH] chore(users): clarify new user auth notifications options

---
 messages/uniworx/categories/user/de-de-formal.msg | 1 +
 messages/uniworx/categories/user/en-eu.msg        | 1 +
 src/Handler/Users/Add.hs                          | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/messages/uniworx/categories/user/de-de-formal.msg b/messages/uniworx/categories/user/de-de-formal.msg
index dd78fcfe8..3ca1c79a8 100644
--- a/messages/uniworx/categories/user/de-de-formal.msg
+++ b/messages/uniworx/categories/user/de-de-formal.msg
@@ -10,6 +10,7 @@ AdminUserEmail: E-Mail-Adresse
 AdminUserDisplayEmail: Anzeige-E-Mail
 AdminUserIdent: Identifikation
 AdminUserAuth: Authentifizierung
+AdminUserAuthTooltip: Abhängig von der Auswahl werden neue Benutzer über ihr neues FRADrive Konto benachrichtigt.
 AdminUserMatriculation: Matrikelnummer
 AdminUserSex: Geschlecht
 AdminUserTelephone: Telefonnummer
diff --git a/messages/uniworx/categories/user/en-eu.msg b/messages/uniworx/categories/user/en-eu.msg
index ec42ae158..8ca26c3ba 100644
--- a/messages/uniworx/categories/user/en-eu.msg
+++ b/messages/uniworx/categories/user/en-eu.msg
@@ -10,6 +10,7 @@ AdminUserEmail: Email address
 AdminUserDisplayEmail: Display email
 AdminUserIdent: Identification
 AdminUserAuth: Authentication
+AdminUserAuthTooltip: New users may be notified about their FRADrive account depending on this choice.
 AdminUserMatriculation: Matriculation
 AdminUserSex: Sex
 AdminUserTelephone: Phone
diff --git a/src/Handler/Users/Add.hs b/src/Handler/Users/Add.hs
index 5b34041aa..27dcf7aa9 100644
--- a/src/Handler/Users/Add.hs
+++ b/src/Handler/Users/Add.hs
@@ -73,7 +73,7 @@ adminUserForm template = renderAForm FormStandard
   <*> aopt (textField & cfStrip)        (fslI MsgAdminUserPinPassword)     (aufPinPassword <$> template)
   <*> areq (emailField & cfCI)          (fslI MsgAdminUserEmail) (aufEmail <$> 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 = addNewUser' True
@@ -127,7 +127,7 @@ addNewUser' notifyusr AdminUserForm{..} = do
   runDBJobs . runMaybeT $ do
     uid <- MaybeT $ insertUnique newUser
     lift . queueDBJob $ JobSynchroniseLdapUser uid
-    when notifyusr $
+    when (notifyusr && aufAuth /= AuthNoLogin) $
       lift . queueDBJob . JobQueueNotification $ NotificationUserAuthModeUpdate uid (newUser ^. _userAuthentication)
     when (aufAuth == AuthKindPWHash) $
       lift . queueDBJob $ JobSendPasswordReset uid