From 757a9acd09d6c43d8e0313fb476fb416b64eab53 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Tue, 21 Jun 2016 19:04:43 +0200 Subject: [PATCH] now works for most things --- dist/cflare.classes.cflareaccount.js | 17 ++++++++++++-- package.json | 4 ++-- test/test.js | 35 +++++++++++++++++++++------- test/test.ts | 28 +++++++++++++++++----- ts/cflare.classes.cflareaccount.ts | 14 +++++++++-- 5 files changed, 77 insertions(+), 21 deletions(-) diff --git a/dist/cflare.classes.cflareaccount.js b/dist/cflare.classes.cflareaccount.js index 9751610..92ebc1c 100644 --- a/dist/cflare.classes.cflareaccount.js +++ b/dist/cflare.classes.cflareaccount.js @@ -37,6 +37,7 @@ var CflareAccount = (function () { var filteredResponse = responseArg.result.filter(function (recordArg) { return (recordArg.type == typeArg && recordArg.name == domainNameArg); }); + done.resolve(filteredResponse[0]); }); return done.promise; }; @@ -61,10 +62,21 @@ var CflareAccount = (function () { }; ; CflareAccount.prototype.removeRecord = function (domainNameArg, typeArg) { + var _this = this; var done = plugins.q.defer(); var domain = new plugins.smartstring.Domain(domainNameArg); - this.getRecord(domain.zoneName, typeArg) + this.getRecord(domain.fullName, typeArg) .then(function (responseArg) { + if (responseArg) { + var requestRoute = "/zones/" + responseArg.zone_id + "/dns_records/" + responseArg.id; + _this.request("DELETE", requestRoute) + .then(function (responseArg) { + done.resolve(responseArg); + }); + } + else { + done.reject(); + } }); return done.promise; }; @@ -116,6 +128,7 @@ var CflareAccount = (function () { }, body: jsonArg }; + //console.log(options); plugins.request(options, function (err, res, body) { if (!err && res.statusCode == 200) { var responseObj = JSON.parse(body); @@ -135,4 +148,4 @@ var CflareAccount = (function () { exports.CflareAccount = CflareAccount; ; -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["cflare.classes.cflareaccount.ts"],"names":[],"mappings":"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","file":"cflare.classes.cflareaccount.js","sourcesContent":["import \"typings-global\";\nimport plugins = require(\"./cflare.plugins\");\nimport helpers = require(\"./cflare.classes.helpers\");\n\nexport class CflareAccount {\n    private authEmail:string;\n    private authKey:string;\n    private authCheck(){\n        return (this.authEmail && this.authKey); //check if auth is available\n    }\n    constructor(){\n        \n    };\n    auth(optionsArg:{email:string,key:string}){\n        this.authEmail = optionsArg.email;\n        this.authKey = optionsArg.key;       \n    }\n    getZoneId(domainName:string){\n        let done = plugins.q.defer();\n        this.listZones(domainName)\n            .then((responseArg) => {\n                let filteredResponse = responseArg.result.filter((zoneArg)=>{\n                    return zoneArg.name === domainName;\n                });\n                if (filteredResponse.length >= 1){\n                    done.resolve(filteredResponse[0].id);\n                } else {\n                    plugins.beautylog.error(\"the domain \" + domainName.blue + \" does not appear to be in this account!\");\n                    done.reject(undefined);\n                }\n            });\n        return done.promise;\n    }\n    getRecord(domainNameArg:string,typeArg:string){\n        let done = plugins.q.defer();\n        let domain = new plugins.smartstring.Domain(domainNameArg);\n        this.listRecords(domain.zoneName)\n            .then((responseArg) => {\n                let filteredResponse = responseArg.result.filter((recordArg) => {\n                    return (recordArg.type == typeArg && recordArg.name == domainNameArg); \n                })\n            })\n        return done.promise;\n    };\n    createRecord(domainNameArg:string,typeArg:string,contentArg:string){\n        let done = plugins.q.defer();\n        let domain = new plugins.smartstring.Domain(domainNameArg);\n        this.getZoneId(domain.zoneName)\n            .then((domainIdArg)=>{\n                let dataObject = {\n                    name: domain.fullName,\n                    type: typeArg,\n                    content: contentArg\n                };\n                this.request(\"POST\",\"/zones/\" + domainIdArg + \"/dns_records\",dataObject)\n                    .then(function(responseArg){\n                        done.resolve(responseArg);\n                    });\n            });\n        return done.promise;\n    };\n    removeRecord(domainNameArg:string,typeArg:string){\n        let done = plugins.q.defer();\n        let domain = new plugins.smartstring.Domain(domainNameArg);\n        this.getRecord(domain.zoneName,typeArg)\n            .then((responseArg) => {\n                \n            });\n        return done.promise;\n    };\n    updateRecord(domainNameArg:string,typeArg:string,valueArg){\n        let done = plugins.q.defer();\n        let domain = new plugins.smartstring.Domain(domainNameArg);\n        return done.promise;\n    };\n    listRecords(domainNameArg:string){\n        let done = plugins.q.defer();\n        let domain = new plugins.smartstring.Domain(domainNameArg);\n        this.getZoneId(domain.zoneName)\n            .then((domainIdArg)=>{\n                this.request(\"GET\",\"/zones/\" + domainIdArg + \"/dns_records?per_page=100\")\n                    .then(function(responseArg){\n                        done.resolve(responseArg);\n                    });\n            });\n        return done.promise;\n    }\n    listZones(domainName?:string){ // TODO: handle pagination\n        let done = plugins.q.defer();\n        let requestRoute = \"/zones?per_page=50\"\n        if(domainName) requestRoute = requestRoute + \"&name=\" + domainName;\n        let result = {}; \n        this.request(\"GET\",requestRoute)\n            .then(function(responseArg){\n                result = responseArg;\n                done.resolve(result);\n            });\n        return done.promise;\n    };\n    request(methodArg:string,routeArg:string,dataArg = {}){\n        let done = plugins.q.defer();\n        let jsonArg:string = JSON.stringify(dataArg);\n        let options = {\n            method:methodArg,\n            url:\"https://api.cloudflare.com/client/v4\" + routeArg,\n            headers:{\n                \"Content-Type\":\"application/json\",\n                \"X-Auth-Email\":this.authEmail,\n                \"X-Auth-Key\":this.authKey\n            },\n            body:jsonArg\n        };\n        plugins.request(options,function(err, res, body){\n            if (!err && res.statusCode == 200) {\n                var responseObj = JSON.parse(body);\n                done.resolve(responseObj);\n            } else {\n                console.log(err);\n                console.log(res);\n                done.reject(err);\n            };\n        });\n        return done.promise;\n    }\n};"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["cflare.classes.cflareaccount.ts"],"names":[],"mappings":"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","file":"cflare.classes.cflareaccount.js","sourcesContent":["import \"typings-global\";\nimport plugins = require(\"./cflare.plugins\");\nimport helpers = require(\"./cflare.classes.helpers\");\n\nexport class CflareAccount {\n    private authEmail:string;\n    private authKey:string;\n    private authCheck(){\n        return (this.authEmail && this.authKey); //check if auth is available\n    }\n    constructor(){\n        \n    };\n    auth(optionsArg:{email:string,key:string}){\n        this.authEmail = optionsArg.email;\n        this.authKey = optionsArg.key;       \n    }\n    getZoneId(domainName:string){\n        let done = plugins.q.defer();\n        this.listZones(domainName)\n            .then((responseArg) => {\n                let filteredResponse = responseArg.result.filter((zoneArg)=>{\n                    return zoneArg.name === domainName;\n                });\n                if (filteredResponse.length >= 1){\n                    done.resolve(filteredResponse[0].id);\n                } else {\n                    plugins.beautylog.error(\"the domain \" + domainName.blue + \" does not appear to be in this account!\");\n                    done.reject(undefined);\n                }\n            });\n        return done.promise;\n    }\n    getRecord(domainNameArg:string,typeArg:string){\n        let done = plugins.q.defer();\n        let domain = new plugins.smartstring.Domain(domainNameArg);\n        this.listRecords(domain.zoneName)\n            .then((responseArg) => {\n                let filteredResponse = responseArg.result.filter((recordArg) => {\n                    return (recordArg.type == typeArg && recordArg.name == domainNameArg); \n                })\n                done.resolve(filteredResponse[0]);\n            })\n        return done.promise;\n    };\n    createRecord(domainNameArg:string,typeArg:string,contentArg:string){\n        let done = plugins.q.defer();\n        let domain = new plugins.smartstring.Domain(domainNameArg);\n        this.getZoneId(domain.zoneName)\n            .then((domainIdArg)=>{\n                let dataObject = {\n                    name: domain.fullName,\n                    type: typeArg,\n                    content: contentArg\n                };\n                this.request(\"POST\",\"/zones/\" + domainIdArg + \"/dns_records\",dataObject)\n                    .then(function(responseArg){\n                        done.resolve(responseArg);\n                    });\n            });\n        return done.promise;\n    };\n    removeRecord(domainNameArg:string,typeArg:string){\n        let done = plugins.q.defer();\n        let domain = new plugins.smartstring.Domain(domainNameArg);\n        this.getRecord(domain.fullName,typeArg)\n            .then((responseArg) => {\n                if(responseArg){\n                    let requestRoute:string = \"/zones/\" + responseArg.zone_id + \"/dns_records/\" + responseArg.id; \n                    this.request(\"DELETE\",requestRoute)\n                        .then((responseArg) => {\n                            done.resolve(responseArg);\n                        });\n                } else {\n                    done.reject();\n                }\n            });\n        return done.promise;\n    };\n    updateRecord(domainNameArg:string,typeArg:string,valueArg){\n        let done = plugins.q.defer();\n        let domain = new plugins.smartstring.Domain(domainNameArg);\n        return done.promise;\n    };\n    listRecords(domainNameArg:string){\n        let done = plugins.q.defer();\n        let domain = new plugins.smartstring.Domain(domainNameArg);\n        this.getZoneId(domain.zoneName)\n            .then((domainIdArg)=>{\n                this.request(\"GET\",\"/zones/\" + domainIdArg + \"/dns_records?per_page=100\")\n                    .then(function(responseArg){\n                        done.resolve(responseArg);\n                    });\n            });\n        return done.promise;\n    }\n    listZones(domainName?:string){ // TODO: handle pagination\n        let done = plugins.q.defer();\n        let requestRoute = \"/zones?per_page=50\"\n        if(domainName) requestRoute = requestRoute + \"&name=\" + domainName;\n        let result = {}; \n        this.request(\"GET\",requestRoute)\n            .then(function(responseArg){\n                result = responseArg;\n                done.resolve(result);\n            });\n        return done.promise;\n    };\n    request(methodArg:string,routeArg:string,dataArg = {}){\n        let done = plugins.q.defer();\n        let jsonArg:string = JSON.stringify(dataArg);\n        let options = {\n            method:methodArg,\n            url:\"https://api.cloudflare.com/client/v4\" + routeArg,\n            headers:{\n                \"Content-Type\":\"application/json\",\n                \"X-Auth-Email\":this.authEmail,\n                \"X-Auth-Key\":this.authKey\n            },\n            body:jsonArg\n        };\n        //console.log(options);\n        plugins.request(options,function(err, res, body){\n            if (!err && res.statusCode == 200) {\n                var responseObj = JSON.parse(body);\n                done.resolve(responseObj);\n            } else {\n                console.log(err);\n                console.log(res);\n                done.reject(err);\n            };\n        });\n        return done.promise;\n    }\n};"]} diff --git a/package.json b/package.json index b6ea322..51bf942 100644 --- a/package.json +++ b/package.json @@ -25,12 +25,12 @@ "beautylog": "^5.0.12", "q": "^1.4.1", "request": "^2.72.0", - "smartstring": "^2.0.6", + "smartstring": "^2.0.9", "typings-global": "^1.0.3" }, "devDependencies": { "npmts-g": "^5.2.6", - "qenv": "^1.0.6", + "qenv": "^1.0.8", "should": "^9.0.2", "typings-test": "^1.0.1" } diff --git a/test/test.js b/test/test.js index cb480fa..fd3111a 100644 --- a/test/test.js +++ b/test/test.js @@ -4,6 +4,7 @@ var cflare = require("../dist/index"); var should = require("should"); var qenv_1 = require("qenv"); var testQenv = new qenv_1.Qenv(process.cwd(), process.cwd() + "/.nogit"); +console.log(testQenv.missingEnvVars); var testCflareAccount = new cflare.CflareAccount(); testCflareAccount.auth({ email: process.env.CF_EMAIL, @@ -12,7 +13,7 @@ testCflareAccount.auth({ describe("cflare", function () { describe(".CflareAccount", function () { describe(".listZones()", function () { - it("should display an account", function (done) { + it("should display an entire account", function (done) { this.timeout(10000); testCflareAccount.listZones() .then(function (responseArg) { @@ -58,16 +59,32 @@ describe("cflare", function () { }); }); }); + describe(".getRecord", function () { + it("should get a record from Cloudflare", function (done) { + testCflareAccount.getRecord("bleu.de", "A") + .then(function (responseArg) { + console.log(responseArg); + done(); + }); + }); + }); describe(".removeRecord", function () { - /*it("should remove a record from Cloudflare",function(done){ - testCflareAccount.removeRecord() - .then(function(responseArg){ - console.log(responseArg); - done(); - }); - });*/ + it("should remove a record from Cloudflare", function (done) { + testCflareAccount.removeRecord("bleu.de", "A") + .then(function (responseArg) { + console.log(responseArg); + done(); + }); + }); + it("should remove a subdomain record from Cloudflare", function (done) { + testCflareAccount.removeRecord("subdomain.bleu.de", "A") + .then(function (responseArg) { + console.log(responseArg); + done(); + }); + }); }); }); }); -//# sourceMappingURL=data:application/json;charset=utf8;base64,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QkFDOUQsSUFBSSxDQUFDLFVBQVMsV0FBVztvQkFDdEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQztvQkFDekIsSUFBSSxFQUFFLENBQUM7Z0JBQ1gsQ0FBQyxDQUFDLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQztRQUNQLENBQUMsQ0FBQyxDQUFDO1FBQ0gsUUFBUSxDQUFDLGVBQWUsRUFBQztZQUNyQjs7Ozs7O2lCQU1LO1FBQ1QsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQyxDQUFDIiwiZmlsZSI6InRlc3QuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLXRlc3RcIjtcbmltcG9ydCBjZmxhcmUgPSByZXF1aXJlKFwiLi4vZGlzdC9pbmRleFwiKTtcbmxldCBzaG91bGQgPSByZXF1aXJlKFwic2hvdWxkXCIpO1xuaW1wb3J0IHtRZW52fSBmcm9tIFwicWVudlwiO1xubGV0IHRlc3RRZW52ID0gbmV3IFFlbnYocHJvY2Vzcy5jd2QoKSxwcm9jZXNzLmN3ZCgpICsgXCIvLm5vZ2l0XCIpOyBcblxubGV0IHRlc3RDZmxhcmVBY2NvdW50ID0gbmV3IGNmbGFyZS5DZmxhcmVBY2NvdW50KCk7XG50ZXN0Q2ZsYXJlQWNjb3VudC5hdXRoKHtcbiAgICBlbWFpbDogcHJvY2Vzcy5lbnYuQ0ZfRU1BSUwsXG4gICAga2V5OiBwcm9jZXNzLmVudi5DRl9LRVlcbn0pO1xuXG5kZXNjcmliZShcImNmbGFyZVwiLGZ1bmN0aW9uKCl7XG4gICAgZGVzY3JpYmUoXCIuQ2ZsYXJlQWNjb3VudFwiLGZ1bmN0aW9uKCl7XG4gICAgICAgIGRlc2NyaWJlKFwiLmxpc3Rab25lcygpXCIsZnVuY3Rpb24oKXtcbiAgICAgICAgICAgIGl0KFwic2hvdWxkIGRpc3BsYXkgYW4gYWNjb3VudFwiLGZ1bmN0aW9uKGRvbmUpe1xuICAgICAgICAgICAgICAgIHRoaXMudGltZW91dCgxMDAwMCk7XG4gICAgICAgICAgICAgICAgdGVzdENmbGFyZUFjY291bnQubGlzdFpvbmVzKClcbiAgICAgICAgICAgICAgICAgICAgLnRoZW4oKHJlc3BvbnNlQXJnKT0+e1xuICAgICAgICAgICAgICAgICAgICAgICAgY29uc29sZS5sb2cocmVzcG9uc2VBcmcpO1xuICAgICAgICAgICAgICAgICAgICAgICAgZG9uZSgpO1xuICAgICAgICAgICAgICAgICAgICB9KVxuICAgICAgICAgICAgfSk7XG4gICAgICAgIH0pO1xuICAgICAgICBkZXNjcmliZShcIi5nZXRab25lSWQoZG9tYWluTmFtZSlcIixmdW5jdGlvbigpe1xuICAgICAgICAgICAgaXQoXCJzaG91bGQgZ2V0IGFuIENsb3VkZmxhcmUgSWQgZm9yIGEgZG9tYWluIHN0cmluZ1wiLGZ1bmN0aW9uKGRvbmUpe1xuICAgICAgICAgICAgICAgIHRoaXMudGltZW91dCgxMDAwMClcbiAgICAgICAgICAgICAgICB0ZXN0Q2ZsYXJlQWNjb3VudC5nZXRab25lSWQoXCJibGV1LmRlXCIpXG4gICAgICAgICAgICAgICAgICAgIC50aGVuKChyZXNwb25zZUFyZyk9PntcbiAgICAgICAgICAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKHJlc3BvbnNlQXJnKTtcbiAgICAgICAgICAgICAgICAgICAgICAgIGRvbmUoKTtcbiAgICAgICAgICAgICAgICAgICAgfSk7XG4gICAgICAgICAgICB9KTtcbiAgICAgICAgfSk7XG4gICAgICAgIGRlc2NyaWJlKFwiLmxpc3RSZWNvcmRzKGRvbWFpbk5hbWUpXCIsZnVuY3Rpb24oKXtcbiAgICAgICAgICAgIGl0KFwic2hvdWxkIGxpc3QgYWxsIHJlY29yZHMgZm9yIGEgc3BlY2lmaWMgRG9tYWluIE5hbWVcIixmdW5jdGlvbihkb25lKXtcbiAgICAgICAgICAgICAgICB0aGlzLnRpbWVvdXQoMTAwMDApO1xuICAgICAgICAgICAgICAgIHRlc3RDZmxhcmVBY2NvdW50Lmxpc3RSZWNvcmRzKFwiYmxldS5kZVwiKVxuICAgICAgICAgICAgICAgICAgICAudGhlbigocmVzcG9uc2VBcmcpID0+IHtcbiAgICAgICAgICAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKHJlc3BvbnNlQXJnKTtcbiAgICAgICAgICAgICAgICAgICAgICAgIGRvbmUoKTtcbiAgICAgICAgICAgICAgICAgICAgfSk7XG4gICAgICAgICAgICB9KTtcbiAgICAgICAgfSlcbiAgICAgICAgZGVzY3JpYmUoXCIuY3JlYXRlUmVjb3JkXCIsZnVuY3Rpb24oKXtcbiAgICAgICAgICAgIHRoaXMudGltZW91dCgxMDAwMCk7XG4gICAgICAgICAgICBpdChcInNob3VsZCBjcmVhdGUgYSB2YWxpZCByZWNvcmQgZm9yIGEgbGV2ZWwgMiBkb21haW5cIixmdW5jdGlvbihkb25lKXtcbiAgICAgICAgICAgICAgICB0ZXN0Q2ZsYXJlQWNjb3VudC5jcmVhdGVSZWNvcmQoXCJibGV1LmRlXCIsXCJBXCIsXCIxMjcuMC4wLjFcIilcbiAgICAgICAgICAgICAgICAgICAgLnRoZW4oZnVuY3Rpb24ocmVzcG9uc2VBcmcpe1xuICAgICAgICAgICAgICAgICAgICAgICAgY29uc29sZS5sb2cocmVzcG9uc2VBcmcpO1xuICAgICAgICAgICAgICAgICAgICAgICAgZG9uZSgpO1xuICAgICAgICAgICAgICAgICAgICB9KTtcbiAgICAgICAgICAgIH0pO1xuICAgICAgICAgICAgaXQoXCJzaG91bGQgY3JlYXRlIGEgdmFsaWQgcmVjb3JkIGZvciBhIHN1YmRvbWFpblwiLGZ1bmN0aW9uKGRvbmUpe1xuICAgICAgICAgICAgICAgIHRlc3RDZmxhcmVBY2NvdW50LmNyZWF0ZVJlY29yZChcInN1YmRvbWFpbi5ibGV1LmRlXCIsXCJBXCIsXCIxMjcuMC4wLjFcIilcbiAgICAgICAgICAgICAgICAgICAgLnRoZW4oZnVuY3Rpb24ocmVzcG9uc2VBcmcpe1xuICAgICAgICAgICAgICAgICAgICAgICAgY29uc29sZS5sb2cocmVzcG9uc2VBcmcpO1xuICAgICAgICAgICAgICAgICAgICAgICAgZG9uZSgpO1xuICAgICAgICAgICAgICAgICAgICB9KTtcbiAgICAgICAgICAgIH0pO1xuICAgICAgICB9KTtcbiAgICAgICAgZGVzY3JpYmUoXCIucmVtb3ZlUmVjb3JkXCIsZnVuY3Rpb24oKXtcbiAgICAgICAgICAgIC8qaXQoXCJzaG91bGQgcmVtb3ZlIGEgcmVjb3JkIGZyb20gQ2xvdWRmbGFyZVwiLGZ1bmN0aW9uKGRvbmUpe1xuICAgICAgICAgICAgICAgIHRlc3RDZmxhcmVBY2NvdW50LnJlbW92ZVJlY29yZCgpXG4gICAgICAgICAgICAgICAgICAgIC50aGVuKGZ1bmN0aW9uKHJlc3BvbnNlQXJnKXtcbiAgICAgICAgICAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKHJlc3BvbnNlQXJnKTtcbiAgICAgICAgICAgICAgICAgICAgICAgIGRvbmUoKTtcbiAgICAgICAgICAgICAgICAgICAgfSk7XG4gICAgICAgICAgICB9KTsqL1xuICAgICAgICB9KTtcbiAgICB9KVxufSk7XG4iXX0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["test.ts"],"names":[],"mappings":"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","file":"test.js","sourcesContent":["import \"typings-test\";\nimport cflare = require(\"../dist/index\");\nlet should = require(\"should\");\nimport {Qenv} from \"qenv\";\nlet testQenv = new Qenv(process.cwd(),process.cwd() + \"/.nogit\"); \nconsole.log(testQenv.missingEnvVars);\nlet testCflareAccount = new cflare.CflareAccount();\ntestCflareAccount.auth({\n    email: process.env.CF_EMAIL,\n    key: process.env.CF_KEY\n});\n\ndescribe(\"cflare\",function(){\n    describe(\".CflareAccount\",function(){\n        describe(\".listZones()\",function(){\n            it(\"should display an entire account\",function(done){\n                this.timeout(10000);\n                testCflareAccount.listZones()\n                    .then((responseArg)=>{\n                        console.log(responseArg);\n                        done();\n                    })\n            });\n        });\n        describe(\".getZoneId(domainName)\",function(){\n            it(\"should get an Cloudflare Id for a domain string\",function(done){\n                this.timeout(10000)\n                testCflareAccount.getZoneId(\"bleu.de\")\n                    .then((responseArg)=>{\n                        console.log(responseArg);\n                        done();\n                    });\n            });\n        });\n        describe(\".listRecords(domainName)\",function(){\n            it(\"should list all records for a specific Domain Name\",function(done){\n                this.timeout(10000);\n                testCflareAccount.listRecords(\"bleu.de\")\n                    .then((responseArg) => {\n                        console.log(responseArg);\n                        done();\n                    });\n            });\n        })\n        describe(\".createRecord\",function(){\n            this.timeout(10000);\n            it(\"should create a valid record for a level 2 domain\",function(done){\n                testCflareAccount.createRecord(\"bleu.de\",\"A\",\"127.0.0.1\")\n                    .then(function(responseArg){\n                        console.log(responseArg);\n                        done();\n                    });\n            });\n            it(\"should create a valid record for a subdomain\",function(done){\n                testCflareAccount.createRecord(\"subdomain.bleu.de\",\"A\",\"127.0.0.1\")\n                    .then(function(responseArg){\n                        console.log(responseArg);\n                        done();\n                    });\n            });\n        });\n        describe(\".getRecord\",function(){\n            it(\"should get a record from Cloudflare\",function(done){\n                testCflareAccount.getRecord(\"bleu.de\",\"A\")\n                    .then(function(responseArg){\n                        console.log(responseArg);\n                        done();\n                    });\n            });\n        });\n        describe(\".removeRecord\",function(){\n            it(\"should remove a record from Cloudflare\",function(done){\n                testCflareAccount.removeRecord(\"bleu.de\",\"A\")\n                    .then(function(responseArg){\n                        console.log(responseArg);\n                        done();\n                    });\n            });\n            it(\"should remove a subdomain record from Cloudflare\",function(done){\n                testCflareAccount.removeRecord(\"subdomain.bleu.de\",\"A\")\n                    .then(function(responseArg){\n                        console.log(responseArg);\n                        done();\n                    });\n            });\n        });\n    })\n});\n"]} diff --git a/test/test.ts b/test/test.ts index f66cc97..dbd1afa 100644 --- a/test/test.ts +++ b/test/test.ts @@ -3,7 +3,7 @@ import cflare = require("../dist/index"); let should = require("should"); import {Qenv} from "qenv"; let testQenv = new Qenv(process.cwd(),process.cwd() + "/.nogit"); - +console.log(testQenv.missingEnvVars); let testCflareAccount = new cflare.CflareAccount(); testCflareAccount.auth({ email: process.env.CF_EMAIL, @@ -13,7 +13,7 @@ testCflareAccount.auth({ describe("cflare",function(){ describe(".CflareAccount",function(){ describe(".listZones()",function(){ - it("should display an account",function(done){ + it("should display an entire account",function(done){ this.timeout(10000); testCflareAccount.listZones() .then((responseArg)=>{ @@ -59,14 +59,30 @@ describe("cflare",function(){ }); }); }); - describe(".removeRecord",function(){ - /*it("should remove a record from Cloudflare",function(done){ - testCflareAccount.removeRecord() + describe(".getRecord",function(){ + it("should get a record from Cloudflare",function(done){ + testCflareAccount.getRecord("bleu.de","A") .then(function(responseArg){ console.log(responseArg); done(); }); - });*/ + }); + }); + describe(".removeRecord",function(){ + it("should remove a record from Cloudflare",function(done){ + testCflareAccount.removeRecord("bleu.de","A") + .then(function(responseArg){ + console.log(responseArg); + done(); + }); + }); + it("should remove a subdomain record from Cloudflare",function(done){ + testCflareAccount.removeRecord("subdomain.bleu.de","A") + .then(function(responseArg){ + console.log(responseArg); + done(); + }); + }); }); }) }); diff --git a/ts/cflare.classes.cflareaccount.ts b/ts/cflare.classes.cflareaccount.ts index e17f47c..2647b5f 100644 --- a/ts/cflare.classes.cflareaccount.ts +++ b/ts/cflare.classes.cflareaccount.ts @@ -39,6 +39,7 @@ export class CflareAccount { let filteredResponse = responseArg.result.filter((recordArg) => { return (recordArg.type == typeArg && recordArg.name == domainNameArg); }) + done.resolve(filteredResponse[0]); }) return done.promise; }; @@ -62,9 +63,17 @@ export class CflareAccount { removeRecord(domainNameArg:string,typeArg:string){ let done = plugins.q.defer(); let domain = new plugins.smartstring.Domain(domainNameArg); - this.getRecord(domain.zoneName,typeArg) + this.getRecord(domain.fullName,typeArg) .then((responseArg) => { - + if(responseArg){ + let requestRoute:string = "/zones/" + responseArg.zone_id + "/dns_records/" + responseArg.id; + this.request("DELETE",requestRoute) + .then((responseArg) => { + done.resolve(responseArg); + }); + } else { + done.reject(); + } }); return done.promise; }; @@ -110,6 +119,7 @@ export class CflareAccount { }, body:jsonArg }; + //console.log(options); plugins.request(options,function(err, res, body){ if (!err && res.statusCode == 200) { var responseObj = JSON.parse(body);