diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2016-04-30 15:46:29 -0300 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2016-05-19 14:00:44 +0200 |
| commit | 63783954559c3dcbe1cbebcc8b6aaf84bfaedaa2 (patch) | |
| tree | 1e0cbc82ebee9600e7cc072262b6256e27cc76c2 | |
| parent | bb1ef7b042347d069b6edb3b01fada27aab90ea1 (diff) | |
[feat] use netloc instead of an extra api_uri in Discovery
| -rw-r--r-- | src/leap/bonafide/config.py | 2 | ||||
| -rw-r--r-- | src/leap/bonafide/provider.py | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/leap/bonafide/config.py b/src/leap/bonafide/config.py index 8c34bc1..9da0557 100644 --- a/src/leap/bonafide/config.py +++ b/src/leap/bonafide/config.py @@ -452,7 +452,7 @@ class Provider(object): api_uri = self._provider_config.api_uri if api_uri: parsed = urlparse(api_uri) - self._disco.api_uri = parsed.netloc + self._disco.netloc = parsed.netloc def _get_config_for_all_services(self, session): services_dict = self._load_provider_configs() diff --git a/src/leap/bonafide/provider.py b/src/leap/bonafide/provider.py index 82824e9..b44dae2 100644 --- a/src/leap/bonafide/provider.py +++ b/src/leap/bonafide/provider.py @@ -160,19 +160,8 @@ class Discovery(BaseProvider): 'configs': ('1/configs.json', 'GET'), } - api_uri = None - api_port = None - def _get_base_url(self): - if self.api_uri: - base = self.api_uri - else: - base = self.netloc - - uri = "https://{0}".format(base) - if self.api_port: - uri = uri + ':%s' % self.api_port - return uri + return "https://{0}".format(self.netloc) def get_base_uri(self): return self._get_base_url() |