clean up logic for removing creds on delete user

lib/services/credentials/credential.dao.js

@@ -145,20 +145,47 @@ dao.removeCredential = function (id, type) {
   return db.del(buildIdKey(type, id));
 };
 
+/*
+ * Remove all credentials
+ *
+ * @id {String}
+ */
 dao.removeAllCredentials = function (id) {
   const dbTransaction = db.multi();
   const credentialTypes = Object.keys(config.models.credentials.properties);
-  const awaitAllPromises = [];
-  credentialTypes.forEach((type) => {
+  const awaitAllPromises = credentialTypes.map(async type => {
+    const authKey = buildIdKey(type, id);
+
     if (type === 'key-auth') {
       // id in this call is actually consumerId, so we need to get all referenced keyIds
-      awaitAllPromises.push(db.smembers(buildIdKey(type, id)).then(ids => {
-        ids.map(keyId => {
-          dbTransaction.del(buildIdKey(type, keyId));
-        });
-      }));
+      // This returns a list of all keys the user owns
+      const ids = await db.smembers(authKey);
+
+      // Get all the scope so we can remove key from them
+      const scopes = await dao.getAllScopes();
+
+      // Delete each key and remove key from scopes if they exist
+      const promises = [];
+      ids.forEach(keyId => {
+        const idKey = buildIdKey(type, keyId);
+
+        // Delete key
+        promises.push(dbTransaction.del(idKey));
+
+        // Delete key from all scopes
+        if (scopes) {
+          scopes.forEach(scope => {
+            promises.push(dbTransaction.hdel(buildScopeKey(scope), idKey));
+          });
+        }
+      });
+
+      // Now delete the main key for the user that lists all creds
+      promises.push(dbTransaction.del(authKey));
+
+      return Promise.all(promises);
     } else {
-      dbTransaction.del(buildIdKey(type, id));
+      return dbTransaction.del(authKey);
     }
   });