summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/backend
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-04-07 09:56:36 -0400
committerKali Kaneko <kali@leap.se>2016-04-07 11:19:59 -0400
commit3340e1a898bacdd05fb6e6bf8d37596f7aff81a2 (patch)
tree77f9fa3b041245fc14bce33c4201a183ce05dee5 /src/leap/bitmask/backend
parent42e4458f3f37d50725a37a7e22835ab677cc24aa (diff)
[feat] use same token for imap/smtp authentication
This greatly simplifies the handling of the password in the thunderbird extension. - Related: #6041
Diffstat (limited to 'src/leap/bitmask/backend')
-rw-r--r--src/leap/bitmask/backend/components.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py
index 0c2b3280..f9ad1480 100644
--- a/src/leap/bitmask/backend/components.py
+++ b/src/leap/bitmask/backend/components.py
@@ -806,11 +806,8 @@ class Soledad(object):
(service, token))
sol = self._soledad_bootstrapper.soledad
- d = sol.get_or_create_service_token('imap')
- d.addCallback(register_service_token, 'imap')
- d.addCallback(
- lambda _: sol.get_or_create_service_token('smtp'))
- d.addCallback(register_service_token, 'smtp')
+ d = sol.get_or_create_service_token('mail_auth')
+ d.addCallback(register_service_token, 'mail_auth')
d.addCallback(lambda _: result)
return d