wip

backend/src/Database/Schema.hs

@@ -18,9 +18,6 @@ newtype PlainPassword = PlainPassword Text deriving (Show, ToJSON, FromJSON, ToH
 newtype HashedPassword = HashedPassword {unHashed :: ByteString}
 data NoPassword = NoPassword
 
-newtype Email = Email { unEmail :: Text } deriving (Show, ToJSON, FromJSON, ToHttpApiData, FromHttpApiData)
-
-newtype Username = Username { unUsername :: Text } deriving (Show, ToJSON, FromJSON, ToHttpApiData, FromHttpApiData)
 
 instance SqlType HashedPassword where
   mkLit = LCustom . LBlob . unHashed

backend/src/Server/Auth.hs

@@ -24,21 +24,8 @@ import Control.Lens (view)
 import Data.Generics.Product
 import Servant (err401)
 import Control.Monad.Logger
+import Auth (SafeUser(..))
 
--- generic-lens can convert similar types to this
--- I'm trying out servant-auth-server which uses a jwt style login. IIRC anyone
--- can open the jwt token and view what's inside, you just can't modify it.
---
--- Is it a problem that a human readable username and email are visible?
-data SafeUser = SafeUser { email :: Email
-                         , username :: Username
-                         , role :: Role }
-              deriving (Show, Generic)
-
-instance ToJSON SafeUser where
-instance FromJSON SafeUser where
-instance ToJWT SafeUser where
-instance FromJWT SafeUser where
 
 type instance BasicAuthCfg = BasicAuthData -> IO (AuthResult SafeUser)