From a01e4f8ff503a03d026d9914e6fc78dbd1d376b2 Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk" <neil%parkwaycc.co.uk>
Date: Tue, 21 Sep 2004 16:11:28 +0000
Subject: [PATCH] Make "Log Out" clear all HTTP auth sessions as well as
 expiring the master password b=55181 p=vhaarr@firefox.no r=me sr=darin

---
 .../resources/content/walletTasksOverlay.xul   | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/extensions/wallet/resources/content/walletTasksOverlay.xul b/extensions/wallet/resources/content/walletTasksOverlay.xul
index 007eba6ad769..3a5eb0c09fb2 100644
--- a/extensions/wallet/resources/content/walletTasksOverlay.xul
+++ b/extensions/wallet/resources/content/walletTasksOverlay.xul
@@ -45,11 +45,17 @@
   <script type="application/x-javascript">
   <![CDATA[
 
-    // expire master password
-    function walletPasswordExpire() {
-      var wallet = Components.classes['@mozilla.org/wallet/wallet-service;1'];
-      wallet = wallet.getService();
-      wallet = wallet.QueryInterface(Components.interfaces.nsIWalletService);
+    // First clears the HTTP auth, then the Wallet
+    function expireHTTPAuthAndWallet() {
+      // Queries the HTTP Auth Manager and clears all sessions
+      Components.classes['@mozilla.org/network/http-auth-manager;1']
+                .getService(Components.interfaces.nsIHttpAuthManager)
+                .clearAll();
+
+      // Expires the master password
+      var wallet =
+        Components.classes['@mozilla.org/wallet/wallet-service;1']
+                  .getService(Components.interfaces.nsIWalletService);
       var strings = document.getElementById("menu_passwordManager");
 
       if (wallet.WALLET_ExpirePassword()) {
@@ -79,7 +85,7 @@
       <menupopup>
         <menuitem label="&walletExpirePasswordCmd.label;"
                   accesskey="&walletExpirePasswordCmd.accesskey;"
-                  oncommand="walletPasswordExpire();"/>
+                  oncommand="expireHTTPAuthAndWallet();"/>
         <menuitem label="&walletDisplaySignonsCmd.label;"
                   accesskey="&walletDisplaySignonsCmd.accesskey;"
                   oncommand="walletPasswordDialog();"/>