From 2a5c8fd4575af9f19db56e4603a8c221020711fd Mon Sep 17 00:00:00 2001 From: Jefferson Stachelski Date: Fri, 6 Nov 2015 13:33:47 -0200 Subject: Refactor - Removed class SoledadSession The SoledadSession class was removed and some methods implemented there was moved to LeapSessionFactory and LeapProvider --- service/pixelated/bitmask_libraries/provider.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'service/pixelated/bitmask_libraries/provider.py') diff --git a/service/pixelated/bitmask_libraries/provider.py b/service/pixelated/bitmask_libraries/provider.py index a529208d..75dcd3ae 100644 --- a/service/pixelated/bitmask_libraries/provider.py +++ b/service/pixelated/bitmask_libraries/provider.py @@ -20,6 +20,7 @@ from leap.common.certs import get_digest import requests from .certs import LeapCertificate from pixelated.support.tls_adapter import EnforceTLSv1Adapter +from pixelated.bitmask_libraries.soledad import SoledadDiscoverException class LeapProvider(object): @@ -138,3 +139,16 @@ class LeapProvider(object): def address_for(self, username): return '%s@%s' % (username, self.domain) + + def discover_soledad_server(self, user_uuid): + try: + json_data = self.fetch_soledad_json() + + hosts = json_data['hosts'] + host = hosts.keys()[0] + server_url = 'https://%s:%d/user-%s' % \ + (hosts[host]['hostname'], hosts[host]['port'], + user_uuid) + return server_url + except Exception, e: + raise SoledadDiscoverException(e) -- cgit v1.2.3