Merge lp:~canonical-platform-qa/checkbox/easing-login-pain into lp:checkbox

[Christopher Lee]

make entering login details easier (pre-populate email address).

make entering login details easier (pre-populate email address).

Unmerged revisions

4017. By Christopher Lee on 2015-09-30

Merge pre-req.

4016. By Christopher Lee on 2015-09-30

Cache succesful email address and prepopulate dialog.

4015. By Christopher Lee on 2015-09-29

Minor fix for sso qml

4014. By Christopher Lee on 2015-09-28

Use the correct service url in the json settings.

4013. By Christopher Lee on 2015-09-23

Small niceity, tabbing between email and password fields.

4012. By Christopher Lee on 2015-09-23

QML Dialog behaves better (greys out during request, closes properly).

4011. By Christopher Lee on 2015-09-22

Working against staging. Still needs qml error fixed/

4010. By Christopher Lee on 2015-09-22

Working initial workflow (without actuall signing/authentication)

4009. By Christopher Lee on 2015-09-21

Merge changes in trunk.

4008. By Maciej Kisielewski on 2015-09-15

fix for sso-login dialog

=== modified file 'checkbox-touch/sso-login.qml'
--- checkbox-touch/sso-login.qml	2015-09-30 06:19:15 +0000
+++ checkbox-touch/sso-login.qml	2015-09-30 06:19:16 +0000
@@ -37,6 +37,7 @@
     property alias dialogComponent: component
 
     property string prompt: ""
+    property string cachedEmailAddress: ""
 
     property bool needOtp: false
 
@@ -52,6 +53,12 @@
             addImportPath(Qt.resolvedUrl('.'));
             py.importModule("sso_login", function() {
                 console.info("Successfully loaded sso login library.")
+
+                // prepopulate email address
+                py.call('sso_login.get_email_address_from_cache', [], function(response) {
+                    cachedEmailAddress = response;
+                });
+                initiated();
             }, function() {
                 console.error("Unable to load sso login library!")
             });
@@ -125,6 +132,7 @@
             TextField {
                 id: emailBox
                 placeholderText: i18n.tr("email address")
+                text: cachedEmailAddress
                 visible: !otpBox.visible
                 enabled: !dlgloading
                 Keys.onTabPressed: passwordBox.forceActiveFocus();

=== modified file 'checkbox-touch/sso_login.py'
--- checkbox-touch/sso_login.py	2015-09-30 06:19:15 +0000
+++ checkbox-touch/sso_login.py	2015-09-30 06:19:16 +0000
@@ -16,13 +16,18 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
+import configparser
 import json
+import logging
 import os
 import requests
 
 from plainbox.impl.transport import TransportError
 
 
+logger = logging.getLogger('checkbox.touch.sso_login')
+
+
 class TwoFactorRequiredError(RuntimeError):
     """Second factor authentication required."""
 
@@ -109,6 +114,12 @@
     except Exception as e:
         return dict(code=500, message=str(e))
 
+    try:
+        logger.info('Caching email address.')
+        cache_user_email_address(email)
+    except Exception as e:
+        logger.error('Failed to cache email address', str(e))
+
     return dict(
         code=200,
         message='Successfully authenticated.',
@@ -144,3 +155,63 @@
         return '\n'.join(reason_strings)
     else:
         return unknown_error_msg
+
+
+def cache_user_email_address(email_address):
+    """Writes email address to file."""
+    parser = configparser.ConfigParser()
+    parser.read(_get_email_storage_cache_file())
+    with open(_get_email_storage_cache_file(), 'w') as f:
+        if 'user_details' in parser.sections():
+            parser['user_details']['email'] = email_address
+        else:
+            parser['user_details'] = dict(email=email_address)
+        parser.write(f)
+
+
+def get_email_address_from_cache():
+    """Return email that has been cached.
+
+    Returns '' (empty string) if no email has been cached.
+    """
+    parser = configparser.ConfigParser()
+    parser.read(_get_email_storage_cache_file())
+    try:
+        return parser['user_details']['email']
+    except KeyError:
+        return ''
+
+
+def _get_email_storage_cache_file():
+    return os.path.join(_get_app_cache_directory(), 'sso-login.cache')
+
+
+def _get_app_cache_directory():
+    # Based from checkbox_touch.py
+    xdg_cache_home = os.environ.get(
+        'XDG_CACHE_HOME',
+        os.path.expanduser('~/.cache')
+    )
+    try:
+        app_id = os.environ['APP_ID']
+        # Applications will always have write access to directories they
+        # own as determined by the XDG base directory specification.
+        # Specifically: XDG_CACHE_HOME/<APP_PKGNAME>
+        #               XDG_RUNTIME_DIR/<APP_PKGNAME>
+        #               XDG_RUNTIME_DIR/confined/<APP_PKGNAME> (for TMPDIR)
+        #               XDG_DATA_HOME/<APP_PKGNAME>
+        #               XDG_CONFIG_HOME/<APP_PKGNAME>
+        # Note that <APP_PKGNAME> is not the APP_ID. In order to easily
+        # handle upgrades and sharing data between executables in the same
+        # app, we use the unversioned app package name for the writable
+        # directories.
+        return os.path.join(xdg_cache_home, app_id.split('_')[0])
+    except KeyError:
+        path = os.path.join(xdg_cache_home, "com.ubuntu.checkbox")
+        if not os.path.exists(path):
+            os.makedirs(path)
+        elif not os.path.isdir(path):
+            # as unlikely as it is, situation where path exists and is a
+            # regular file neeeds to be signalled
+            raise IOError("{} exists and is not a directory".format(path))
+        return path