Merge branch 'fradrive/localmaster'

src/Handler/PrintCenter.hs

@@ -26,7 +26,7 @@ import Database.Esqueleto.Utils.TH
 
 import Utils.Print
 -- import Data.Aeson (encode)
--- import qualified Data.Text as Text
+import qualified Data.Text as Text
 -- import qualified Data.Set  as Set
 
 import Handler.Utils
@@ -394,7 +394,7 @@ postPrintAckDirectR = do
           Left (e :: SomeException) -> do -- catch all to avoid ok220 in case of any error
             $logWarnS "APC" $ "Result upload failed parsing: " <> tshow e
             return (badRequest400, "Error: " <> tshow e)
-          Right reqIds -> do
+          Right (fmap Text.strip -> reqIds) -> do -- inside conduit?
             let nrReq = length reqIds
             now <- liftIO getCurrentTime
             nrApcIds <- updateWhereCount

src/Handler/Utils/Mail.hs

@@ -56,8 +56,8 @@ userAddressError :: (MonadHandler m, HandlerSite m ~ UniWorX) => User -> m (Bool
 userAddressError User{userEmail, userDisplayEmail, userDisplayName} 
   | Just okEmail <- pickValidEmail' userDisplayEmail userEmail = pure (True, Address (Just userDisplayName) $ CI.original okEmail)
   | otherwise = do
-      $logErrorS "Mail" $ "Attempt to email invalid address: " <> tshow userDisplayEmail <> " Sent to support instead." -- <> " with subject " <> tshow failedSubject
+      $logErrorS "Mail" $ "Attempt to email invalid address: " <> tshow userDisplayEmail <> " / " <> tshow userEmail <> ". Sent to support instead." -- <> " with subject " <> tshow failedSubject
-      (True,) <$> getsYesod (view _appMailSupport)
+      (False,) <$> getsYesod (view _appMailSupport)
 
 -- | Send an email to the given UserId or to all registered Supervisor with rerouteNotifications == True
 userMailT :: ( MonadHandler m
@@ -145,8 +145,9 @@ userMailTdirect uid mAct = do
     -- failedSubject <- lookupMailHeader "Subject"
     -- unless (validEmail $ addressEmail mailtoAddr) ($logErrorS "Mail" $ "Attempt to email invalid address: " <> tshow mailtoAddr <> " with subject " <> tshow failedSubject)
     _mailTo .= pure mailtoAddr
+    res <- mAct 
     unless mailOk $ mapSubject ("[ERROR]" <>)
-    mAct
+    pure res
 
 addFileDB :: ( MonadMail m
              , HandlerSite m ~ UniWorX

src/Handler/Utils/Profile.hs

@@ -82,12 +82,12 @@ validPostAddress _ = False
 
 -- also see `Handler.Utils.Users.getEmailAddress` for Tests accepting User Type
 validEmail :: Email -> Bool      -- Email = Text
-validEmail email = validRFC5322 && not invalidFraport
+validEmail email = validRFC5322 -- && not invalidFraport
   where 
     validRFC5322 = Email.isValid $ encodeUtf8 email
-    invalidFraport = case Text.stripSuffix "@fraport.de" email of  
+    -- invalidFraport = case Text.stripSuffix "@fraport.de" email of  
-      Just fralogin -> all isDigit $ drop 1 fralogin
+    --   Just fralogin -> all isDigit $ drop 1 fralogin
-      Nothing       -> False
+    --   Nothing       -> False
 
 validEmail' :: UserEmail -> Bool -- UserEmail = CI Text
 validEmail' = validEmail . CI.original

test/Database/Fill.hs

@@ -437,12 +437,13 @@ fillDb = do
         userEmail' = CI.mk $ case firstName of           
           "James"     -> userIdent
           "John"      -> userIdent
-          --"Elizabeth" -> "AVSID:" <> userMatrikelnummer'
+          "Elizabeth" -> "AVSID:" <> userMatrikelnummer'
           _           ->      "E" <> userMatrikelnummer' <> "@fraport.de"
         userDisplayEmail' :: CI Text
         userDisplayEmail' = CI.mk $ case userSurname of 
           "Walker"    -> "AVSNO:" <> userMatrikelnummer'
           "Clark"     ->      "E" <> userMatrikelnummer' <> "@fraport.de"
+          "Elizabeth" -> ""
           _           -> userIdent
 
   matrikel <- toMatrikel <$> getRandomRs (0 :: Int, 9 :: Int)