Merge lp:~dobey/ubuntu-sso-client/no-more-ping into lp:ubuntu-sso-client

[dobey]

Remove the ping URL usage.
Update the Terms and Privacy URLs to point to login.ubuntu.com.
Update timestamp checking URL to point to login.ubuntu.com.

[dobey (dobey)]

/home/dobey/Projects/canonical/ubuntu-sso-client/no-more-ping/ubuntu_sso/utils/__init__.py:
    39: 'defer' imported but unused
    47: 'compat' imported but unused
    47: 'webclient' imported but unused

/home/dobey/Projects/canonical/ubuntu-sso-client/no-more-ping/ubuntu_sso/utils/tests/test_common.py:
    43: 'EMAIL' imported but unused
    43: 'TOKEN' imported but unused

review: Needs Fixing

[dobey (dobey)]

review: Abstain

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'ubuntu_sso/constants.py.in'
--- ubuntu_sso/constants.py.in	2013-06-12 14:26:06 +0000
+++ ubuntu_sso/constants.py.in	2014-08-13 21:12:50 +0000
@@ -36,7 +36,7 @@
 import platform
 import urllib
 
-from ubuntu_sso import SSO_UONE_BASE_URL
+from ubuntu_sso import SSO_AUTH_BASE_URL
 
 VERSION = '@VERSION@'
 PROJECT_NAME = '@PROJECT_NAME@'
@@ -45,10 +45,8 @@
 
 # Ubuntu One sso constants
 APP_NAME = u"Ubuntu One"
-TC_URL = u"%s/terms/" % SSO_UONE_BASE_URL
-POLICY_URL = u"%s/privacy/" % SSO_UONE_BASE_URL
-BASE_PING_URL = \
-    u"%s/oauth/sso-finished-so-get-tokens/{email}" % SSO_UONE_BASE_URL
+TC_URL = u"%s/terms/" % SSO_AUTH_BASE_URL
+POLICY_URL = u"%s/privacy/" % SSO_AUTH_BASE_URL
 
 
 def platform_data():
@@ -59,6 +57,3 @@
     # urlencode will not encode unicode, only bytes
     result = urllib.urlencode(result)
     return result
-
-# the result of platform_data is given by urlencode, encoded with ascii
-PING_URL = BASE_PING_URL + u"?" + platform_data().decode('ascii')

=== modified file 'ubuntu_sso/networkstate/darwin.py'
--- ubuntu_sso/networkstate/darwin.py	2012-06-22 20:03:57 +0000
+++ ubuntu_sso/networkstate/darwin.py	2014-08-13 21:12:50 +0000
@@ -28,7 +28,7 @@
 from ubuntu_sso.logger import setup_logging
 logger = setup_logging("ubuntu_sso.networkstate")
 
-HOSTNAME_TO_CHECK = 'one.ubuntu.com'
+HOSTNAME_TO_CHECK = 'login.ubuntu.com'
 
 from ctypes import (
     CDLL,

=== modified file 'ubuntu_sso/networkstate/tests/run_nwmgr_standalone.py'
--- ubuntu_sso/networkstate/tests/run_nwmgr_standalone.py	2012-06-27 21:58:15 +0000
+++ ubuntu_sso/networkstate/tests/run_nwmgr_standalone.py	2014-08-13 21:12:50 +0000
@@ -26,7 +26,7 @@
 
 def my_cb(state):
     """simple callback just prints state"""
-    print("one.ubuntu.com:", state)
+    print("login.ubuntu.com:", state)
 
 if __name__ == '__main__':
     # test once with direct call:

=== modified file 'ubuntu_sso/qt/current_user_sign_in_page.py'
--- ubuntu_sso/qt/current_user_sign_in_page.py	2012-12-04 19:28:44 +0000
+++ ubuntu_sso/qt/current_user_sign_in_page.py	2014-08-13 21:12:50 +0000
@@ -150,11 +150,7 @@
         logger.info('CurrentUserSignInPage.login for: %s', email)
         password = compat.text_type(self.ui.password_edit.text())
         args = (self.app_name, email, password)
-        if self.ping_url:
-            f = self.backend.login_and_ping
-            args = args + (self.ping_url,)
-        else:
-            f = self.backend.login
+        f = self.backend.login
 
         self.hide_error()
         self.show_overlay()

=== modified file 'ubuntu_sso/qt/email_verification_page.py'
--- ubuntu_sso/qt/email_verification_page.py	2012-12-04 19:28:44 +0000
+++ ubuntu_sso/qt/email_verification_page.py	2014-08-13 21:12:50 +0000
@@ -120,11 +120,7 @@
         args = (self.app_name, self.email, self.password, code)
         self.hide_error()
         self.show_overlay()
-        if self.ping_url:
-            f = self.backend.validate_email_and_ping
-            args = args + (self.ping_url,)
-        else:
-            f = self.backend.validate_email
+        f = self.backend.validate_email
 
         logger.info('Calling validate_email with email %r, password <hidden>, '
                     'app_name %r and email_token %r.', self.email,

=== modified file 'ubuntu_sso/qt/sso_wizard_page.py'
--- ubuntu_sso/qt/sso_wizard_page.py	2013-06-12 14:26:06 +0000
+++ ubuntu_sso/qt/sso_wizard_page.py	2014-08-13 21:12:50 +0000
@@ -45,7 +45,7 @@
 from twisted.internet import defer
 
 from ubuntu_sso import main
-from ubuntu_sso.constants import APP_NAME, TC_URL, POLICY_URL, PING_URL
+from ubuntu_sso.constants import APP_NAME, TC_URL, POLICY_URL
 from ubuntu_sso.logger import setup_gui_logging, log_call
 from ubuntu_sso.qt import (
     ERROR_STYLE,
@@ -203,7 +203,6 @@
 
         # store common useful data provided by the app
         self.app_name = APP_NAME
-        self.ping_url = PING_URL
         self.tc_url = TC_URL
         self.policy_url = POLICY_URL
         self.help_text = kwargs.get('help_text', '')

=== modified file 'ubuntu_sso/qt/tests/test_current_user_sign_in_page.py'
--- ubuntu_sso/qt/tests/test_current_user_sign_in_page.py	2013-03-21 13:49:36 +0000
+++ ubuntu_sso/qt/tests/test_current_user_sign_in_page.py	2014-08-13 21:12:50 +0000
@@ -136,25 +136,9 @@
         self.ui._validate()
         self.assertTrue(button.isEnabled())
 
-    def test_login_with_ping(self):
-        """Test the login method."""
-        self.patch(self.ui, "hide_error", self._set_called)
-        email = 'valid@email'
-        password = '123456'
-        self.ui.ui.email_edit.setText(email)
-        self.ui.ui.password_edit.setText(password)
-        self.ui.login()
-        self.assertEqual(self._overlay_show_counter, 1)
-        self.assertFalse(self.ui.isEnabled())
-        self.assert_backend_called('login_and_ping',
-            self.app_name, email, password, self.ui.ping_url)
-        expected = ((), {})
-        self.assertEqual(expected, self._called)
-
-    def test_login_without_ping(self):
-        """Test the login method."""
-        self.patch(self.ui, "hide_error", self._set_called)
-        self.ui.ping_url = ''
+    def test_login(self):
+        """Test the login method."""
+        self.patch(self.ui, "hide_error", self._set_called)
         email = 'valid@email'
         password = '123456'
         self.ui.ui.email_edit.setText(email)

=== modified file 'ubuntu_sso/qt/tests/test_email_verification.py'
--- ubuntu_sso/qt/tests/test_email_verification.py	2013-03-21 13:49:36 +0000
+++ ubuntu_sso/qt/tests/test_email_verification.py	2014-08-13 21:12:50 +0000
@@ -126,28 +126,9 @@
         self.assert_signal_emitted(self.ui.registrationSuccess, (email,),
             self.ui.on_email_validated, self.app_name, email)
 
-    def test_validate_email_with_ping(self):
-        """Test the login method."""
-        self.patch(self.ui, "hide_error", self._set_called)
-        email = '[e-mail]'
-        password = 'password'
-        code = 'code'
-        self.ui.email = email
-        self.ui.password = password
-        self.ui.ui.verification_code_edit.setText(code)
-
-        self.ui.validate_email()
-
-        self.assert_backend_called('validate_email_and_ping',
-            self.app_name, email, password, code, self.ui.ping_url)
-        expected = ((), {})
-        self.assertEqual(expected, self._called)
-        self.assertEqual(self._overlay_show_counter, 1)
-
-    def test_validate_email_without_ping(self):
-        """Test the login method."""
-        self.patch(self.ui, "hide_error", self._set_called)
-        self.ui.ping_url = ''
+    def test_validate_email(self):
+        """Test the login method."""
+        self.patch(self.ui, "hide_error", self._set_called)
         email = '[e-mail]'
         password = 'password'
         code = 'code'

=== modified file 'ubuntu_sso/utils/__init__.py'
--- ubuntu_sso/utils/__init__.py	2013-05-08 18:38:36 +0000
+++ ubuntu_sso/utils/__init__.py	2014-08-13 21:12:50 +0000
@@ -36,7 +36,6 @@
 from dirspec.basedir import load_config_paths
 from dirspec.utils import get_program_path
 
-from twisted.internet import defer
 from twisted.python import procutils
 
 from ubuntu_sso import (BACKEND_EXECUTABLE,
@@ -44,7 +43,6 @@
                         UI_PROXY_CREDS_DIALOG,
                         UI_SSL_DIALOG)
 from ubuntu_sso.logger import setup_logging
-from ubuntu_sso.utils import compat, webclient
 
 
 logger = setup_logging("ubuntu_sso.utils")
@@ -166,35 +164,5 @@
     return ssl_cert_location
 
 
[e-mail]
 def ping_url(url, email, credentials):
-    """Ping the 'url' with the 'email' attached to it.
-
-    Sign the request with 'credentials'. The url must not be None.
-
-    """
-    logger.info('Pinging server using url: %r, email: %r.',
-                url, email)
-    assert isinstance(url, compat.text_type), 'Url %r must be unicode' % url
-
-    target_url = url
-    try:
-        target_url = url.format(email=email)
-    except IndexError:  # tuple index out of range
-        target_url = url.format(email)  # format the first substitution
-
-    if target_url == url:
-        logger.debug('Original url (%r) could not be formatted, '
-                     'appending email (%r).', url, email)
-        assert url.endswith('/'), 'Url %r must end with /.' % url
-        target_url = url + email
-
-    wc = webclient.webclient_factory()
-    try:
-        logger.debug('Opening the url %r with webclient.request.', url)
-        response = yield wc.request(target_url, oauth_credentials=credentials)
-        logger.debug('Url %r opened. Response content: %r.',
-                     url, response.content)
-        defer.returnValue(response)
-    finally:
-        wc.shutdown()
+    """Unused -- it was formerly used to let U1 know about new accounts."""

=== modified file 'ubuntu_sso/utils/tests/test_common.py'
--- ubuntu_sso/utils/tests/test_common.py	2013-05-22 20:14:40 +0000
+++ ubuntu_sso/utils/tests/test_common.py	2014-08-13 21:12:50 +0000
@@ -40,7 +40,7 @@
 from ubuntuone.devtools.testing.txwebserver import HTTPWebServer
 
 from ubuntu_sso import utils
-from ubuntu_sso.tests import TestCase, EMAIL, TOKEN
+from ubuntu_sso.tests import TestCase
 
 CONSTANTS_MODULE = 'ubuntu_sso.constants'
 NOT_DEFINED = object()
@@ -238,86 +238,3 @@
         # pylint: disable=E1101
         root = RootResource()
         super(MockWebServer, self).__init__(root)
-
-
-class FakedError(Exception):
-    """A mock, test, sample, and fake exception."""
-
-
-class PingUrlTestCase(TestCase):
-    """Test suite for the URL pinging."""
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(PingUrlTestCase, self).setUp()
-        self.url = 'http://example.com/'
-        self.wc = FakeWebclient()
-        self.patch(utils.webclient, "webclient_factory",
-                   lambda *args: self.wc)
-
-    @defer.inlineCallbacks
-    def test_ping_url(self):
-        """The url is opened."""
-        yield utils.ping_url(url=self.url, email=EMAIL, credentials=TOKEN)
-
-        args, _kwargs = self.wc.called[0]
-        self.assertEqual(args[0], self.url + EMAIL)
-
-    @defer.inlineCallbacks
-    def test_ping_url_result(self):
-        """The result is returned."""
-        result = yield utils.ping_url(url=self.url, email=EMAIL,
-                                      credentials=TOKEN)
-        self.assertEqual(result.content, 'response')
-
-    @defer.inlineCallbacks
-    def test_request_is_signed_with_credentials(self):
-        """The http request to url is signed with the credentials."""
-        yield utils.ping_url(url=self.url, email=EMAIL, credentials=TOKEN)
-
-        _args, kwargs = self.wc.called[0]
-        self.assertEqual(kwargs["oauth_credentials"], TOKEN)
-
-    @defer.inlineCallbacks
-    def test_ping_url_formatting(self):
-        """The email is added as the first formatting argument."""
-        self.url = 'http://example.com/{email}/something/else'
-        yield utils.ping_url(url=self.url, email=EMAIL, credentials=TOKEN)
-
-        expected = self.url.format(email=EMAIL)
-        assert len(self.wc.called) > 0
-        args, _kwargs = self.wc.called[0]
-        self.assertEqual(expected, args[0])
-
-    @defer.inlineCallbacks
-    def test_ping_url_formatting_with_query_params(self):
-        """The email is added as the first formatting argument."""
-        self.url = 'http://example.com/{email}?something=else'
-        yield utils.ping_url(url=self.url, email=EMAIL, credentials=TOKEN)
-
-        expected = self.url.format(email=EMAIL)
-        assert len(self.wc.called) > 0
-        args, _kwargs = self.wc.called[0]
-        self.assertEqual(expected, args[0])
-
-    @defer.inlineCallbacks
-    def test_ping_url_formatting_no_email_kwarg(self):
-        """The email is added as the first formatting argument."""
-        self.url = 'http://example.com/{0}/yadda/?something=else'
-        yield utils.ping_url(url=self.url, email=EMAIL, credentials=TOKEN)
-
-        expected = self.url.format(EMAIL)
-        assert len(self.wc.called) > 0
-        args, _kwargs = self.wc.called[0]
-        self.assertEqual(expected, args[0])
-
-    @defer.inlineCallbacks
-    def test_ping_url_formatting_no_format(self):
-        """The email is appended if formatting could not be accomplished."""
-        self.url = 'http://example.com/yadda/'
-        yield utils.ping_url(url=self.url, email=EMAIL, credentials=TOKEN)
-
-        expected = self.url + EMAIL
-        assert len(self.wc.called) > 0
-        args, _kwargs = self.wc.called[0]
-        self.assertEqual(expected, args[0])

=== modified file 'ubuntu_sso/utils/webclient/timestamp.py'
--- ubuntu_sso/utils/webclient/timestamp.py	2013-04-19 15:32:17 +0000
+++ ubuntu_sso/utils/webclient/timestamp.py	2014-08-13 21:12:50 +0000
@@ -32,7 +32,7 @@
 
 from twisted.internet import defer
 
-from ubuntu_sso import SSO_UONE_BASE_URL
+from ubuntu_sso import SSO_AUTH_BASE_URL
 from ubuntu_sso.logger import setup_logging
 
 logger = setup_logging("ubuntu_sso.utils.webclient.timestamp")
@@ -44,7 +44,7 @@
 
     CHECKING_INTERVAL = 60 * 60  # in seconds
     ERROR_INTERVAL = 30  # in seconds
-    SERVER_IRI = u"%s/api/time" % SSO_UONE_BASE_URL
+    SERVER_IRI = SSO_AUTH_BASE_URL
 
     def __init__(self, webclient_class):
         """Initialize this instance."""