Merge lp:~ralsina/ubuntuone-client/login-user-password into lp:ubuntuone-client

[Roberto Alsina]

Expose login_with_user_password via ubuntuone-client

Expose login_with_user_password via ubuntuone-client

[Alejandro J. Cura (alecu)]

Looks fine.

review: Approve

[Natalia Bidart (nataliabidart)]

review: Approve

=== added file 'contrib/login_email_password.py'
--- contrib/login_email_password.py	1970-01-01 00:00:00 +0000
+++ contrib/login_email_password.py	2011-07-29 18:14:24 +0000
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+# Author: Roberto Alsina <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+"""Script that shows the qt gui."""
+
+# pylint: disable=F0401, E1101
+from twisted.internet import reactor
+from twisted.internet.defer import inlineCallbacks
+from ubuntuone.platform.credentials import CredentialsManagementTool
+
+
+@inlineCallbacks
+def main():
+    """Perform a client request to be logged in."""
+    credtool = CredentialsManagementTool()
+
+    creds = yield credtool.login_email_password(
+          email='[e-mail]',
+          password='whatever',
+    )
+    print "creds found", creds
+    reactor.stop()
+
+
+if __name__ == '__main__':
+    main()
+    reactor.run()

=== modified file 'tests/test_credentials.py'
--- tests/test_credentials.py	2011-06-24 05:30:34 +0000
+++ tests/test_credentials.py	2011-07-29 18:14:24 +0000
@@ -98,6 +98,24 @@
         self.mocker.replay()
         return self.management_tool.register(window_id=window_id)
 
+    def test_login_email_password(self):
+        """Test that we login correctly."""
+        email = 'email'
+        password = 'password'
+        arg_dict = dict(email=email, password=password)
+        signals = ['creds_found', 'creds_denied', 'creds_error']
+        self.get_cred_proxy()
+        self.mocker.result(self.proxy)
+        self.proxy.register_to_credentials_found(MATCH(callable))
+        self.mocker.result(signals[0])
+        self.proxy.register_to_credentials_error(MATCH(callable))
+        self.mocker.result(signals[1])
+        self.proxy.login_email_password(arg_dict, reply_handler=MATCH(callable),
+                            error_handler=MATCH(callable))
+        self.mocker.replay()
+        return self.management_tool.login_email_password(email=email,
+            password=password)
+
     def test_cleanup_but_no_remove(self):
         """The cleanup method works on handlers that have no remove method."""
         self.management_tool._cleanup_signals = ["test signal 1", "test sig 2"]

=== modified file 'ubuntuone/api/__init__.py'
--- ubuntuone/api/__init__.py	2011-01-14 12:56:21 +0000
+++ ubuntuone/api/__init__.py	2011-07-29 18:14:24 +0000
@@ -15,4 +15,4 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+

=== modified file 'ubuntuone/credentials.py'
--- ubuntuone/credentials.py	2011-07-26 16:07:08 +0000
+++ ubuntuone/credentials.py	2011-07-29 18:14:24 +0000
@@ -271,3 +271,37 @@
 
         result = yield d
         defer.returnValue(result)
+
+    @defer.inlineCallbacks
+    def login_email_password(self, email, password):
+        """Login to Ubuntu One.
+
+        Return a deferred that, when fired, will return the credentials for
+        Ubuntu One for the given email and password.
+
+        The returned credentials will be either a non-empty dictionary like the
+        one described in 'find_credentials', or None. The latter indicates
+        invalid or wrong user/password.
+
+        """
+        d = defer.Deferred()
+        d.addBoth(self.cleanup)
+
+        proxy = yield self.get_creds_proxy()
+
+        sig = proxy.register_to_credentials_found(d.callback)
+        self._cleanup_signals.append(sig)
+
+        sig = proxy.register_to_credentials_error(
+            lambda x, error_dict: d.errback(CredentialsError(error_dict)))
+        self._cleanup_signals.append(sig)
+
+        done = defer.Deferred()
+        proxy.login_email_password({'email': email, 'password': password},
+            reply_handler=lambda: done.callback(None),
+            error_handler=lambda *a: done.errback(a))
+
+        yield done
+
+        result = yield d
+        defer.returnValue(result)

=== modified file 'ubuntuone/platform/linux/credentials.py'
--- ubuntuone/platform/linux/credentials.py	2011-05-31 18:13:24 +0000
+++ ubuntuone/platform/linux/credentials.py	2011-07-29 18:14:24 +0000
@@ -226,6 +226,17 @@
         self.sso_proxy.login(APP_NAME, params,
             reply_handler=reply_handler, error_handler=error_handler)
 
+    @dbus.service.method(dbus_interface=DBUS_CREDENTIALS_IFACE,
+                         in_signature='a{ss}',
+                         async_callbacks=("reply_handler", "error_handler"))
+    def login_email_password(self, args, reply_handler=NO_OP, error_handler=NO_OP):
+        """Get credentials if found else prompt to login to Ubuntu One."""
+        self.ref_count += 1
+        params = {PING_URL_KEY: PING_URL}
+        params.update(args)
+        self.sso_proxy.login_email_password(APP_NAME, params,
+            reply_handler=reply_handler, error_handler=error_handler)
+
 
 class CredentialsManagementProxy(object):
     """Proxy that allows to work with the dbus api.
@@ -267,6 +278,10 @@
         """Relay the login method."""
         return self.proxy.login(*args, **kwargs)
 
+    def login_email_password(self, *args, **kwargs):
+        """Relay the login method."""
+        return self.proxy.login_email_password(*args, **kwargs)
+
     def register_to_credentials_stored(self, callback):
         """Register to the CredentialsStored dbus signal."""
         return self.proxy.connect_to_signal('CredentialsStored', callback)

=== modified file 'ubuntuone/platform/windows/credentials.py'
--- ubuntuone/platform/windows/credentials.py	2011-07-20 15:01:03 +0000
+++ ubuntuone/platform/windows/credentials.py	2011-07-29 18:14:24 +0000
@@ -101,6 +101,13 @@
         d = self.sso_proxy.login(APP_NAME, params)
         d.addCallbacks(lambda _: reply_handler(), error_handler)
 
+    def login_email_password(self, args, reply_handler=NO_OP, error_handler=NO_OP):
+        """Get credentials if found else login to Ubuntu One."""
+        params = {PING_URL_KEY: PING_URL}
+        params.update(args)
+        d = self.sso_proxy.login_email_password(APP_NAME, params)
+        d.addCallbacks(lambda _: reply_handler(), error_handler)
+
     def register_to_credentials_stored(self, callback):
         """Register to the CredentialsStored dbus signal."""
         return RemovableSignal(self.sso_proxy, "on_credentials_stored_cb",
@@ -113,6 +120,7 @@
 
     def register_to_credentials_found(self, callback):
         """Register to the CredentialsFound dbus signal."""
+        # XXX: we are not filtering by app name (bug #818190)
         pass_credentials = lambda app_name, creds: callback(creds)
         return RemovableSignal(self.sso_proxy, "on_credentials_found_cb",
                                pass_credentials)

=== modified file 'ubuntuone/platform/windows/ipc.py'
--- ubuntuone/platform/windows/ipc.py	2011-07-28 13:54:36 +0000
+++ ubuntuone/platform/windows/ipc.py	2011-07-29 18:14:24 +0000
@@ -316,7 +316,7 @@
         """Emit RequestQueueRemoved."""
         sanitize_dict(data)
         self.emit_signal('on_request_queue_removed', op_name, str(op_id), data)
-

+
 class Events(Referenceable, SignalBroadcaster):
     """The events of the system translated to ipc signals."""