From dcd2d0df0c9588609ce0be100a8f578934a28bd2 Mon Sep 17 00:00:00 2001
From: Tankred Hase <mail@tankredhase.de>
Date: Sat, 28 May 2016 10:49:26 +0200
Subject: [PATCH] Cleanup

---
 src/ctrl/public-key.js | 6 +++---
 src/worker.js          | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ctrl/public-key.js b/src/ctrl/public-key.js
index 497415a..89cdef5 100644
--- a/src/ctrl/public-key.js
+++ b/src/ctrl/public-key.js
@@ -72,6 +72,7 @@ class PublicKey {
     }
     // persist new user ids
     let userIds = yield this._userid.batch(params);
+    // send mails to verify user ids (send only one if primary email is provided)
     yield this._email.sendVerification({ userIds, primaryEmail:options.primaryEmail });
   }
 
@@ -115,11 +116,10 @@ class PublicKey {
       keyid: keyid ? keyid.toUpperCase() : undefined,
       userIds: email ? [{ email:email.toLowerCase() }] : undefined
     });
-    if (verified) {
-      return yield this._mongo.get({ _id:verified.keyid }, DB_TYPE);
-    } else {
+    if (!verified) {
       throw util.error(404, 'Key not found');
     }
+    return yield this._mongo.get({ _id:verified.keyid }, DB_TYPE);
   }
 
   flagForRemove() {
diff --git a/src/worker.js b/src/worker.js
index 93a7215..1621b47 100644
--- a/src/worker.js
+++ b/src/worker.js
@@ -49,18 +49,18 @@ router.get('/pks/lookup', function *() { // ?op=get&search=0x1234567890123456
 router.post('/api/v1/key', function *() { // { publicKeyArmored, primaryEmail } hint the primary email address
   yield rest.create(this);
 });
-router.get('/api/v1/key', function *() { // ?id=keyid OR ?email=email
+router.get('/api/v1/key', function *() { // ?keyid=keyid OR ?email=email
   yield rest.read(this);
 });
-router.del('/api/v1/key', function *() { // ?id=keyid OR ?email=email
+router.del('/api/v1/key', function *() { // ?keyid=keyid OR ?email=email
   yield rest.remove(this);
 });
 
 // links for verification and sharing
-router.get('/api/v1/verify', function *() { // ?id=keyid&nonce=nonce
+router.get('/api/v1/verify', function *() { // ?keyid=keyid&nonce=nonce
   yield rest.verify(this);
 });
-router.get('/api/v1/verifyRemove', function *() { // ?id=keyid&nonce=nonce
+router.get('/api/v1/verifyRemove', function *() { // ?keyid=keyid&nonce=nonce
   yield rest.verifyRemove(this);
 });
 router.get('/:email', function *() { // shorthand link for sharing