Merge lp:~mvo/software-center/lp966514 into lp:software-center

[Michael Vogt]

This fixes bug #966514. To verify:
- open software-center
- click on reinstall-previous-purchases to ensure you are logged in
- close software-center
- stop the network connecion (e.g. via network manager or ifconfig down)
- click on reinstall-previous-purchases again
- verify that no "sign-in" dialog appears
(doing the same in trunk will trigger sign-in dialogs)

[Gary Lasker (gary-lasker)]

Nice fix!

review: Approve

=== removed file 'softwarecenter/backend/piston/sso_helper.py'
--- softwarecenter/backend/piston/sso_helper.py	2012-03-16 20:12:57 +0000
+++ softwarecenter/backend/piston/sso_helper.py	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-#!/usr/bin/python
-# Copyright (C) 2012 Canonical
-#
-# Authors:
-#  Michael Vogt
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 3.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-from gi.repository import GObject
-from gettext import gettext as _
-
-from softwarecenter.backend.login_sso import get_sso_backend
-from softwarecenter.backend.ubuntusso import UbuntuSSOAPI
-from softwarecenter.enums import (SOFTWARE_CENTER_NAME_KEYRING,
-                                  SOFTWARE_CENTER_SSO_DESCRIPTION,
-                                  )
-from softwarecenter.utils import clear_token_from_ubuntu_sso
-
-
-class SSOLoginHelper(object):
-    def __init__(self, xid=0):
-        self.oauth = None
-        self.xid = xid
-        self.loop = GObject.MainLoop(GObject.main_context_default())
-
-    def _login_successful(self, sso_backend, oauth_result):
-        self.oauth = oauth_result
-        # FIXME: actually verify the token against ubuntu SSO
-        self.loop.quit()
-
-    def verify_token(self, token):
-        def _whoami_done(sso, me):
-            self._whoami = me
-            self.loop.quit()
-
-        def _whoami_error(sso, err):
-            #print "ERRR", err
-            self.loop.quit()
-        self._whoami = None
-        sso = UbuntuSSOAPI()
-        sso.connect("whoami", _whoami_done)
-        sso.connect("error", _whoami_error)
-        sso.whoami()
-        self.loop.run()
-        # check if the token is valid
-        if self._whoami is None:
-            return False
-        else:
-            return True
-
-    def clear_token(self):
-        clear_token_from_ubuntu_sso(SOFTWARE_CENTER_NAME_KEYRING)
-
-    def get_oauth_token_and_verify_sync(self):
-        token = self.get_oauth_token_sync()
-        # check if the token is valid and reset it if it is not
-        if token and not self.verify_token(token):
-            self.clear_token()
-            # re-trigger login
-            token = self.get_oauth_token_sync()
-        return token
-
-    def get_oauth_token_sync(self):
-        self.oauth = None
-        sso = get_sso_backend(
-            self.xid,
-            SOFTWARE_CENTER_NAME_KEYRING,
-            _(SOFTWARE_CENTER_SSO_DESCRIPTION))
-        sso.connect("login-successful", self._login_successful)
-        sso.connect("login-failed", lambda s: self.loop.quit())
-        sso.connect("login-canceled", lambda s: self.loop.quit())
-        sso.login_or_register()
-        self.loop.run()
-        return self.oauth

=== modified file 'utils/piston-helpers/piston_generic_helper.py'
--- utils/piston-helpers/piston_generic_helper.py	2012-03-15 10:43:13 +0000
+++ utils/piston-helpers/piston_generic_helper.py	2012-03-28 12:45:48 +0000
@@ -32,6 +32,7 @@
     httplib2.debuglevel = 1
 
 import piston_mini_client.auth
+import piston_mini_client.failhandlers
 from piston_mini_client.failhandlers import APIError
 
 try:
@@ -93,6 +94,11 @@
         self.loop.quit()
 
     def verify_token_sync(self, token):
+        """ Verify that the token is valid
+        
+            Note that this may raise httplib2 exceptions if the server
+            is not reachable
+        """
         LOG.debug("verify_token")
         auth = piston_mini_client.auth.OAuthAuthorizer(
             token["token"], token["token_secret"],
@@ -100,10 +106,10 @@
         api = UbuntuSsoAPI(auth=auth)
         try:
             res = api.whoami()
-        except:
-            LOG.exception("api.whoami failed")
-            return None
-        return res
+        except piston_mini_client.failhandlers.APIError as e:
+            LOG.exception("api.whoami failed with APIError: '%s'" % e)
+            return False
+        return len(res) > 0
 
     def clear_token(self):
         clear_token_from_ubuntu_sso(SOFTWARE_CENTER_NAME_KEYRING)
@@ -124,10 +130,18 @@
     def get_oauth_token_and_verify_sync(self):
         token = self.get_oauth_token_sync()
         # check if the token is valid and reset it if it is not
-        if token and not self.verify_token_sync(token):
-            self.clear_token()
-            # re-trigger login
-            token = self.get_oauth_token_sync()
+        if token:
+            # verify token will return false if there is a API error, 
+            # but there maybe httplib2 errors if there is no network,
+            # so ignore them
+            try:
+                if not self.verify_token_sync(token):
+                    self.clear_token()
+                    # re-trigger login once
+                    token = self.get_oauth_token_sync()
+            except Exception as e:
+                LOG.warn(
+                    "token could not be verified (network problem?): %s" % e)
         return token