Fix up optional email

Author: ChrisPenner

src/Share/Postgres/Users/Queries.hs

@@ -219,7 +219,7 @@ createFromGithubUser !authzReceipt (GithubUser githubHandle githubUserId avatar_
         avatar_url = Just avatar_url,
         user_id = userId,
         user_name,
-        user_email,
+        user_email = Just $ Email user_email,
         visibility
       }
 

src/Share/User.hs

@@ -31,7 +31,7 @@ instance Hasql.EncodeValue UserVisibility where
 data User = User
   { user_id :: UserId,
     user_name :: Maybe Text,
-    user_email :: Text,
+    user_email :: Maybe Email,
     avatar_url :: Maybe URIParam,
     handle :: UserHandle,
     visibility :: UserVisibility

src/Share/Web/Share/Types.hs

@@ -140,7 +140,7 @@ data UserAccountInfo = UserAccountInfo
     name :: Maybe Text,
     avatarUrl :: Maybe URIParam,
     userId :: UserId,
-    primaryEmail :: Text,
+    primaryEmail :: Maybe Email,
     -- List of tours which the user has completed.
     completedTours :: [TourId],
     organizationMemberships :: [UserHandle],

src/Share/Web/Support/Zendesk.hs

@@ -9,14 +9,14 @@ module Share.Web.Support.Zendesk where
 import Control.Monad.Reader
 import Data.Aeson
 import Data.Either (fromRight)
+import Servant
+import Servant.Client
 import Share.Env qualified as Env
 import Share.IDs
 import Share.Prelude
 import Share.Utils.Servant.Client (runClient)
 import Share.Web.App
 import Share.Web.Support.Types
-import Servant
-import Servant.Client
 
 -- | Field Id for the Share Handle custom ticket field. See https://unison-computing.zendesk.com/admin/objects-rules/tickets/ticket-fields
 zendeskShareHandleFieldId :: Int
@@ -42,7 +42,7 @@ data ZendeskTicket = ZendeskTicket
     body :: Text,
     priority :: Priority,
     requesterName :: Text,
-    requesterEmail :: Text,
+    requesterEmail :: Maybe Email,
     shareHandle :: UserHandle,
     shareUserId :: UserId
   }

src/Share/Web/Types.hs

@@ -41,7 +41,7 @@ data UserInfo = UserInfo
     name :: Maybe Text,
     picture :: Maybe URIParam,
     profile :: URIParam, -- Link to the user's profile page
-    email :: Text,
+    email :: Maybe Email,
     -- Additional claims
     handle :: UserHandle
   }