- Commented out obsoleted methods (from previous bandwagon spec).

- Added AMO cookie check.



git-svn-id: http://svn.mozilla.org/addons/trunk@23005 4eb1ac78-321c-0410-a911-ec516a8615a5

7 files changed, 84 insertions, 12 deletions

diff --git a/bandwagon/components/bandwagon-service.js b/bandwagon/components/bandwagon-service.js
index 17f9cdb..bf3eb57 100644
--- a/bandwagon/components/bandwagon-service.js
+++ b/bandwagon/components/bandwagon-service.js
@@ -48,6 +48,7 @@ const ExtensionsManager = Cc["@mozilla.org/extensions/manager;1"];
 const Storage = Cc["@mozilla.org/storage/service;1"];
 const DirectoryService = Cc["@mozilla.org/file/directory_service;1"];
 const ObserverService = Cc["@mozilla.org/observer-service;1"];
+const CookieManager = Cc["@mozilla.org/cookiemanager;1"];
 
 const nsIWindowMediator = Ci.nsIWindowMediator;
 const nsITimer = Ci.nsITimer;
@@ -56,6 +57,7 @@ const mozIStorageService = Ci.mozIStorageService;
 const nsIProperties = Ci.nsIProperties;
 const nsIFile = Ci.nsIFile;
 const nsIObserverService = Ci.nsIObserverService;
+const nsICookieManager = Ci.nsICookieManager;
 
 
 var Bandwagon;
@@ -114,9 +116,6 @@ BandwagonService.prototype = {
 
         // first run stuff
 
-// FIXME temp temp temp
-this.updateCollectionsList();
-
         if (Bandwagon.Preferences.getPreference("firstrun") == true)
         {
             Bandwagon.Preferences.setPreference("firstrun", false);
@@ -396,7 +395,11 @@ this.updateCollectionsList();
     {
         Bandwagon.Logger.debug("Updating collections list...");
 
-        // TODO, are we logged in?
+        if (!this.isAMOAuthenticated())
+        {
+            Bandwagon.Logger.debug("Not authenticated in AMO");
+            return;
+        }
         
         this._service.getServiceDocument();
     },
@@ -492,6 +495,7 @@ this.updateCollectionsList();
         }
     },
 
+    /** OBSOLETE
     subscribe: function(collection)
     {
         collection.preview = false;
@@ -499,11 +503,14 @@ this.updateCollectionsList();
 
         this._service.subscribeCollection(collection);
     },
+    */
 
+    /** OBSOLETE
     unsubscribe: function(collection)
     {
         this._service.unsubscribeCollection(collection);
     },
+    */
 
     firstrun: function()
     {
@@ -518,10 +525,9 @@ this.updateCollectionsList();
         // get the user's list of collections
         this.updateCollectionsList();
 
+        /** OBSOLETE
         // check for cookie to see if we have to add a collection like that
-
         var addCollectionCookieValue = Bandwagon.Util.getCookie(Bandwagon.MAGIC_ADD_COLLECTION_COOKIE_HOST, Bandwagon.MAGIC_ADD_COLLECTION_COOKIE_NAME);
-
         if (addCollectionCookieValue)
         {
             Bandwagon.Logger.info("Found magic 'add collection' cookie. Adding the collection '" + addCollectionCookieValue + "'.");
@@ -529,6 +535,7 @@ this.updateCollectionsList();
 
             // TODO we don't have to because we're in firstrun, but should we delete cookie to be neat?
         }
+        */
 
         // the last check date is now
 
@@ -556,6 +563,7 @@ this.updateCollectionsList();
         this.subscribe(collection);
     },
 
+    /** OBSOLETE
     addPreviewCollection: function(url)
     {
         var collection = this._collectionFactory.newCollection();
@@ -569,6 +577,7 @@ this.updateCollectionsList();
 
         return collection;
     },
+    */
 
     uninstall: function()
     {
@@ -580,8 +589,10 @@ this.updateCollectionsList();
         if (!bandwagonService._collectionFactory)
             return;
 
+        /** OBSOLETE
         if (collection.preview)
             return;
+        */
 
         Bandwagon.Logger.debug("In commit() with collection: " + collection.resourceURL);
 
@@ -670,6 +681,26 @@ this.updateCollectionsList();
         this._service.shareToEmail(extension, emailAddress, personalNote, callback);
     },
 
+    isAMOAuthenticated: function()
+    {
+        var cm = CookieManager.getService(nsICookieManager);
+
+        var iterator = cm.enumerator;
+
+        while (iterator.hasMoreElements())
+        {
+            var cookie = iterator.getNext();
+
+            if (cookie instanceof Ci.nsICookie)
+            {
+                if (cookie.host == Bandwagon.AMO_AUTH_COOKIE_HOST && cookie.name == AMO_AUTH_COOKIE_NAME)
+                    return true;
+            }
+        }
+
+        return false;
+    },
+
     _collectionUpdateObserver: function(collection)
     {
         // called when a collection is updated
diff --git a/bandwagon/content/scripts/bandwagon.js b/bandwagon/content/scripts/bandwagon.js
index aea00cf..eb53f6b 100644
--- a/bandwagon/content/scripts/bandwagon.js
+++ b/bandwagon/content/scripts/bandwagon.js
@@ -49,8 +49,10 @@ Bandwagon.DEFAULT_COLLECTION1_URL = "https://services.addons.mozilla.org/en-US/f
 Bandwagon.DEFAULT_COLLECTION1_NAME = "Featured Add-ons";
 Bandwagon.FIRSTRUN_LANDING_PAGE = "http://www.google.com/search?hl=en&q=bandwagon+first+run+landing+page&btnG=Google+Search&aq=f&oq="; // TODO
 Bandwagon.COLLECTIONSPANE_DO_SUBSCRIBE_URL = "https://bandwagon.stage.mozilla.com/en-US/collections"; // TODO 
-Bandwagon.MAGIC_ADD_COLLECTION_COOKIE_HOST = "www.33eels.com"; // TODO
-Bandwagon.MAGIC_ADD_COLLECTION_COOKIE_NAME = "bandwagon_addcollection";
+Bandwagon.AMO_AUTH_COOKIE_HOST = "bandwagon.stage.mozilla.com";
+Bandwagon.AMO_AUTH_COOKIE_NAME = "AMOv3";
+//Bandwagon.MAGIC_ADD_COLLECTION_COOKIE_HOST = "www.33eels.com"; // TODO
+//Bandwagon.MAGIC_ADD_COLLECTION_COOKIE_NAME = "bandwagon_addcollection";
 
 Bandwagon.COMMIT_NOW = 1; // 1=commit on the fly. 0=commit when browser exit.
 
diff --git a/bandwagon/content/scripts/rpc/service.js b/bandwagon/content/scripts/rpc/service.js
index b425721..df105b5 100644
--- a/bandwagon/content/scripts/rpc/service.js
+++ b/bandwagon/content/scripts/rpc/service.js
@@ -256,6 +256,7 @@ Bandwagon.RPC.Service.prototype.getCollection = function(collection, callback)
                  data);
 }
 
+/** OBSOLETE
 Bandwagon.RPC.Service.prototype.subscribeCollection = function(collection, callback)
 {
     Bandwagon.Logger.debug("Bandwagon.RPC.Service.subscribeCollection: TBD");
@@ -265,7 +266,9 @@ Bandwagon.RPC.Service.prototype.subscribeCollection = function(collection, callb
     if (callback)
         callback(new this.Bandwagon.RPC.Event());
 }
+*/
 
+/** OBSOLETE
 Bandwagon.RPC.Service.prototype.unsubscribeCollection = function(collection, callback)
 {
     Bandwagon.Logger.debug("Bandwagon.RPC.Service.unsubscribeCollection: TBD");
@@ -275,6 +278,7 @@ Bandwagon.RPC.Service.prototype.unsubscribeCollection = function(collection, cal
     if (callback)
         callback(new this.Bandwagon.RPC.Event());
 }
+*/
 
 Bandwagon.RPC.Service.prototype.publishToCollection = function(extension, collection, personalNote, callback)
 {
diff --git a/bandwagon/content/ui/collectionsPaneController.js b/bandwagon/content/ui/collectionsPaneController.js
index 3d5ee0b..272b837 100644
--- a/bandwagon/content/ui/collectionsPaneController.js
+++ b/bandwagon/content/ui/collectionsPaneController.js
@@ -53,7 +53,7 @@ Bandwagon.Controller.CollectionsPane = new function()
     this.elemBandwagonCollectionHeader = null;
     this.stringBundle = null;
 
-    this.previewNotificationVal = "bandwagon-collection-preview";
+    //this.previewNotificationVal = "bandwagon-collection-preview";
 }
 
 Bandwagon.Controller.CollectionsPane.init = function()
@@ -228,12 +228,14 @@ Bandwagon.Controller.CollectionsPane.collectionUpdateObserver = function(collect
         {
             Bandwagon.Controller.CollectionsPane._repopulateAddonsList(collection);
 
+            /* OBSOLETE
             // if this is a just arrived collection preview, show the notification box
             if (collection.preview)
             {
                 Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionsNotification.notificationsHidden = false;
                 setTimeout(Bandwagon.Controller.CollectionsPane._createPreviewNotification, 200);
             }
+            */
         }
     }
 
@@ -300,6 +302,13 @@ Bandwagon.Controller.CollectionsPane.doUpdate = function(event)
 
 Bandwagon.Controller.CollectionsPane.doRemove = function(event)
 {
+    // TODO
+    alert('TBD');
+}
+
+/** OBSOLETE
+Bandwagon.Controller.CollectionsPane.doRemove = function(event)
+{
     if (Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem == null)
         return;
 
@@ -313,6 +322,7 @@ Bandwagon.Controller.CollectionsPane.doRemove = function(event)
     if (!collection.preview)
         bandwagonService.unsubscribe(collection);
 }
+*/
 
 Bandwagon.Controller.CollectionsPane.doShowCollection = function()
 {
@@ -341,8 +351,8 @@ Bandwagon.Controller.CollectionsPane.doShowCollection = function()
         Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionDescription.setAttribute("collapsed", true);
     }
 
+    /** OBSOLETE
     // collection preview notification box
-
     if (collection && collection.preview && collection.status != collection.STATUS_LOADING)
     {
         Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionsNotification.notificationsHidden = false;
@@ -351,6 +361,7 @@ Bandwagon.Controller.CollectionsPane.doShowCollection = function()
         setTimeout(Bandwagon.Controller.CollectionsPane._createPreviewNotification, 500);
     }
     else
+    */
     {
         Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionsNotification.notificationsHidden = true;
     }
@@ -510,6 +521,7 @@ Bandwagon.Controller.CollectionsPane.doDownloadFirefoxNBeta = function(version)
     Bandwagon.Controller.CollectionsPane._openURL("http://www.mozilla.com/en-US/firefox/all-beta.html");
 }
 
+/** OBSOLETE
 Bandwagon.Controller.CollectionsPane.doShowCollectionPreview = function(collectionURL)
 {
     // this is executed when the browser overlay controller opens the EM window to subscribe to a new collection.
@@ -536,7 +548,9 @@ Bandwagon.Controller.CollectionsPane.doShowCollectionPreview = function(collecti
     Bandwagon.Controller.CollectionsPane.preferredCollection = collection;
     setTimeout(function() { Bandwagon.Controller.CollectionsPane._selectCollection(collection); }, 500);
 }
+*/
 
+/** OBSOLETE
 Bandwagon.Controller.CollectionsPane._createPreviewNotification = function()
 {
     if (!Bandwagon.Controller.CollectionsPane.elemBandwagonCollectionsNotification.getNotificationWithValue(Bandwagon.Controller.CollectionsPane.previewNotificationVal))
@@ -564,7 +578,9 @@ Bandwagon.Controller.CollectionsPane._createPreviewNotification = function()
         );
     }
 }
+*/
 
+/** OBSOLETE
 Bandwagon.Controller.CollectionsPane.doCollectionPreviewDontSubscribe = function()
 {
     Bandwagon.Logger.debug("in Bandwagon.Controller.CollectionsPane.doCollectionPreviewDontSubscribe()");
@@ -573,7 +589,9 @@ Bandwagon.Controller.CollectionsPane.doCollectionPreviewDontSubscribe = function
 
     Bandwagon.Controller.CollectionsPane.doRemove();
 }
+*/
 
+/** OBSOLETE
 Bandwagon.Controller.CollectionsPane.doCollectionPreviewSubscribe = function()
 {
     Bandwagon.Logger.debug("in Bandwagon.Controller.CollectionsPane.doCollectionPreviewSubscribe()");
@@ -594,7 +612,7 @@ Bandwagon.Controller.CollectionsPane.doCollectionPreviewSubscribe = function()
     Bandwagon.Controller.CollectionsPane.elemBandwagonCollections.selectedItem.preview = false;
     Bandwagon.Controller.CollectionsPane.doShowCollection();
 } 
-
+*/
 
 /**
  * Refreshes the collection pane
diff --git a/bandwagon/content/ui/overlays/browserOverlayController.js b/bandwagon/content/ui/overlays/browserOverlayController.js
index 23691ce..01b87c4 100644
--- a/bandwagon/content/ui/overlays/browserOverlayController.js
+++ b/bandwagon/content/ui/overlays/browserOverlayController.js
@@ -60,10 +60,13 @@ Bandwagon.Controller.BrowserOverlay.initBandwagon = function()
         Bandwagon.Logger.error("Error initializing bandwagon: " + e);
     }
 
+    /** OBSOLETE
     // add listener to every page loaded in the browser - listen for our custom bandwagonSubscribe event
     gBrowser.addEventListener("load", Bandwagon.Controller.BrowserOverlay.addSubscribeEventListenerToDocument, true);
+    */
 }
 
+/** OBSOLETE
 Bandwagon.Controller.BrowserOverlay.addSubscribeEventListenerToDocument = function(event)
 {
     if (event.originalTarget instanceof HTMLDocument)
@@ -83,7 +86,9 @@ Bandwagon.Controller.BrowserOverlay.addSubscribeEventListenerToDocument = functi
         //Bandwagon.Logger.debug("added bandwagonSubscribe listener");
     }
 }
+*/
 
+/** OBSOLETE
 Bandwagon.Controller.BrowserOverlay.handleSubscribeEvent = function(event)
 {
     if (event.target && event.target.getAttribute("href"))
@@ -99,7 +104,9 @@ Bandwagon.Controller.BrowserOverlay.handleSubscribeEvent = function(event)
         Bandwagon.Logger.error("Missing data payload in bandwagonSubscribe event");
     }
 }
+*/
 
+/** OBSOLETE
 Bandwagon.Controller.BrowserOverlay._openExtensionManagerCollectionsPaneWithSubscribe = function(collectionURL)
 {
     const EMTYPE = "Extension:Manager";
@@ -126,6 +133,7 @@ Bandwagon.Controller.BrowserOverlay._openExtensionManagerCollectionsPaneWithSubs
         window.openDialog(EMURL, "", EMFEATURES, {subscribe: collectionURL});
     }
 }
+*/
 
 Bandwagon.Controller.BrowserOverlay._removeLoadListener = function()
 {
diff --git a/bandwagon/content/ui/overlays/extensionsOverlayController.js b/bandwagon/content/ui/overlays/extensionsOverlayController.js
index 6b630fc..d4c89f5 100644
--- a/bandwagon/content/ui/overlays/extensionsOverlayController.js
+++ b/bandwagon/content/ui/overlays/extensionsOverlayController.js
@@ -82,6 +82,7 @@ Bandwagon.Controller.ExtensionsOverlay.init = function()
 
         if (inArgs)
         {
+            /** OBSOLETE
             if (inArgs.subscribe)
             {
                 Bandwagon.Logger.debug("Have window argument subscribe = " + inArgs.subscribe);
@@ -93,7 +94,9 @@ Bandwagon.Controller.ExtensionsOverlay.init = function()
                 },
                 500);
             }
-            else if (inArgs.selectCollection)
+            else
+            */
+            if (inArgs.selectCollection)
             {
                 Bandwagon.Logger.debug("Have window argument selectCollection = " + inArgs.selectCollection);
 
diff --git a/bandwagon/content/ui/settingsController.js b/bandwagon/content/ui/settingsController.js
index ef7d60e..48bf205 100644
--- a/bandwagon/content/ui/settingsController.js
+++ b/bandwagon/content/ui/settingsController.js
@@ -384,8 +384,11 @@ Bandwagon.Controller.Settings.doCancel = function()
 Bandwagon.Controller.Settings.doChangePassword = function()
 {
     // TODO
+    
+    alert('TBD');
 }
 
+/** OBSOLETE
 Bandwagon.Controller.Settings.doAdd = function()
 {
     var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
@@ -402,7 +405,9 @@ Bandwagon.Controller.Settings.doAdd = function()
         bandwagonService.addPreviewCollection(input.value);
     }
 }
+*/
 
+/** OBSOLETE
 Bandwagon.Controller.Settings.doRemove = function()
 {
     var collection = Bandwagon.Controller.Settings.elemBandwagonCollections.selectedItem.collection;
@@ -436,6 +441,7 @@ Bandwagon.Controller.Settings.doRemove = function()
             bandwagonService.unsubscribe(collection);
     }
 }
+*/
 
 Bandwagon.Controller.Settings.doUpdateIntervalScopeChange = function(event)
 {