diff options
| author | Folker Bernitt <fbernitt@thoughtworks.com> | 2014-08-08 18:01:48 +0200 |
|---|---|---|
| committer | Folker Bernitt <fbernitt@thoughtworks.com> | 2014-08-08 18:03:58 +0200 |
| commit | 77b12bda3df10710daf7c441512146170523f003 (patch) | |
| tree | e8332c492d79e8b7482e5a5b560f14213cc8933a /service/app/bitmask_libraries/nicknym.py | |
| parent | d3a31756c17165d4685287868f53265e49762377 (diff) | |
Updated some leap components to latest version.
- Send public key to leap now works
- Fetching mail works with a recent leap provider version
- Added register to LeapAuthenticator to create a new account
Diffstat (limited to 'service/app/bitmask_libraries/nicknym.py')
| -rw-r--r-- | service/app/bitmask_libraries/nicknym.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/service/app/bitmask_libraries/nicknym.py b/service/app/bitmask_libraries/nicknym.py index 8f5f06d1..c4939e9a 100644 --- a/service/app/bitmask_libraries/nicknym.py +++ b/service/app/bitmask_libraries/nicknym.py @@ -8,7 +8,7 @@ class NickNym(object): self._email = '%s@%s' % (srp_session.user_name, provider.domain) self.keymanager = KeyManager('%s@%s' % (srp_session.user_name, provider.domain), nicknym_url, soledad_session.soledad, - srp_session.session_id, which_bundle(provider), provider.api_uri, + srp_session.token, which_bundle(provider), provider.api_uri, provider.api_version, srp_session.uuid, config.gpg_binary) @@ -28,9 +28,6 @@ class NickNym(object): self.keymanager.gen_key(openpgp.OpenPGPKey) def _send_key_to_leap(self): - if True: - raise NotImplementedError( - 'No key sent to leap provider. Reason: leap.keymanager.KeyManager.send_key in latest python module is not compatible with latest LEAP provider') self.keymanager.send_key(openpgp.OpenPGPKey) |