git.iko.soy/typeable/email
on master help sign in
SSO-607: change email validation method in common/email (#6430)
34f36f5Vladimir Kalnitsky
email.cabal+1
compare with master
unifiedsplit
@@ -13,6 +13,7 @@ library
13 , aeson
13 , aeson
14 , bytestring
14 , bytestring
15 , email-validate
15 , email-validate
16+ , email-validate-extra
16 , lens >= 4.13
17 , lens >= 4.13
17 , QuickCheck
18 , QuickCheck
18 , text >= 1.2.1.3
19 , text >= 1.2.1.3
src/Data/Email.hs+3−2
@@ -18,8 +18,9 @@ import Data.Text.Encoding (decodeUtf8)
18import Data.Text.Lens
18import Data.Text.Lens
19import Test.QuickCheck.Arbitrary
19import Test.QuickCheck.Arbitrary
20import Test.QuickCheck.Gen (elements)
20import Test.QuickCheck.Gen (elements)
21+import Text.Email.Extra (validateEmail)
21import Text.Email.Parser
22import Text.Email.Parser
22−import Text.Email.Validate (EmailAddress, emailAddress)
23+import Text.Email.Validate (EmailAddress)
23
24
24newtype Email
25newtype Email
25 = Email
26 = Email
@@ -30,7 +31,7 @@ makePrisms ''Email
30
31
31-- | "Orphaned" prism.
32-- | "Orphaned" prism.
32_EmailAddress :: Prism' ByteString EmailAddress
33_EmailAddress :: Prism' ByteString EmailAddress
33−_EmailAddress = prism' toByteString emailAddress
34+_EmailAddress = prism' toByteString (preview _Right . validateEmail)
34
35
35-- | Can be used like this:
36-- | Can be used like this:
36--
37--