Merge lp:~veebers/ubuntu-community-testing/fixing-email-address-handling into lp:ubuntu-community-testing

[Christopher Lee]

Add email address handling

This got lost along the way somewhere, adding email address details.

=== modified file 'tools/upload_results.py'
--- tools/upload_results.py	2015-08-14 04:45:18 +0000
+++ tools/upload_results.py	2015-08-18 00:48:36 +0000
@@ -150,10 +150,11 @@
         print('ERROR: Invalid credentials')
 
     headers = get_oauth_signed_request(url, oauth_creds)
+    form_data = dict(uploader_email=email)
 
     print('Uploading file to service.')
     with open(file_path, 'rb') as f:
         upload_data = dict(data=f)
         # Right, now we can post the details.
-        requests.post(url, files=upload_data, headers=headers)
+        requests.post(url, files=upload_data, data=form_data, headers=headers)
         print('Upload succeeded')
 
=== modified file 'ubuntu_pt_community/api/v1.py'
--- ubuntu_pt_community/api/v1.py	2015-08-17 10:00:50 +0000
+++ ubuntu_pt_community/api/v1.py	2015-08-18 00:48:36 +0000
@@ -70,15 +70,10 @@
 
 
 def store_upload_details(request, json_data):
-    user_details = get_user_details_from_header(request)
-
-    try:
-        email_address = user_details['email']
-    except KeyError:
-        logger.error(
-            'Attempted to store details for results with no user details'
-        )
-        return
+    # If email address is None, should we continue to store the data?
+    email_address = get_user_email_address(request)
+    if email_address is None:
+        logger.warning('Storing results against no email address.')
 
     details = dict(
         user_email=email_address,
@@ -110,6 +105,9 @@
     return db.get_collection(database_name, collection_name)
 
 
-def get_user_details_from_header(request):
-    # STUB
-    return dict(email='[e-mail]')
+def get_user_email_address(request):
+    try:
+        return request.form['uploader_email']
+    except KeyError:
+        logger.error('Unable to extract email address from header.')
+        return None