simonvareille/keyserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Write used-id integration tests

Browse Source
This commit is contained in:
Tankred Hase
2016-05-31 11:02:27 +02:00
parent f930ee38e9
commit 2abeb8ece2
4 changed files with 132 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dao/mongo.js
View File

@@ -26,9 +26,9 @@ class Mongo {
/**
* Create an instance of the MongoDB client.
* @param {String} options.uri The mongodb uri
* @param {String} options.user The databse user
* @param {String} options.password The database user's password
* @param {String} uri The mongodb uri
* @param {String} user The databse user
* @param {String} password The database user's password
*/
constructor(options) {
this._uri = 'mongodb://' + options.user + ':' + options.password + '@' + options.uri;

8
src/service/public-key.js
View File

@@ -109,9 +109,9 @@ class PublicKey {
/**
* Fetch a verified public key from the database. Either the key id or the
* email address muss be provided.
* @param {String} options.keyid (optional) The public key id
* @param {String} options.email (optional) The user's email address
* @yield {Object} The public key document
* @param {String} keyid (optional) The public key id
* @param {String} email (optional) The user's email address
* @yield {Object} The public key document
*/
*get(options) {
let keyid = options.keyid, email = options.email;
@@ -135,7 +135,7 @@ class PublicKey {
/**
* Delete a public key document and its corresponding user id documents.
* @param {String} options.keyid The key id
* @param {String} keyid The key id
* @yield {undefined}
*/
*remove(options) {

28
src/service/user-id.js
View File

@@ -47,11 +47,11 @@ class UserId {
}
/**
* Store a list of user ids. There can only be one verified user ID for
* an email address at any given time.
* @param {String} options.keyid The public key id
* @param {Array} options.userIds The userIds to persist
* @yield {Array} A list of user ids with generated nonces
* Generate nonces for verification and store a list of user ids. There
* can only be one verified user ID for an email address at any given time.
* @param {String} keyid The public key id
* @param {Array} userIds The userIds to persist
* @yield {Array} A list of user ids with generated nonces
*/
*batch(options) {
let userIds = options.userIds, keyid = options.keyid;
@@ -73,7 +73,7 @@ class UserId {
* @yield {undefined}
*/
*verify(options) {
let uid = this._mongo.get(options, DB_TYPE);
let uid = yield this._mongo.get(options, DB_TYPE);
if (!uid) {
util.throw(404, 'User id not found');
}
@@ -84,25 +84,21 @@ class UserId {
* Get a verified user IDs either by key id or email address.
* There can only be one verified user ID for an email address
* at any given time.
* @param {String} options.keyid The public key id
* @param {String} options.userIds A list of user ids to check
* @yield {Object} The verified user ID document
* @param {String} keyid The public key id
* @param {String} userIds A list of user ids to check
* @yield {Object} The verified user ID document
*/
*getVerfied(options) {
let keyid = options.keyid, userIds = options.userIds;
if (keyid) {
// try by key id
let uids = yield this._mongo.list({ keyid }, DB_TYPE);
let verified = uids.find(u => u.verified);
let verified = yield this._mongo.get({ keyid, verified:true }, DB_TYPE);
if (verified) {
return verified;
}
}
if (userIds) {
// try by email addresses
for (let uid of userIds) {
let uids = yield this._mongo.list({ email:uid.email }, DB_TYPE);
let verified = uids.find(u => u.verified);
let verified = yield this._mongo.get({ email:uid.email, verified:true }, DB_TYPE);
if (verified) {
return verified;
}
@@ -112,7 +108,7 @@ class UserId {
/**
* Remove all user ids matching a certain query
* @param {String} options.keyid The public key id
* @param {String} keyid The public key id
* @yield {undefined}
*/
*remove(options) {