Adding getUserId to return the full whoAmI json

labkeyInterface.py

@@ -153,11 +153,14 @@ class labkeyInterface:
 
     def getUserId(self):
         url=self.GetLabkeyUrl()+'/login/whoAmI.view'
-        response=self.get(url)
-        self.cookie=response.getheader('Set-Cookie')
-        encoding=chardet.detect(response.data)['encoding']
-        jsonData=json.loads(response.data.decode(encoding))
-        return jsonData["id"]
+        try:
+            response=self.get(url)
+            self.cookie=response.getheader('Set-Cookie')
+            encoding=chardet.detect(response.data)['encoding']
+            jsonData=json.loads(response.data.decode(encoding))
+            return jsonData
+        except AttributeError:
+            return None