diff options
| author | Kali Kaneko <kali@leap.se> | 2016-04-14 19:26:21 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-04-14 19:26:21 -0400 |
| commit | 1338cf1757ac1f3a4f44d8eb0bd7e3a57f92d5c8 (patch) | |
| tree | 18649a8ce1c300cc10fb4432c40e0a5931015431 /src/leap/mx/couchdbhelper.py | |
| parent | 17830e5fee742dacc021aaf1adc23634f615b047 (diff) | |
| parent | db3b1369ce12efea2c3d06d0671bfa655ef49571 (diff) | |
Merge branch 'develop' into debian/platform-0.8
Diffstat (limited to 'src/leap/mx/couchdbhelper.py')
| -rw-r--r-- | src/leap/mx/couchdbhelper.py | 7 |
1 files changed, 4 insertions, 3 deletions
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) |