From 2fe8c66d4de73cfd5a4c2d7c6b72ff502d12f610 Mon Sep 17 00:00:00 2001 From: Jon Kristensen Date: Sun, 17 Feb 2013 21:19:24 +0100 Subject: [PATCH] Remove simpleAuth --- source/Network/Xmpp/Internal.hs | 1 - source/Network/Xmpp/Sasl.hs | 17 ----------------- 2 files changed, 18 deletions(-) diff --git a/source/Network/Xmpp/Internal.hs b/source/Network/Xmpp/Internal.hs index d775dc3..2eaf90e 100644 --- a/source/Network/Xmpp/Internal.hs +++ b/source/Network/Xmpp/Internal.hs @@ -24,7 +24,6 @@ module Network.Xmpp.Internal , openStream , withStream , startTls - , simpleAuth , auth , pushStanza , pullStanza diff --git a/source/Network/Xmpp/Sasl.hs b/source/Network/Xmpp/Sasl.hs index aedc51f..f7c45a0 100644 --- a/source/Network/Xmpp/Sasl.hs +++ b/source/Network/Xmpp/Sasl.hs @@ -12,7 +12,6 @@ module Network.Xmpp.Sasl , scramSha1 , plain , auth - , simpleAuth ) where import Control.Applicative @@ -98,22 +97,6 @@ auth mechanisms resource con = runErrorT $ do lift $ startSession con return Nothing --- | Authenticate to the server with the given username and password --- and bind a resource. --- --- Prefers SCRAM-SHA1 over DIGEST-MD5. -simpleAuth :: Text.Text -- ^ The username - -> Text.Text -- ^ The password - -> Maybe Text -- ^ The desired resource or 'Nothing' to let the - -- server assign one - -> TMVar Stream - -> IO (Either XmppFailure (Maybe AuthFailure)) -simpleAuth username passwd resource = flip auth resource $ - [ -- TODO: scramSha1Plus - scramSha1 username Nothing passwd - , digestMd5 username Nothing passwd - ] - -- Produces a `bind' element, optionally wrapping a resource. bindBody :: Maybe Text -> Element bindBody = pickleElem $