webapp: Fix UI for removing XMPP connection.

Assistant/WebApp/Configurators/Delete.hs

@@ -39,13 +39,21 @@ notCurrentRepo uuid a = do
   	go Nothing = error "Unknown UUID"
 	go (Just _) = a
 
+handleXMPPRemoval :: UUID -> Handler Html -> Handler Html
+handleXMPPRemoval uuid nonxmpp = do
+	remote <- fromMaybe (error "unknown remote")
+		<$> liftAnnex (Remote.remoteFromUUID uuid)
+	if Remote.isXMPPRemote remote
+		then deletionPage $ $(widgetFile "configurators/delete/xmpp")
+		else nonxmpp
+
 getDisableRepositoryR :: UUID -> Handler Html
-getDisableRepositoryR uuid = notCurrentRepo uuid $ do
+getDisableRepositoryR uuid = notCurrentRepo uuid $ handleXMPPRemoval uuid $ do
 	void $ liftAssistant $ disableRemote uuid
 	redirect DashboardR
 
 getDeleteRepositoryR :: UUID -> Handler Html
-getDeleteRepositoryR uuid = notCurrentRepo uuid $
+getDeleteRepositoryR uuid = notCurrentRepo uuid $ handleXMPPRemoval uuid $ do
 	deletionPage $ do
 		reponame <- liftAnnex $ Remote.prettyUUID uuid
 		$(widgetFile "configurators/delete/start")

Assistant/WebApp/Configurators/XMPP.hs

@@ -25,6 +25,9 @@ import Assistant.WebApp.RepoList
 import Assistant.WebApp.Configurators
 import Assistant.XMPP
 #endif
+import qualified Git.Remote
+import Remote.List
+import Creds
 
 #ifdef WITH_XMPP
 import Network.Protocol.XMPP
@@ -202,5 +205,22 @@ testXMPP creds = do
 	showport (UnixSocket s) = s
 #endif
 
+getDisconnectXMPPR :: Handler Html
+getDisconnectXMPPR = do
+#ifdef WITH_XMPP
+	rs <- filter Remote.isXMPPRemote . syncRemotes
+		<$> liftAssistant getDaemonStatus
+	liftAnnex $ do
+		mapM_ (inRepo . Git.Remote.remove . Remote.name) rs
+		void remoteListRefresh
+		removeCreds xmppCredsFile
+	liftAssistant $ do
+		updateSyncRemotes
+		notifyNetMessagerRestart
+	redirect DashboardR
+#else
+	xmppPage $ $(widgetFile "configurators/xmpp/disabled")
+#endif
+
 xmppPage :: Widget -> Handler Html
 xmppPage = page "Jabber" (Just Configuration)

Assistant/WebApp/routes

@@ -20,6 +20,7 @@
 /config/xmpp/for/self XMPPConfigForPairSelfR GET POST
 /config/xmpp/for/frield XMPPConfigForPairFriendR GET POST
 /config/xmpp/needcloudrepo/#UUID NeedCloudRepoR GET
+/config/xmpp/disconnect DisconnectXMPPR GET
 /config/needconnection ConnectionNeededR GET
 /config/fsck ConfigFsckR GET POST
 /config/fsck/preferences ConfigFsckPreferencesR POST

Creds.hs

@@ -14,6 +14,7 @@ module Creds (
 	getEnvCredPair,
 	writeCacheCreds,
 	readCacheCreds,
+	removeCreds,
 ) where
 
 import Common.Annex
@@ -138,3 +139,9 @@ decodeCredPair :: Creds -> Maybe CredPair
 decodeCredPair creds = case lines creds of
 	l:p:[] -> Just (l, p)
 	_ -> Nothing
+
+removeCreds :: FilePath -> Annex ()
+removeCreds file = do
+	d <- fromRepo gitAnnexCredsDir
+	let f = d </> file
+	liftIO $ nukeFile f

debian/changelog

@@ -29,6 +29,7 @@ git-annex (5.20140413) UNRELEASED; urgency=medium
   * webapp: Start even if the current directory is listed in
     ~/.config/git-annex/autostart but no longer has a git repository in it.
   * findref: New command, like find but shows files in a specified git ref.
+  * webapp: Fix UI for removing XMPP connection.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Apr 2014 21:33:35 -0400
 

doc/todo/allow_removing_jabber_configuration.mdwn

@@ -1 +1,5 @@
-right now it is unclear through the webapp how to unconfigure a jabber account, which is especially critical considering the password needs to be stored in the clear (where?). -- [[anarcat]]
+right now it is unclear through the webapp how to unconfigure a jabber
+account, which is especially critical considering the password needs to be
+stored in the clear (where?). -- [[anarcat]]
+
+> [[fixed|done]] --[[Joey]]

templates/configurators/delete/xmpp.hamlet

@@ -0,0 +1,10 @@
+<div .span9 .hero-unit>
+  <h2>
+    Disconnecting from Jabber
+  <p>
+    This won't delete the repository or repositories at the other end
+    of the Jabber connection, but it will disconnect from them, and stop
+    using Jabber.
+  <p>
+   <a .btn .btn-primary href="@{DisconnectXMPPR}">
+     <i .icon-minus></i> Disconnect

templates/configurators/xmpp.hamlet

@@ -25,6 +25,8 @@
         <div .form-actions>
           <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');">
             Use this account
+          <a .btn href="@{DisconnectXMPPR}">
+            Stop using this account
 <div .modal .fade #workingmodal>
   <div .modal-header>
     <h3>