jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

mail: make list API based on list name

Browse Source 
this decouples mail API from groups
This commit is contained in:
Girish Ramakrishnan
2018-04-03 09:34:33 -07:00
parent 678ea50f87
commit 696e864459
4 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/mail.js
+6 -5
View File
@@ -304,9 +304,9 @@ function getLists(req, res, next) {
function getList(req, res, next) {
assert.strictEqual(typeof req.params.domain, 'string');
assert.strictEqual(typeof req.params.groupId, 'string');
assert.strictEqual(typeof req.params.name, 'string');
mail.getList(req.params.domain, req.params.groupId, function (error, result) {
mail.getList(req.params.domain, req.params.name, function (error, result) {
if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
if (error) return next(new HttpError(500, error));
@@ -318,9 +318,10 @@ function addList(req, res, next) {
assert.strictEqual(typeof req.params.domain, 'string');
assert.strictEqual(typeof req.body, 'object');
if (typeof req.body.name !== 'string') return next(new HttpError(400, 'name must be a string'));
if (typeof req.body.groupId !== 'string') return next(new HttpError(400, 'groupId must be a string'));
mail.addList(req.params.domain, req.body.groupId, function (error) {
mail.addList(req.params.domain, req.body.name, req.body.groupId, function (error) {
if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
if (error && error.reason === MailError.ALREADY_EXISTS) return next(new HttpError(409, 'list already exists'));
if (error) return next(new HttpError(500, error));
@@ -331,9 +332,9 @@ function addList(req, res, next) {
function removeList(req, res, next) {
assert.strictEqual(typeof req.params.domain, 'string');
assert.strictEqual(typeof req.params.groupId, 'string');
assert.strictEqual(typeof req.params.name, 'string');
mail.removeList(req.params.domain, req.params.groupId, function (error) {
mail.removeList(req.params.domain, req.params.name, function (error) {
if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
if (error) return next(new HttpError(500, error));
src/routes/test/mail-test.js
+9 -9
View File
@@ -27,7 +27,7 @@ const DOMAIN_0 = {
tlsConfig: { provider: 'fallback' }
};
var USERNAME = 'superadmin', PASSWORD = 'Foobar?1337', EMAIL ='silly@me.com';
const GROUP_NAME = 'maillistgroup';
const GROUP_NAME = 'maillistgroup', LIST_NAME = 'devs';
var token = null;
var userId = '';
var groupObject = null;
@@ -936,7 +936,7 @@ describe('Mail API', function () {
it('add fails with non-existing groupId', function (done) {
superagent.post(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/lists')
.send({ groupId: 'doesnotexist' })
.send({ name: LIST_NAME, groupId: 'doesnotexist' })
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(404);
@@ -946,7 +946,7 @@ describe('Mail API', function () {
it('add succeeds', function (done) {
superagent.post(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/lists')
.send({ groupId: groupObject.id })
.send({ name: LIST_NAME, groupId: groupObject.id })
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(201);
@@ -956,7 +956,7 @@ describe('Mail API', function () {
it('add twice fails', function (done) {
superagent.post(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/lists')
.send({ groupId: groupObject.id })
.send({ name: LIST_NAME, groupId: groupObject.id })
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(409);
@@ -974,12 +974,12 @@ describe('Mail API', function () {
});
it('get succeeds', function (done) {
superagent.get(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/lists/' + groupObject.id)
superagent.get(SERVER_URL + `/api/v1/mail/${DOMAIN_0.domain}/lists/${LIST_NAME}`)
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(200);
expect(res.body.list).to.be.an('object');
expect(res.body.list.name).to.equal(GROUP_NAME);
expect(res.body.list.name).to.equal(LIST_NAME);
expect(res.body.list.ownerId).to.equal(groupObject.id);
expect(res.body.list.ownerType).to.equal('group');
expect(res.body.list.aliasTarget).to.equal(null);
@@ -996,7 +996,7 @@ describe('Mail API', function () {
expect(res.statusCode).to.equal(200);
expect(res.body.lists).to.be.an(Array);
expect(res.body.lists.length).to.equal(1);
expect(res.body.lists[0].name).to.equal(GROUP_NAME);
expect(res.body.lists[0].name).to.equal(LIST_NAME);
expect(res.body.lists[0].ownerId).to.equal(groupObject.id);
expect(res.body.lists[0].ownerType).to.equal('group');
expect(res.body.lists[0].aliasTarget).to.equal(null);
@@ -1015,12 +1015,12 @@ describe('Mail API', function () {
});
it('del succeeds', function (done) {
superagent.del(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/lists/' + groupObject.id)
superagent.del(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/lists/' + LIST_NAME)
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(204);
superagent.get(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/lists/' + groupObject.id)
superagent.get(SERVER_URL + '/api/v1/mail/' + DOMAIN_0.domain + '/lists/' + LIST_NAME)
.query({ access_token: token })
.end(function (err, res) {
expect(res.statusCode).to.equal(404);