Changeset 53:ec3de0325406 in stamper

Timestamp:

Nov 8, 2014, 5:29:03 PM (9 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Authenticate the user before actually push the stamps to the server.
Also, cleaned up a bit the http client, no need to pass and store
there the user and password auth credentials.

Location:

stamper

Files:

• http.py (modified) (2 diffs)
• stamper.py (modified) (2 diffs)

stamper/http.py

@@ -1 +1 @@
 
-from urllib2 import Request, urlopen
+from urllib2 import (
+    Request, urlopen, build_opener, install_opener, HTTPCookieProcessor
+    )
 from urllib import urlencode
 from urlparse import urljoin
@@ -7 +9 @@
 class HTTPClient(object):
 
-    def __init__(self, base_url, user=None, password=None):
+    def __init__(self, base_url):
         self.base_url = base_url
-        self.user = user
-        self.password = password
-
-    def authenticate(self):
-        return 'not ready yet'
+        self.request = build_opener(HTTPCookieProcessor())
+        install_opener(self.request)
 
     def send_request(self, url, data=None):
-        request = Request(url, data)
-        response = urlopen(request)
+        response = self.request.open(url, data)
         return response.read()
 

stamper/stamper.py

@@ -20 +20 @@
 SECS_DAY = HOURS_DAY * 60 * 60
 REMOTE_BASE_URL = 'https://localhost'
-REMOTE_PUSH_URL = '/stamper/listen/'  # IMPORTANT: keep the trailing /
+# IMPORTANT: keep the trailing / on these _URL variables
+REMOTE_LOGIN_URL = '/stamper/login/'
+REMOTE_PUSH_URL = '/stamper/listen/'
 REMOTE_USER = None
 REMOTE_PASSWORD = None
@@ -453 +455 @@
                 stamps.append(stamp)
         stamps = json.dumps(stamps, indent=4)
-        http_client = HTTPClient(REMOTE_BASE_URL, REMOTE_USER, REMOTE_PASSWORD)
+        http_client = HTTPClient(REMOTE_BASE_URL)
+        http_client.post(REMOTE_LOGIN_URL, {'username': REMOTE_USER,
+                                            'password': REMOTE_PASSWORD})
         http_client.post(REMOTE_PUSH_URL, {'stamps': stamps})