Removed the error throwing from loginByUsername

adinapoli · Sep 30, 2012 · cd41db5 · cd41db5
1 parent 9f2bf9f
commit cd41db5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Snap/Snaplet/Auth/Handlers.hs b/src/Snap/Snaplet/Auth/Handlers.hs
@@ -66,8 +66,7 @@ loginByUsername :: ByteString       -- ^ Username/login for user
                 -> Password         -- ^ Should be ClearText
                 -> Bool             -- ^ Set remember token?
                 -> Handler b (AuthManager b) (Either AuthFailure AuthUser)
-loginByUsername _ (Encrypted _) _ =
-  error "Cannot login with encrypted password"
+loginByUsername _ (Encrypted _) _ = return $ Left EncryptedPassword
 loginByUsername unm pwd shouldRemember = do
     sk <- gets siteKey
     cn <- gets rememberCookieName

diff --git a/src/Snap/Snaplet/Auth/Types.hs b/src/Snap/Snaplet/Auth/Types.hs
@@ -81,6 +81,7 @@ data AuthFailure = AuthError String
                  | BackendError
                  | DuplicateLogin
                  | EmptyUsername
+                 | EncryptedPassword
                  | IncorrectPassword
                  | LockedOut UTCTime    -- ^ Locked out until given time
                  | PasswordMissing
@@ -93,6 +94,7 @@ instance Show AuthFailure where
         show (BackendError) = "Failed to store data in the backend."
         show (DuplicateLogin) = "This login already exists in the backend."
         show (EmptyUsername) = "Username cannot be empty."
+        show (EncryptedPassword) = "Cannot login with encrypted password."
         show (IncorrectPassword) = "The password provided was not valid."
         show (LockedOut time) = "The login is locked out until " ++ show time
         show (PasswordMissing) = "No password provided."