chore(auth): campusLogin->ldapLogin

src/Auth/LDAP.hs

@@ -7,7 +7,7 @@
 module Auth.LDAP
   ( apLdap
   , ADError(..), ADInvalidCredentials(..)
-  , campusLogin
+  , ldapLogin
   , CampusUserException(..)
   , ldapUser, ldapUser', ldapUser''
   , ldapUserReTest, ldapUserReTest'
@@ -263,18 +263,18 @@ campusForm = do
    <*> areq passwordField (fslpI MsgCampusPassword (mr MsgCampusPasswordPlaceholder) & addAttr "autocomplete" "current-password") Nothing
 
 
-campusLogin :: forall site.
+ldapLogin :: forall site.
-               ( YesodAuth site
+             ( YesodAuth site
-               , RenderMessage site CampusMessage
+             , RenderMessage site CampusMessage
-               , RenderAFormSite site
+             , RenderAFormSite site
-               , RenderMessage site (ValueRequired site)
+             , RenderMessage site (ValueRequired site)
-               , RenderMessage site ADInvalidCredentials
+             , RenderMessage site ADInvalidCredentials
-               , Button site ButtonSubmit
+             , Button site ButtonSubmit
-               )
+             )
-            => Failover (LdapConf, LdapPool)
+          => (LdapConf, LdapPool) -- TODO: reintroduce Failover
-            -> FailoverMode
+          -> FailoverMode
-            -> AuthPlugin site
+          -> AuthPlugin site
-campusLogin pool mode = AuthPlugin{..}
+ldapLogin pool mode = AuthPlugin{..}
   where
     apName :: Text
     apName = apLdap
@@ -285,7 +285,7 @@ campusLogin pool mode = AuthPlugin{..}
       tp <- getRouteToParent
 
       resp <- formResultMaybe loginRes $ \CampusLogin{ campusIdent = CI.original -> campusIdent, ..} -> Just <$> do
-        ldapResult <- withLdapFailover _2 pool mode $ \(conf@LdapConf{..}, ldap) -> liftIO $ do
+        ldapResult <- withLdap _2 pool mode $ \(conf@LdapConf{..}, ldap) -> liftIO $ do
           Ldap.bind ldap ldapDn ldapPassword
           searchResults <- findUser conf ldap campusIdent [ldapUserPrincipalName]
           case searchResults of