Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ const getBaseUrl = () => {
case 'staging':
return 'https://staging.suppressionlist.com';
case 'development':
return 'http://suppressionlist.test';
return 'https://development.suppressionlist.com';
default:
return 'https://app.suppressionlist.com';
}
Expand Down
50 changes: 35 additions & 15 deletions lib/ui/api/lists.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
const { Router } = require('express');
const Client = require('suppressionlist');
const request = require('request');
const helpers = require('../../helper');

module.exports =
new Router()
.use((req, res, next) => {
res.locals.client = new Client(req.query.apiKey, process.env.NODE_ENV);
next();
})
.get('/', (req, res, next) => {
const client = res.locals.client;
client.getLists((err, lists) => {
const opts = {
url: `${helpers.getBaseUrl()}/lists`,
headers: helpers.getRequestHeaders({ activeprospect: { api_key: req.query.apiKey }}),
json: true
};
request.get(opts, (err, res, body) => {
if (err) {
if (err.statusCode) { return res.status(err.statusCode).send({ error: err.message, reason: err.body }); } else { return next(err); }
}
res.status(200).send(lists);
res.status(200).send(body);
});

// Mocked responses for local development
Expand All @@ -24,15 +25,34 @@ module.exports =
// res.status(401).send({message: 'HTTP Basic: Access denied'});
})
.post('/ensure', (req, res, next) => {
const client = res.locals.client;
const name = req.body.name;
const ttl = null; // Send null to create lists with default, indefinite retention policy
client.ensureList(name, ttl, (err, list) => {
const getOpts = {
url: `${helpers.getBaseUrl()}/lists`,
headers: helpers.getRequestHeaders({ activeprospect: { api_key: req.query.apiKey }}),
json: true
};
request.get(getOpts, (err, res, body) => {
if (err) {
if (err.statusCode) { res.status(err.statusCode).send({ error: err.message, reason: err.body }); } else { next(err); }
return;
if (err.statusCode) { return res.status(err.statusCode).send({ error: err.message, reason: err.body }); } else { return next(err); }
}
const name = req.body.name;
const list = body.find((list) => { return list.name && list.name.toLowerCase() === name.toLowerCase(); });
if (!list) {
const createOpts = {
url: `${helpers.getBaseUrl()}/lists`,
headers: helpers.getRequestHeaders({ activeprospect: { api_key: req.query.apiKey }}),
body: {
name,
ttl: null
},
json: true
};
request.post(createOpts, (err, res, body) => {
if (err) {
if (err.statusCode) { res.status(err.statusCode).send({ error: err.message, reason: err.body }); } else { next(err); }
}
res.status(200).send(body);
});
}
res.status(200).send(list);
});

// The line below mocks a suppression list api response and can be uncommented for local development. -- BS, 10/17/18
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
"leadconduit-integration-ui": "^1.0.0",
"lodash": "^4.17.11",
"request": "^2.88.0",
"simple-angular-pagination": "^0.0.3",
"suppressionlist": "^0.1.1"
"simple-angular-pagination": "^0.0.3"
},
"devDependencies": {
"@activeprospect/integration-dev-dependencies": "^1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion test/helper_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ describe('Helper', () => {

it('should get development url', () => {
process.env.NODE_ENV = 'development';
assert.equal(helper.getBaseUrl(), 'http://suppressionlist.test');
assert.equal(helper.getBaseUrl(), 'https://development.suppressionlist.com');
});

it('should use the production url when process.env.NODE_ENV is undefined', () => {
Expand Down