summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-05-16 13:04:13 +0200
committerRuben Pollan <meskio@sindominio.net>2017-05-16 19:32:25 +0200
commitbee693cd7b92934073d9fdffd6aa38d14e7e251e (patch)
tree3f6f4a07050ad69fd6f4fff7f616d3bf21cc813a
parent0e97513603246d770dafb38e57ac6f15b589984b (diff)
[bug] use correct api uri
Allows to upload a key to providers that use a different api uri than api.provider.net - Resolves: #8868
-rw-r--r--docs/changelog.rst1
-rw-r--r--src/leap/bitmask/core/mail_services.py4
2 files changed, 2 insertions, 3 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 04c43445..d0a426a2 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -25,6 +25,7 @@ Bugfixes
~~~~~~~~
- Repeat decryption if signed with attached key
- `#8783 <https://0xacab.org/leap/bitmask-dev/issues/8783>`_: use username instead of provider in the vpn calls
+- `#8868 <https://0xacab.org/leap/bitmask-dev/issues/8868>`_: can't upload generated key with bitmask
Misc
~~~~
diff --git a/src/leap/bitmask/core/mail_services.py b/src/leap/bitmask/core/mail_services.py
index 4197700b..16b20ed3 100644
--- a/src/leap/bitmask/core/mail_services.py
+++ b/src/leap/bitmask/core/mail_services.py
@@ -346,9 +346,7 @@ class KeymanagerContainer(Container):
return keymanager
def _get_api_uri(self, provider):
- # TODO get this from service.json (use bonafide service)
- api_uri = "https://api.{provider}:4430".format(
- provider=provider)
+ api_uri = config.Provider(provider).api_uri
return api_uri
def _get_nicknym_uri(self, provider):