Merge lp:~jonobacon/ubuntu-accomplishments-daemon/u1-signup into lp:ubuntu-accomplishments-daemon

[Jono Bacon]

This branch adds support for signing up from the application if no Ubuntu One account is found. Please note: you should ensure that you also apply the equivilent branch to the viewer: lp:~jonobacon/ubuntu-accomplishments-viewer/u1-signup

This is the user experience: the user does not have an Ubuntu One account. They fire up the accomplishments system and a message explains why Ubuntu One is required and says it will detect an account. If no account is found a native GTK window pops up where the user can sign up, and when they register they are emailed a code that they enter into the app. When the signup process is complete, the app moves on to register the share as normal. While the process is not perfect for 0.2, it works, and in 0.3 we can refine it further: but at least we will know that people without accounts are taken care of.

Some notes:

 * This works by running a new method in the daemon that detects credententials and if credentials are found it triggers a dbus signal (ubuntu_one_account_ready) which then moves the client onto the share setup step.
 * When we detect the credentials, if none are found the signup process continues before the execution continues.
 * The reason we need to detect for an account first is that we don't know up front from the daemon if the user has credentials, as such if they don't have credentials the signup processes is triggered and the signal is generated as normal.

=== modified file 'accomplishments/daemon/api.py'
--- accomplishments/daemon/api.py	2012-06-07 14:02:41 +0000
+++ accomplishments/daemon/api.py	2012-06-07 23:52:19 +0000
@@ -44,6 +44,7 @@
     pynotify = None
 
 from ubuntuone.platform.tools import SyncDaemonTool
+from ubuntuone.platform.credentials import CredentialsManagementTool
 from ubuntuone.couch import auth
 
 import accomplishments
@@ -113,6 +114,23 @@
         self.parent.run_scripts(0)
         self.wait_until_a_sig_file_arrives()
 
+    @defer.inlineCallbacks
+    def verify_ubuntu_one_account(self):
+        # check if this machine has an Ubuntu One account
+        log.msg("Check if this machine has an Ubuntu One account...")
+
+        tool = CredentialsManagementTool()
+        creds = yield tool.register()
+        
+        if len(creds) > 1:
+            log.msg("...Yes.")
+            self.parent.has_u1 = True
+            self.parent.service.ubuntu_one_account_ready()
+        else:
+            log.msg("...No.")
+            log.msg(u1auth_response)
+            self.parent.has_u1 = False
+
     # XXX let's rewrite this to use deferreds explicitly
     @defer.inlineCallbacks
     def register_trophy_dir(self, trophydir):
@@ -467,27 +485,6 @@
         im.putalpha(alpha)
         return im
 
-    def verify_ubuntu_one_account(self):
-        # check if this machine has an Ubuntu One account
-        log.msg("Check if this machine has an Ubuntu One account...")
-        u1auth_response = auth.request(
-            url='https://one.ubuntu.com/api/account/')
-        u1email = None
-        if not isinstance(u1auth_response, basestring):
-            u1email = json.loads(u1auth_response[1])['email']
-        else:
-            log.msg("No Ubuntu One account is configured.")
-
-        if u1email is None:
-            log.msg("...No.")
-            log.msg(u1auth_response)
-            self.has_u1 = False
-            return False
-        else:
-            log.msg("...Yes.")
-            self.has_u1 = True
-            return True
-
     def get_config_value(self, section, item):
         """Return a configuration value from the .accomplishments file"""
         log.msg(
@@ -513,6 +510,10 @@
         else:
             return "NoOption"
 
+    def verify_ubuntu_one_account(self):
+        log.msg("------------------- run first func")
+        self.asyncapi.verify_ubuntu_one_account()
+
     def write_config_file_item(self, section, item, value):
         """Set a configuration value in the .accomplishments file"""
         log.msg(

=== modified file 'accomplishments/daemon/dbusapi.py'
--- accomplishments/daemon/dbusapi.py	2012-06-07 14:02:41 +0000
+++ accomplishments/daemon/dbusapi.py	2012-06-07 23:52:19 +0000
@@ -216,7 +216,7 @@
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="s", out_signature="s")
     def get_acc_icon(self,accomID):
-        return self.api.get_acc_icon(accomID)
+        return self.api.get_acc_icon(accomID)        
         
     @dbus.service.method(dbus_interface='org.ubuntu.accomplishments',
         in_signature="s", out_signature="s")
@@ -320,3 +320,7 @@
     @dbus.service.signal(dbus_interface='org.ubuntu.accomplishments')
     def scriptrunner_finish(self):
         pass
+
+    @dbus.service.signal(dbus_interface='org.ubuntu.accomplishments')
+    def ubuntu_one_account_ready(self):
+        pass