diff options
author | Bruno Wagner <bwgpro@gmail.com> | 2015-04-23 19:35:43 -0300 |
---|---|---|
committer | Bruno Wagner <bwgpro@gmail.com> | 2015-04-23 19:35:43 -0300 |
commit | a473d3b0032495ecc697643a15af7c918b4be752 (patch) | |
tree | 7f36d6791449c8dd339b6947300dc7bb61a9d178 /service/pixelated/bitmask_libraries/nicknym.py | |
parent | d7968a5feb8d556f40f77274da32921e83465d9e (diff) |
Changes to streamline the session creation and authenticate with the external srp leap library
Diffstat (limited to 'service/pixelated/bitmask_libraries/nicknym.py')
-rw-r--r-- | service/pixelated/bitmask_libraries/nicknym.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/service/pixelated/bitmask_libraries/nicknym.py b/service/pixelated/bitmask_libraries/nicknym.py index ef846bba..bee90897 100644 --- a/service/pixelated/bitmask_libraries/nicknym.py +++ b/service/pixelated/bitmask_libraries/nicknym.py @@ -18,14 +18,14 @@ from .certs import which_api_CA_bundle class NickNym(object): - def __init__(self, provider, config, soledad_session, srp_session): + def __init__(self, provider, config, soledad_session, username, token, uuid): nicknym_url = _discover_nicknym_server(provider) - self._email = '%s@%s' % (srp_session.user_name, provider.domain) - self.keymanager = KeyManager('%s@%s' % (srp_session.user_name, provider.domain), nicknym_url, + self._email = '%s@%s' % (username, provider.domain) + self.keymanager = KeyManager('%s@%s' % (username, provider.domain), nicknym_url, soledad_session.soledad, - srp_session.token, which_api_CA_bundle(provider), provider.api_uri, + token, which_api_CA_bundle(provider), provider.api_uri, provider.api_version, - srp_session.uuid, config.gpg_binary) + uuid, config.gpg_binary) def generate_openpgp_key(self): if not self._key_exists(self._email): |