diff --git a/routes/feeds.js b/routes/feeds.js index 848808f..c4dca3f 100644 --- a/routes/feeds.js +++ b/routes/feeds.js @@ -1,9 +1,9 @@ 'use strict'; -var cache = require('apicache').middleware; +var cache = require('apicache').middleware; var Promise = require('bluebird'); var twitter = require('../services/twitter'); -var github = require('../services/github'); +var github = require('../services/github'); module.exports = function (app) { /* diff --git a/routes/invite.js b/routes/invite.js index 612b7f4..bedd745 100644 --- a/routes/invite.js +++ b/routes/invite.js @@ -1,8 +1,8 @@ 'use strict'; var validator = require('validator'); -var slack = require('../services/slack'); -var github = require('../services/github'); +var slack = require('../services/slack'); +var github = require('../services/github'); module.exports = function (app) { /* diff --git a/routes/members.js b/routes/members.js index d5fedf1..4a99eda 100644 --- a/routes/members.js +++ b/routes/members.js @@ -8,7 +8,6 @@ module.exports = function (app) { * GET /members * Endpoint for fetching GitHub org public members */ - app.get('/members', cache('3 hours'), function(req, res, next) { github.getMembers().then(function(data) { res.status(200).send(data); @@ -21,7 +20,6 @@ module.exports = function (app) { * Post /members * Endpoint for getting an invite to GitHub organization */ - app.post('/members', function(req, res, next) { if(!req.body.username) { return res.status(400).send('invalid_username'); diff --git a/routes/membership.js b/routes/membership.js index 99b2035..05740b5 100644 --- a/routes/membership.js +++ b/routes/membership.js @@ -1,9 +1,9 @@ 'use strict'; var Promise = require('bluebird'); -var slack = require('../services/slack'); -var config = require('../lib/config'); -var stripe = require('stripe')(config.stripe.secretKey); +var slack = require('../services/slack'); +var config = require('../lib/config'); +var stripe = require('stripe')(config.stripe.secretKey); module.exports = function (app) { /* @@ -21,12 +21,39 @@ module.exports = function (app) { console.log(JSON.stringify(err, null, 2)); var message = 'Membership payment FAILED for: ```' + JSON.stringify(req.body) + '``` Reason: ```' + err + '```'; + console.log(message); slack.createMessage(message); res.status(500).send({message: 'payment_error'}); return; } else { var message = 'Membership payment SUCCESS for: ```' + JSON.stringify(req.body) + '```'; + console.log(message); + slack.createMessage(message); + res.status(200).send({message: 'payment_success'}); + } + }); + }); + + app.post('/membership', function(req, res, next) { + stripe.charges.create({ + amount: 1000, + currency: 'eur', + card: req.body.stripeToken, + description: `Koodiklinikka jäsenyys henkilölle: ${req.body.name}` + }, function(err, charge) { + if (err) { + console.log(JSON.stringify(err, null, 2)); + + var message = 'Membership payment FAILED for: ```' + JSON.stringify(req.body) + '``` Reason: ```' + err + '```'; + console.log(message); + slack.createMessage(message); + + res.status(500).send({message: 'payment_error'}); + return; + } else { + var message = 'Membership payment SUCCESS for: ```' + JSON.stringify(req.body) + '```'; + console.log(message); slack.createMessage(message); res.status(200).send({message: 'payment_success'}); }