From 00a9de84771b27e62515ce6d878d182c8f053de5 Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Tue, 18 Jul 2017 19:15:38 +0200 Subject: [feat] remove active user from get_token We need to update the UI to use the new API. - Resolves: #8974 --- src/leap/bitmask/core/mail_services.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/leap/bitmask/core/mail_services.py') diff --git a/src/leap/bitmask/core/mail_services.py b/src/leap/bitmask/core/mail_services.py index be84b3cf..043f8487 100644 --- a/src/leap/bitmask/core/mail_services.py +++ b/src/leap/bitmask/core/mail_services.py @@ -475,7 +475,6 @@ class StandardMailService(service.MultiService, HookableService): self._keymanager_sessions = {} self._sendmail_opts = {} self._service_tokens = {} - self._active_user = None self._mixnet_enabled = mixnet_enabled super(StandardMailService, self).__init__() self.initializeChildrenServices() @@ -508,7 +507,6 @@ class StandardMailService(service.MultiService, HookableService): def registerToken(token): self._service_tokens[userid] = token - self._active_user = userid return token incoming = self.getServiceNamed('incoming_mail') @@ -612,12 +610,9 @@ class StandardMailService(service.MultiService, HookableService): status = 'ok' return {'status': status} - def get_token(self): - active_user = self._active_user - if not active_user: - return defer.succeed({'user': None}) - token = self._service_tokens.get(active_user) - return defer.succeed({'user': active_user, 'token': token}) + def get_token(self, userid): + token = self._service_tokens.get(userid) + return {'user': userid, 'token': token} # access to containers -- cgit v1.2.3