From 76df59e41d971a030f3630db96c732efe2577f91 Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Fri, 11 Mar 2016 13:14:34 +0100 Subject: [bug] Check if the account is enabled - Resolves: #7961 --- changes/next-changelog.txt | 1 + src/leap/mx/couchdbhelper.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/changes/next-changelog.txt b/changes/next-changelog.txt index 0e3da74..f34adbd 100644 --- a/changes/next-changelog.txt +++ b/changes/next-changelog.txt @@ -18,6 +18,7 @@ Features Bugfixes ~~~~~~~~ - `#7253 `_: Use the original message for encryption. +- `#7961 `_: Check if the account is enabled. - `#1235 `_: Description for the fixed stuff corresponding with issue #1235. - Bugfix without related issue number. diff --git a/src/leap/mx/couchdbhelper.py b/src/leap/mx/couchdbhelper.py index de133d5..e9cf4a4 100644 --- a/src/leap/mx/couchdbhelper.py +++ b/src/leap/mx/couchdbhelper.py @@ -100,9 +100,10 @@ class ConnectedCouchDB(client.CouchDB): pubkey = None if result["rows"]: doc = result["rows"][0]["doc"] - uuid = doc["user_id"] - if "keys" in doc: - pubkey = doc["keys"]["pgp"] + if doc["enabled"]: + uuid = doc["user_id"] + if "keys" in doc: + pubkey = doc["keys"]["pgp"] return uuid, pubkey d.addCallback(_get_uuid_and_pubkey_cbk) -- cgit v1.2.3