From a43c48cd99fc179512f6e91d9df9f1d16d878e62 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Sun, 14 Nov 2021 01:53:52 -0500 Subject: [PATCH] Flutterwave create transfer & get status implemented --- .../flutterwave-transfer-micro/README.md | 26 ++++- .../api/controller.js | 25 +++-- .../flutterwave-transfer-micro/api/routes.js | 6 +- .../base64decoder.js | 9 ++ .../base64encoder.js | 13 +++ .../package-lock.json | 12 ++- .../flutterwave-transfer-micro/package.json | 10 +- .../flutterwave-transfer-micro/server.js | 6 +- .../service/distance.js | 36 ------- .../service/transfer.js | 98 +++++++++++++++++++ 10 files changed, 186 insertions(+), 55 deletions(-) create mode 100644 microservices/flutterwave-transfer-micro/base64decoder.js create mode 100644 microservices/flutterwave-transfer-micro/base64encoder.js delete mode 100644 microservices/flutterwave-transfer-micro/service/distance.js create mode 100644 microservices/flutterwave-transfer-micro/service/transfer.js diff --git a/microservices/flutterwave-transfer-micro/README.md b/microservices/flutterwave-transfer-micro/README.md index 3f6b06c7..a4c92d49 100644 --- a/microservices/flutterwave-transfer-micro/README.md +++ b/microservices/flutterwave-transfer-micro/README.md @@ -7,17 +7,37 @@ A microservice to handle flitterware payment services * Build the docker image by `docker build -t flutterwave-transfer-micro .` # Run -* Set environment variables like `MONGO_URL` and `RABBITMQ_URL`. Full list in the wiki. -* `docker run -p -e PORT= -e POSTGRE_URL= -i -t flutterwave-transfer-micro` +* Set environment variables like `PORT` and `POSTGRE_URL`. Full list in the wiki. +* `docker run -p -e PORT= -e POSTGRE_URL= -e FLUTTERWAVE_API= -i -t flutterwave-transfer-micro` ## Example configurations * binding: 127.0.0.1:3000:3000/tcp * app_port: 3000 * postgre_url: postgresql://wrenchboard:wrenchboard@10.10.10.23:5432/wrenchboard +* flutterwave_config: eyJCYXNlQXBpVXJsIjoiaHR0cHM6Ly9hcGkuZmx1dHRlcndhdmUuY29tIiwiUHVibGljS2V5IjoiRkxXUFVCS19URVNULTU0YzkwMTQxYjAyODc4OWQ2NzEwNjdiZDcyZjc4MWE5LVgiLCJTZWNyZXRLZXkiOiJGTFdTRUNLX1RFU1QtYzdiYmM4NmQ3ZTcxMDAyNTRjNWU1YmJmMTYyYmYyYjItWCIsIkVuY3J5cHRpb25LZXkiOiJGTFdTRUNLX1RFU1RlOTQ3NGQ0ZTJjZTYifQ== ## Example command -docker run -p 127.0.0.1:3000:3000/tcp -e PORT=3000 -e POSTGRE_URL='postgresql://wrenchboard:wrenchboard@10.10.10.23:5432/wrenchboard' -i -t flutterwave-transfer-micro +``` +docker run -p 127.0.0.1:3000:3000/tcp \ + -e PORT=3000 \ + -e POSTGRE_URL='postgresql://wrenchboard:wrenchboard@10.10.10.23:5432/wrenchboard' \ + -e FLUTTERWAVE_API='eyJCYXNlQXBpVXJsIjoiaHR0cHM6Ly9hcGkuZmx1dHRlcndhdmUuY29tIiwiUHVibGljS2V5IjoiRkxXUFVCS19URVNULTU0YzkwMTQxYjAyODc4OWQ2NzEwNjdiZDcyZjc4MWE5LVgiLCJTZWNyZXRLZXkiOiJGTFdTRUNLX1RFU1QtYzdiYmM4NmQ3ZTcxMDAyNTRjNWU1YmJmMTYyYmYyYjItWCIsIkVuY3J5cHRpb25LZXkiOiJGTFdTRUNLX1RFU1RlOTQ3NGQ0ZTJjZTYifQ==' \ + -i -t flutterwave-transfer-micro +``` + +## Flutterwave config + +Either use a converniece script base64encoder.js or base64 CLI to encode the config: + +``` +echo '{ + "BaseApiUrl":"https://api.flutterwave.com", + "PublicKey":"FLWPUBK_TEST-54c90141b028789d671067bd72f781a9-X", + "SecretKey":"FLWSECK_TEST-c7bbc86d7e7100254c5e5bbf162bf2b2-X", + "EncryptionKey":"FLWSECK_TESTe9474d4e2ce6" +}' | base64 +``` # Test `npm test` diff --git a/microservices/flutterwave-transfer-micro/api/controller.js b/microservices/flutterwave-transfer-micro/api/controller.js index dabb149c..d32c1c96 100644 --- a/microservices/flutterwave-transfer-micro/api/controller.js +++ b/microservices/flutterwave-transfer-micro/api/controller.js @@ -1,7 +1,7 @@ 'use strict'; const properties = require('../package.json') -const distance = require('../service/distance'); +const transfer = require('../service/transfer'); var controllers = { about: function(req, res) { @@ -11,13 +11,22 @@ var controllers = { } res.json(aboutInfo); }, - getDistance: function(req, res) { - distance.find(req, res, function(err, dist) { - if (err) - res.send(err); - res.json(dist); - }); - }, + postTransfer: function(req, res) { + transfer.create(req, res, function(err, dist) { + if (err) { + res.send(err); + } + res.json(dist); + }); + }, + getStatus: function(req, res) { + transfer.get(req, res, function(err, dist) { + if (err) { + res.send(err); + } + res.json(dist); + }); + }, }; module.exports = controllers; diff --git a/microservices/flutterwave-transfer-micro/api/routes.js b/microservices/flutterwave-transfer-micro/api/routes.js index f71998a7..a5b5d63e 100644 --- a/microservices/flutterwave-transfer-micro/api/routes.js +++ b/microservices/flutterwave-transfer-micro/api/routes.js @@ -5,6 +5,8 @@ const controller = require('./controller'); module.exports = function(app) { app.route('/about') .get(controller.about); - app.route('/distance/:zipcode1/:zipcode2') - .get(controller.getDistance); + app.route('/create') + .post(controller.postTransfer); + app.route('/status/:id') + .get(controller.getStatus); }; diff --git a/microservices/flutterwave-transfer-micro/base64decoder.js b/microservices/flutterwave-transfer-micro/base64decoder.js new file mode 100644 index 00000000..a2d2b0cd --- /dev/null +++ b/microservices/flutterwave-transfer-micro/base64decoder.js @@ -0,0 +1,9 @@ +'use strict'; + +let data = 'eyJQdWJsaWNLZXkiOiJGTFdQVUJLX1RFU1QtNTRjOTAxNDFiMDI4Nzg5ZDY3MTA2N2JkNzJmNzgxYTktWCIsIlNlY3JldEtleSI6IkZMV1NFQ0tfVEVTVC1jN2JiYzg2ZDdlNzEwMDI1NGM1ZTViYmYxNjJiZjJiMi1YIiwiRW5jcnlwdGlvbktleSI6IkZMV1NFQ0tfVEVTVGU5NDc0ZDRlMmNlNiJ9'; +let buff = new Buffer(data, 'base64'); +let text = buff.toString('ascii'); +let json = JSON.parse(text); + +console.log('"' + data + '" converted from Base64 to ASCII is "' + text + '"'); +console.log(json); diff --git a/microservices/flutterwave-transfer-micro/base64encoder.js b/microservices/flutterwave-transfer-micro/base64encoder.js new file mode 100644 index 00000000..cecea2e7 --- /dev/null +++ b/microservices/flutterwave-transfer-micro/base64encoder.js @@ -0,0 +1,13 @@ +'use strict'; + +let json = { + "BaseApiUrl":"https://api.flutterwave.com", + "PublicKey":"FLWPUBK_TEST-54c90141b028789d671067bd72f781a9-X", + "SecretKey":"FLWSECK_TEST-c7bbc86d7e7100254c5e5bbf162bf2b2-X", + "EncryptionKey":"FLWSECK_TESTe9474d4e2ce6" +}; +let data = JSON.stringify(json); +let buff = new Buffer(data); +let base64data = buff.toString('base64'); + +console.log('"' + data + '" converted to Base64 is "' + base64data + '"'); diff --git a/microservices/flutterwave-transfer-micro/package-lock.json b/microservices/flutterwave-transfer-micro/package-lock.json index 2ef825a9..6fcc9577 100644 --- a/microservices/flutterwave-transfer-micro/package-lock.json +++ b/microservices/flutterwave-transfer-micro/package-lock.json @@ -1,6 +1,6 @@ { "name": "flutterwave-transfer-micro", - "version": "0.0.1", + "version": "0.0.2", "lockfileVersion": 1, "dependencies": { "@babel/parser": { @@ -172,6 +172,11 @@ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==" }, + "axios": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz", + "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==" + }, "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -952,6 +957,11 @@ "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==", "dev": true }, + "follow-redirects": { + "version": "1.14.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", + "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==" + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", diff --git a/microservices/flutterwave-transfer-micro/package.json b/microservices/flutterwave-transfer-micro/package.json index 1c0adbab..5b1df545 100644 --- a/microservices/flutterwave-transfer-micro/package.json +++ b/microservices/flutterwave-transfer-micro/package.json @@ -1,10 +1,10 @@ { "name": "flutterwave-transfer-micro", - "version": "0.0.1", - "description": "A microservice to handle flitterware payment services", + "version": "0.0.2", + "description": "A microservice to handle flutterware payment services", "main": "server.js", "scripts": { - "generate-docs": "jsdoc ./api/*.js ./api/**/*.js ./service/*.js ./services/**/*.js -d docs", + "generate-docs": "jsdoc ./api/*.js ./api/**/*.js ./app/*.js ./app/**/*.js ./service/*.js ./service/**/*.js -d docs", "lint": "eslint ./ --ext .js", "start": "node server.js", "start:dev": "nodemon server.js", @@ -12,8 +12,10 @@ }, "author": "Anatolii Okhotnikov ", "dependencies": { - "pg": "8.7.1", + "axios": "^0.24.0", + "body-parser": "^1.19.0", "express": "^4.17.1", + "pg": "8.7.1", "request": "^2.88.2", "underscore": "^1.8.3", "winston": "^2.3.1", diff --git a/microservices/flutterwave-transfer-micro/server.js b/microservices/flutterwave-transfer-micro/server.js index e459f0f8..a268f7db 100644 --- a/microservices/flutterwave-transfer-micro/server.js +++ b/microservices/flutterwave-transfer-micro/server.js @@ -1,10 +1,14 @@ -const express = require('express') +const express = require('express'); const logger = require('./app/logger'); const app = express(); const port = process.env.PORT || 3000; +app.use(express.json()); +app.use(express.urlencoded()); + const routes = require('./api/routes'); routes(app); + app.listen(port, function() { logger.info('***** Server started on port: ' + port + ' *****'); }); diff --git a/microservices/flutterwave-transfer-micro/service/distance.js b/microservices/flutterwave-transfer-micro/service/distance.js deleted file mode 100644 index 079fc729..00000000 --- a/microservices/flutterwave-transfer-micro/service/distance.js +++ /dev/null @@ -1,36 +0,0 @@ -const request = require('request'); -const db = require('../app/db') -const logger = require('../app/logger'); - -const apiKey = process.env.ZIPCODE_API_KEY || "x4hw36qerDOdewjz5HIx4IR7XO5wsWVb7jFZTJ9jvCYYIHNhvK4aIpMExKb5gEoW"; -const zipCodeURL = 'https://www.zipcodeapi.com/rest/'; - -var distance = { - find: function(req, res, next) { - var url = zipCodeURL + apiKey - + '/distance.json/' + req.params.zipcode1 + '/' - + req.params.zipcode2 + '/mile'; - logger.info(url); - process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = 0; - request(url, - function (error, response, body) { - if (!error && response.statusCode == 200) { - response = JSON.parse(body); - res.send(response); - } else { - logger.info(error); - res.send({distance: -1}); - } - }); - // Sample DB call - db.query('SELECT NOW()', (err, res) => { - if (err) { - throw err; - } - logger.info('time:', res.rows[0]) - }); - } -}; - -module.exports = distance; - diff --git a/microservices/flutterwave-transfer-micro/service/transfer.js b/microservices/flutterwave-transfer-micro/service/transfer.js new file mode 100644 index 00000000..3b3ac132 --- /dev/null +++ b/microservices/flutterwave-transfer-micro/service/transfer.js @@ -0,0 +1,98 @@ +'use strict'; + +const axios = require('axios'); +const request = require('request'); +const db = require('../app/db') +const logger = require('../app/logger'); + +// https://developer.flutterwave.com/reference/create-a-transfer +const flutterwaveConfigBuffer = new Buffer(process.env.FLUTTERWAVE_API, 'base64'); +const flutterwaveConfig = JSON.parse(flutterwaveConfigBuffer.toString('ascii')); + +var transfer = { + create: function(req, res, next) { + var url = flutterwaveConfig.BaseApiUrl + '/v3/transfers'; + var headersOpt = { + "Content-Type": "application/json", + "Authorization": "Bearer " + flutterwaveConfig.SecretKey, + }; + var data = { + "account_bank": req.body.account_bank, + "account_number": req.body.account_number, + "amount": req.body.amount, + "narration": req.body.narration, + "currency": req.body.currency, + "reference": req.body.reference, + "debit_currency": req.body.debit_currency + }; + var options = { + headers: headersOpt + }; + logger.info(url); + logger.info(options); + logger.info(data); + // https://blog.logrocket.com/5-ways-to-make-http-requests-in-node-js/ + // https://stackoverflow.com/questions/53846709/how-do-i-use-axios-within-expressjs + axios.post(url, data, options) + .then(data => { + res.json(data); + }) + .catch(err => { + logger.error(err.message); + //logger.error(err.stack); + logger.error(err.response.data); + //logger.error(err.response.headers); + res.send({ + status: "failure", + message: "Invalid response", + details: err.message, + code: err.response.status, + data: err.response.data + }); + }); + // TODO: Do we save the response in the DB? I assume: YES + db.query('SELECT NOW()', (err, res) => { + if (err) { + throw err; + } + logger.info('time:', res.rows[0]) + }); + }, + get: function(req, res, next) { + var url = flutterwaveConfig.BaseApiUrl + '/v3/transfers/' + req.params.id; + var headersOpt = { + "Authorization": "Bearer " + flutterwaveConfig.SecretKey, + }; + var options = { + headers: headersOpt + }; + logger.info(url); + axios.get(url, options) + .then(data => { + res.json(data); + }) + .catch(err => { + logger.error(err.message); + //logger.error(err.stack); + logger.error(err.response.data); + //logger.error(err.response.headers); + res.send({ + status: "failure", + message: "Invalid response", + details: err.message, + code: err.response.status, + data: err.response.data + }); + }); + // TODO: Do we save the response in the DB? I assume: YES + db.query('SELECT NOW()', (err, res) => { + if (err) { + throw err; + } + logger.info('time:', res.rows[0]) + }); + } +}; + +module.exports = transfer; +