diff --git a/dist/cflare.classes.cflareaccount.d.ts b/dist/cflare.classes.cflareaccount.d.ts index 86b7993..44943d3 100644 --- a/dist/cflare.classes.cflareaccount.d.ts +++ b/dist/cflare.classes.cflareaccount.d.ts @@ -11,7 +11,7 @@ export declare class CflareAccount { getZoneId(domainName: string): any; getRecord(domainNameArg: string, typeArg: string): any; createRecord(domainNameArg: string, typeArg: string, contentArg: string): any; - removeRecord(): any; + removeRecord(domainNameArg: string, typeArg: string): any; updateRecord(domainNameArg: string, typeArg: string, valueArg: any): any; listRecords(domainNameArg: string): any; listZones(domainName?: string): any; diff --git a/dist/cflare.classes.cflareaccount.js b/dist/cflare.classes.cflareaccount.js index 4fd9bee..2b9fe38 100644 --- a/dist/cflare.classes.cflareaccount.js +++ b/dist/cflare.classes.cflareaccount.js @@ -43,14 +43,16 @@ var CflareAccount = (function () { CflareAccount.prototype.createRecord = function (domainNameArg, typeArg, contentArg) { var _this = this; var done = plugins.q.defer(); - this.getZoneId(domainNameArg) + var domain = new plugins.smartstring.Domain(domainNameArg); + var zoneName = domain.level2 + "." + domain.level1; + this.getZoneId(zoneName) .then(function (domainIdArg) { - var dataJson = { - name: domainNameArg, + var dataObject = { + name: domain.fullName, type: typeArg, content: contentArg }; - _this.request("POST", "/zones/" + domainIdArg + "/dns_records", dataJson) + _this.request("POST", "/zones/" + domainIdArg + "/dns_records", dataObject) .then(function (responseArg) { done.resolve(responseArg); }); @@ -58,8 +60,14 @@ var CflareAccount = (function () { return done.promise; }; ; - CflareAccount.prototype.removeRecord = function () { + CflareAccount.prototype.removeRecord = function (domainNameArg, typeArg) { var done = plugins.q.defer(); + var domain = new plugins.smartstring.Domain(domainNameArg); + var zoneName = domain.level2 + "." + domain.level1; + this.listRecords(zoneName) + .then(function (responseArg) { + var filteredResponse = responseArg; + }); return done.promise; }; ; @@ -127,4 +135,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\";\r\nimport plugins = require(\"./cflare.plugins\");\r\nimport helpers = require(\"./cflare.classes.helpers\");\r\n\r\nexport class CflareAccount {\r\n    private authEmail:string;\r\n    private authKey:string;\r\n    private authCheck(){\r\n        return (this.authEmail && this.authKey); //check if auth is available\r\n    }\r\n    constructor(){\r\n        \r\n    };\r\n    auth(optionsArg:{email:string,key:string}){\r\n        this.authEmail = optionsArg.email;\r\n        this.authKey = optionsArg.key;       \r\n    }\r\n    getZoneId(domainName:string){\r\n        let done = plugins.q.defer();\r\n        this.listZones(domainName)\r\n            .then((responseArg) => {\r\n                let filteredResponse = responseArg.result.filter((zoneArg)=>{\r\n                    return zoneArg.name === domainName;\r\n                });\r\n                if (filteredResponse.length >= 1){\r\n                    done.resolve(filteredResponse[0].id);\r\n                } else {\r\n                    plugins.beautylog.error(\"the domain \" + domainName.blue + \" does not appear to be in this account!\");\r\n                    done.reject(undefined);\r\n                }\r\n            });\r\n        return done.promise;\r\n    }\r\n    getRecord(domainNameArg:string,typeArg:string){\r\n        let done = plugins.q.defer();\r\n        this.listRecords(domainNameArg)\r\n            .then((responseArg) => {\r\n                let filteredResponse = responseArg.result.filter((recordArg) => {\r\n                    return (recordArg.type == typeArg && recordArg.name == domainNameArg); \r\n                })\r\n            })\r\n        return done.promise;\r\n    };\r\n    createRecord(domainNameArg:string,typeArg:string,contentArg:string){\r\n        let done = plugins.q.defer();\r\n        this.getZoneId(domainNameArg)\r\n            .then((domainIdArg)=>{\r\n                let dataJson = {\r\n                    name: domainNameArg,\r\n                    type: typeArg,\r\n                    content: contentArg\r\n                };\r\n                this.request(\"POST\",\"/zones/\" + domainIdArg + \"/dns_records\",dataJson)\r\n                    .then(function(responseArg){\r\n                        done.resolve(responseArg);\r\n                    });\r\n            });\r\n        return done.promise;\r\n    };\r\n    removeRecord(){\r\n        let done = plugins.q.defer();\r\n        return done.promise;\r\n    };\r\n    updateRecord(domainNameArg:string,typeArg:string,valueArg){\r\n        let done = plugins.q.defer();\r\n        return done.promise;\r\n    };\r\n    listRecords(domainNameArg:string){\r\n        let done = plugins.q.defer();\r\n        this.getZoneId(domainNameArg)\r\n            .then((domainIdArg)=>{\r\n                this.request(\"GET\",\"/zones/\" + domainIdArg + \"/dns_records?per_page=100\")\r\n                    .then(function(responseArg){\r\n                        done.resolve(responseArg);\r\n                    });\r\n            });\r\n        return done.promise;\r\n    }\r\n    listZones(domainName?:string){ // TODO: handle pagination\r\n        let done = plugins.q.defer();\r\n        let requestRoute = \"/zones?per_page=50\"\r\n        if(domainName) requestRoute = requestRoute + \"&name=\" + domainName;\r\n        let result = {}; \r\n        this.request(\"GET\",requestRoute)\r\n            .then(function(responseArg){\r\n                result = responseArg;\r\n                done.resolve(result);\r\n            });\r\n        return done.promise;\r\n    };\r\n    request(methodArg:string,routeArg:string,dataArg = {}){\r\n        let done = plugins.q.defer();\r\n        let jsonArg:string = JSON.stringify(dataArg);\r\n        let options = {\r\n            method:methodArg,\r\n            url:\"https://api.cloudflare.com/client/v4\" + routeArg,\r\n            headers:{\r\n                \"Content-Type\":\"application/json\",\r\n                \"X-Auth-Email\":this.authEmail,\r\n                \"X-Auth-Key\":this.authKey\r\n            },\r\n            body:jsonArg\r\n        };\r\n        plugins.request(options,function(err, res, body){\r\n            if (!err && res.statusCode == 200) {\r\n                var responseObj = JSON.parse(body);\r\n                done.resolve(responseObj);\r\n            } else {\r\n                console.log(err);\r\n                console.log(res);\r\n                done.reject(err);\r\n            };\r\n        });\r\n        return done.promise;\r\n    }\r\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\";\r\nimport plugins = require(\"./cflare.plugins\");\r\nimport helpers = require(\"./cflare.classes.helpers\");\r\n\r\nexport class CflareAccount {\r\n    private authEmail:string;\r\n    private authKey:string;\r\n    private authCheck(){\r\n        return (this.authEmail && this.authKey); //check if auth is available\r\n    }\r\n    constructor(){\r\n        \r\n    };\r\n    auth(optionsArg:{email:string,key:string}){\r\n        this.authEmail = optionsArg.email;\r\n        this.authKey = optionsArg.key;       \r\n    }\r\n    getZoneId(domainName:string){\r\n        let done = plugins.q.defer();\r\n        this.listZones(domainName)\r\n            .then((responseArg) => {\r\n                let filteredResponse = responseArg.result.filter((zoneArg)=>{\r\n                    return zoneArg.name === domainName;\r\n                });\r\n                if (filteredResponse.length >= 1){\r\n                    done.resolve(filteredResponse[0].id);\r\n                } else {\r\n                    plugins.beautylog.error(\"the domain \" + domainName.blue + \" does not appear to be in this account!\");\r\n                    done.reject(undefined);\r\n                }\r\n            });\r\n        return done.promise;\r\n    }\r\n    getRecord(domainNameArg:string,typeArg:string){\r\n        let done = plugins.q.defer();\r\n        this.listRecords(domainNameArg)\r\n            .then((responseArg) => {\r\n                let filteredResponse = responseArg.result.filter((recordArg) => {\r\n                    return (recordArg.type == typeArg && recordArg.name == domainNameArg); \r\n                })\r\n            })\r\n        return done.promise;\r\n    };\r\n    createRecord(domainNameArg:string,typeArg:string,contentArg:string){\r\n        let done = plugins.q.defer();\r\n        let domain = new plugins.smartstring.Domain(domainNameArg);\r\n        let zoneName:string = domain.level2 + \".\" + domain.level1;\r\n        this.getZoneId(zoneName)\r\n            .then((domainIdArg)=>{\r\n                let dataObject = {\r\n                    name: domain.fullName,\r\n                    type: typeArg,\r\n                    content: contentArg\r\n                };\r\n                this.request(\"POST\",\"/zones/\" + domainIdArg + \"/dns_records\",dataObject)\r\n                    .then(function(responseArg){\r\n                        done.resolve(responseArg);\r\n                    });\r\n            });\r\n        return done.promise;\r\n    };\r\n    removeRecord(domainNameArg:string,typeArg:string){\r\n        let done = plugins.q.defer();\r\n        let domain = new plugins.smartstring.Domain(domainNameArg);\r\n        let zoneName = domain.level2 + \".\" + domain.level1;\r\n        this.listRecords(zoneName)\r\n            .then((responseArg) => {\r\n                let filteredResponse = responseArg;\r\n            });\r\n        return done.promise;\r\n    };\r\n    updateRecord(domainNameArg:string,typeArg:string,valueArg){\r\n        let done = plugins.q.defer();\r\n        return done.promise;\r\n    };\r\n    listRecords(domainNameArg:string){\r\n        let done = plugins.q.defer();\r\n        this.getZoneId(domainNameArg)\r\n            .then((domainIdArg)=>{\r\n                this.request(\"GET\",\"/zones/\" + domainIdArg + \"/dns_records?per_page=100\")\r\n                    .then(function(responseArg){\r\n                        done.resolve(responseArg);\r\n                    });\r\n            });\r\n        return done.promise;\r\n    }\r\n    listZones(domainName?:string){ // TODO: handle pagination\r\n        let done = plugins.q.defer();\r\n        let requestRoute = \"/zones?per_page=50\"\r\n        if(domainName) requestRoute = requestRoute + \"&name=\" + domainName;\r\n        let result = {}; \r\n        this.request(\"GET\",requestRoute)\r\n            .then(function(responseArg){\r\n                result = responseArg;\r\n                done.resolve(result);\r\n            });\r\n        return done.promise;\r\n    };\r\n    request(methodArg:string,routeArg:string,dataArg = {}){\r\n        let done = plugins.q.defer();\r\n        let jsonArg:string = JSON.stringify(dataArg);\r\n        let options = {\r\n            method:methodArg,\r\n            url:\"https://api.cloudflare.com/client/v4\" + routeArg,\r\n            headers:{\r\n                \"Content-Type\":\"application/json\",\r\n                \"X-Auth-Email\":this.authEmail,\r\n                \"X-Auth-Key\":this.authKey\r\n            },\r\n            body:jsonArg\r\n        };\r\n        plugins.request(options,function(err, res, body){\r\n            if (!err && res.statusCode == 200) {\r\n                var responseObj = JSON.parse(body);\r\n                done.resolve(responseObj);\r\n            } else {\r\n                console.log(err);\r\n                console.log(res);\r\n                done.reject(err);\r\n            };\r\n        });\r\n        return done.promise;\r\n    }\r\n};"]} diff --git a/dist/cflare.plugins.d.ts b/dist/cflare.plugins.d.ts index 97dfb0f..e33d5ca 100644 --- a/dist/cflare.plugins.d.ts +++ b/dist/cflare.plugins.d.ts @@ -2,3 +2,4 @@ import "typings-global"; export declare let beautylog: any; export declare let q: any; export declare let request: any; +export import smartstring = require("smartstring"); diff --git a/dist/cflare.plugins.js b/dist/cflare.plugins.js index 96cd72d..da7ed67 100644 --- a/dist/cflare.plugins.js +++ b/dist/cflare.plugins.js @@ -3,5 +3,6 @@ require("typings-global"); exports.beautylog = require("beautylog"); exports.q = require("q"); exports.request = require("request"); +exports.smartstring = require("smartstring"); -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImNmbGFyZS5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDYixpQkFBUyxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUNqQyxTQUFDLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ2pCLGVBQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMiLCJmaWxlIjoiY2ZsYXJlLnBsdWdpbnMuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xyXG5leHBvcnQgbGV0IGJlYXV0eWxvZyA9IHJlcXVpcmUoXCJiZWF1dHlsb2dcIik7XHJcbmV4cG9ydCBsZXQgcSA9IHJlcXVpcmUoXCJxXCIpO1xyXG5leHBvcnQgbGV0IHJlcXVlc3QgPSByZXF1aXJlKFwicmVxdWVzdFwiKTsiXX0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImNmbGFyZS5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDYixpQkFBUyxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUNqQyxTQUFDLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ2pCLGVBQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDMUIsbUJBQVcsV0FBVyxhQUFhLENBQUMsQ0FBQyIsImZpbGUiOiJjZmxhcmUucGx1Z2lucy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XHJcbmV4cG9ydCBsZXQgYmVhdXR5bG9nID0gcmVxdWlyZShcImJlYXV0eWxvZ1wiKTtcclxuZXhwb3J0IGxldCBxID0gcmVxdWlyZShcInFcIik7XHJcbmV4cG9ydCBsZXQgcmVxdWVzdCA9IHJlcXVpcmUoXCJyZXF1ZXN0XCIpO1xyXG5leHBvcnQgaW1wb3J0IHNtYXJ0c3RyaW5nID0gcmVxdWlyZShcInNtYXJ0c3RyaW5nXCIpOyJdfQ== diff --git a/package.json b/package.json index bff9083..637e090 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "beautylog": "^5.0.6", "q": "^1.4.1", "request": "^2.72.0", + "smartstring": "^2.0.0", "typings-global": "^1.0.3" }, "devDependencies": { diff --git a/test/test.js b/test/test.js index 79bd228..cf4f54c 100644 --- a/test/test.js +++ b/test/test.js @@ -42,15 +42,31 @@ describe("cflare", function () { }); describe(".createRecord", function () { this.timeout(10000); - it("should create a valid record for a domain", function (done) { + it("should create a valid record for a level 2 domain", function (done) { testCflareAccount.createRecord("bleu.de", "A", "127.0.0.1") .then(function (responseArg) { console.log(responseArg); done(); }); }); + it("should create a valid record for a subdomain", function (done) { + testCflareAccount.createRecord("subdomain.bleu.de", "A", "127.0.0.1") + .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(); + }); + });*/ }); }); }); -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsSUFBTyxNQUFNLFdBQVcsZUFBZSxDQUFDLENBQUM7QUFDekMsSUFBSSxNQUFNLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBQy9CLElBQUksS0FBSyxHQUFHLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO0FBRTNDLElBQUksaUJBQWlCLEdBQUcsSUFBSSxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUM7QUFDbkQsaUJBQWlCLENBQUMsSUFBSSxDQUFDO0lBQ25CLEtBQUssRUFBRSxLQUFLLENBQUMsT0FBTztJQUNwQixHQUFHLEVBQUUsS0FBSyxDQUFDLEtBQUs7Q0FDbkIsQ0FBQyxDQUFDO0FBRUgsUUFBUSxDQUFDLFFBQVEsRUFBQztJQUNkLFFBQVEsQ0FBQyxnQkFBZ0IsRUFBQztRQUN0QixRQUFRLENBQUMsY0FBYyxFQUFDO1lBQ3BCLEVBQUUsQ0FBQywyQkFBMkIsRUFBQyxVQUFTLElBQUk7Z0JBQ3hDLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7Z0JBQ3BCLGlCQUFpQixDQUFDLFNBQVMsRUFBRTtxQkFDeEIsSUFBSSxDQUFDLFVBQUMsV0FBVztvQkFDZCxPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDO29CQUN6QixJQUFJLEVBQUUsQ0FBQztnQkFDWCxDQUFDLENBQUMsQ0FBQTtZQUNWLENBQUMsQ0FBQyxDQUFDO1FBQ1AsQ0FBQyxDQUFDLENBQUM7UUFDSCxRQUFRLENBQUMsd0JBQXdCLEVBQUM7WUFDOUIsRUFBRSxDQUFDLGlEQUFpRCxFQUFDLFVBQVMsSUFBSTtnQkFDOUQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtnQkFDbkIsaUJBQWlCLENBQUMsU0FBUyxDQUFDLFlBQVksQ0FBQztxQkFDcEMsSUFBSSxDQUFDLFVBQUMsV0FBVztvQkFDZCxPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDO29CQUN6QixJQUFJLEVBQUUsQ0FBQztnQkFDWCxDQUFDLENBQUMsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1AsQ0FBQyxDQUFDLENBQUM7UUFDSCxRQUFRLENBQUMsMEJBQTBCLEVBQUM7WUFDaEMsRUFBRSxDQUFDLG9EQUFvRCxFQUFDLFVBQVMsSUFBSTtnQkFDakUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztnQkFDcEIsaUJBQWlCLENBQUMsV0FBVyxDQUFDLFlBQVksQ0FBQztxQkFDdEMsSUFBSSxDQUFDLFVBQUMsV0FBVztvQkFDZCxPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDO29CQUN6QixJQUFJLEVBQUUsQ0FBQztnQkFDWCxDQUFDLENBQUMsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1AsQ0FBQyxDQUFDLENBQUE7UUFDRixRQUFRLENBQUMsZUFBZSxFQUFDO1lBQ3JCLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDcEIsRUFBRSxDQUFDLDJDQUEyQyxFQUFDLFVBQVMsSUFBSTtnQkFDeEQsaUJBQWlCLENBQUMsWUFBWSxDQUFDLFNBQVMsRUFBQyxHQUFHLEVBQUMsV0FBVyxDQUFDO3FCQUNwRCxJQUFJLENBQUMsVUFBUyxXQUFXO29CQUN0QixPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDO29CQUN6QixJQUFJLEVBQUUsQ0FBQztnQkFDWCxDQUFDLENBQUMsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1AsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQyxDQUFDIiwiZmlsZSI6InRlc3QuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLXRlc3RcIjtcclxuaW1wb3J0IGNmbGFyZSA9IHJlcXVpcmUoXCIuLi9kaXN0L2luZGV4XCIpO1xyXG5sZXQgc2hvdWxkID0gcmVxdWlyZShcInNob3VsZFwiKTtcclxubGV0IG5vZ2l0ID0gcmVxdWlyZShcIi4uL25vZ2l0L25vZ2l0Lmpzb25cIik7XHJcblxyXG5sZXQgdGVzdENmbGFyZUFjY291bnQgPSBuZXcgY2ZsYXJlLkNmbGFyZUFjY291bnQoKTtcclxudGVzdENmbGFyZUFjY291bnQuYXV0aCh7XHJcbiAgICBlbWFpbDogbm9naXQuY2ZlbWFpbCxcclxuICAgIGtleTogbm9naXQuY2ZrZXlcclxufSk7XHJcblxyXG5kZXNjcmliZShcImNmbGFyZVwiLGZ1bmN0aW9uKCl7XHJcbiAgICBkZXNjcmliZShcIi5DZmxhcmVBY2NvdW50XCIsZnVuY3Rpb24oKXtcclxuICAgICAgICBkZXNjcmliZShcIi5saXN0Wm9uZXMoKVwiLGZ1bmN0aW9uKCl7XHJcbiAgICAgICAgICAgIGl0KFwic2hvdWxkIGRpc3BsYXkgYW4gYWNjb3VudFwiLGZ1bmN0aW9uKGRvbmUpe1xyXG4gICAgICAgICAgICAgICAgdGhpcy50aW1lb3V0KDEwMDAwKTtcclxuICAgICAgICAgICAgICAgIHRlc3RDZmxhcmVBY2NvdW50Lmxpc3Rab25lcygpXHJcbiAgICAgICAgICAgICAgICAgICAgLnRoZW4oKHJlc3BvbnNlQXJnKT0+e1xyXG4gICAgICAgICAgICAgICAgICAgICAgICBjb25zb2xlLmxvZyhyZXNwb25zZUFyZyk7XHJcbiAgICAgICAgICAgICAgICAgICAgICAgIGRvbmUoKTtcclxuICAgICAgICAgICAgICAgICAgICB9KVxyXG4gICAgICAgICAgICB9KTtcclxuICAgICAgICB9KTtcclxuICAgICAgICBkZXNjcmliZShcIi5nZXRab25lSWQoZG9tYWluTmFtZSlcIixmdW5jdGlvbigpe1xyXG4gICAgICAgICAgICBpdChcInNob3VsZCBnZXQgYW4gQ2xvdWRmbGFyZSBJZCBmb3IgYSBkb21haW4gc3RyaW5nXCIsZnVuY3Rpb24oZG9uZSl7XHJcbiAgICAgICAgICAgICAgICB0aGlzLnRpbWVvdXQoMTAwMDApXHJcbiAgICAgICAgICAgICAgICB0ZXN0Q2ZsYXJlQWNjb3VudC5nZXRab25lSWQoXCJwdXNoLnJvY2tzXCIpXHJcbiAgICAgICAgICAgICAgICAgICAgLnRoZW4oKHJlc3BvbnNlQXJnKT0+e1xyXG4gICAgICAgICAgICAgICAgICAgICAgICBjb25zb2xlLmxvZyhyZXNwb25zZUFyZyk7XHJcbiAgICAgICAgICAgICAgICAgICAgICAgIGRvbmUoKTtcclxuICAgICAgICAgICAgICAgICAgICB9KTtcclxuICAgICAgICAgICAgfSk7XHJcbiAgICAgICAgfSk7XHJcbiAgICAgICAgZGVzY3JpYmUoXCIubGlzdFJlY29yZHMoZG9tYWluTmFtZSlcIixmdW5jdGlvbigpe1xyXG4gICAgICAgICAgICBpdChcInNob3VsZCBsaXN0IGFsbCByZWNvcmRzIGZvciBhIHNwZWNpZmljIERvbWFpbiBOYW1lXCIsZnVuY3Rpb24oZG9uZSl7XHJcbiAgICAgICAgICAgICAgICB0aGlzLnRpbWVvdXQoMTAwMDApO1xyXG4gICAgICAgICAgICAgICAgdGVzdENmbGFyZUFjY291bnQubGlzdFJlY29yZHMoXCJwdXNoLnJvY2tzXCIpXHJcbiAgICAgICAgICAgICAgICAgICAgLnRoZW4oKHJlc3BvbnNlQXJnKSA9PiB7XHJcbiAgICAgICAgICAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKHJlc3BvbnNlQXJnKTtcclxuICAgICAgICAgICAgICAgICAgICAgICAgZG9uZSgpO1xyXG4gICAgICAgICAgICAgICAgICAgIH0pO1xyXG4gICAgICAgICAgICB9KTtcclxuICAgICAgICB9KVxyXG4gICAgICAgIGRlc2NyaWJlKFwiLmNyZWF0ZVJlY29yZFwiLGZ1bmN0aW9uKCl7XHJcbiAgICAgICAgICAgIHRoaXMudGltZW91dCgxMDAwMCk7XHJcbiAgICAgICAgICAgIGl0KFwic2hvdWxkIGNyZWF0ZSBhIHZhbGlkIHJlY29yZCBmb3IgYSBkb21haW5cIixmdW5jdGlvbihkb25lKXtcclxuICAgICAgICAgICAgICAgIHRlc3RDZmxhcmVBY2NvdW50LmNyZWF0ZVJlY29yZChcImJsZXUuZGVcIixcIkFcIixcIjEyNy4wLjAuMVwiKVxyXG4gICAgICAgICAgICAgICAgICAgIC50aGVuKGZ1bmN0aW9uKHJlc3BvbnNlQXJnKXtcclxuICAgICAgICAgICAgICAgICAgICAgICAgY29uc29sZS5sb2cocmVzcG9uc2VBcmcpO1xyXG4gICAgICAgICAgICAgICAgICAgICAgICBkb25lKCk7XHJcbiAgICAgICAgICAgICAgICAgICAgfSk7XHJcbiAgICAgICAgICAgIH0pO1xyXG4gICAgICAgIH0pO1xyXG4gICAgfSlcclxufSk7XHJcbiJdfQ== +//# sourceMappingURL=data:application/json;charset=utf8;base64,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Q0FBQyxDQUFDO1lBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDUCxDQUFDLENBQUMsQ0FBQztRQUNILFFBQVEsQ0FBQyxlQUFlLEVBQUM7WUFDckI7Ozs7OztpQkFNSztRQUNULENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUMsQ0FBQyIsImZpbGUiOiJ0ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy10ZXN0XCI7XHJcbmltcG9ydCBjZmxhcmUgPSByZXF1aXJlKFwiLi4vZGlzdC9pbmRleFwiKTtcclxubGV0IHNob3VsZCA9IHJlcXVpcmUoXCJzaG91bGRcIik7XHJcbmxldCBub2dpdCA9IHJlcXVpcmUoXCIuLi9ub2dpdC9ub2dpdC5qc29uXCIpO1xyXG5cclxubGV0IHRlc3RDZmxhcmVBY2NvdW50ID0gbmV3IGNmbGFyZS5DZmxhcmVBY2NvdW50KCk7XHJcbnRlc3RDZmxhcmVBY2NvdW50LmF1dGgoe1xyXG4gICAgZW1haWw6IG5vZ2l0LmNmZW1haWwsXHJcbiAgICBrZXk6IG5vZ2l0LmNma2V5XHJcbn0pO1xyXG5cclxuZGVzY3JpYmUoXCJjZmxhcmVcIixmdW5jdGlvbigpe1xyXG4gICAgZGVzY3JpYmUoXCIuQ2ZsYXJlQWNjb3VudFwiLGZ1bmN0aW9uKCl7XHJcbiAgICAgICAgZGVzY3JpYmUoXCIubGlzdFpvbmVzKClcIixmdW5jdGlvbigpe1xyXG4gICAgICAgICAgICBpdChcInNob3VsZCBkaXNwbGF5IGFuIGFjY291bnRcIixmdW5jdGlvbihkb25lKXtcclxuICAgICAgICAgICAgICAgIHRoaXMudGltZW91dCgxMDAwMCk7XHJcbiAgICAgICAgICAgICAgICB0ZXN0Q2ZsYXJlQWNjb3VudC5saXN0Wm9uZXMoKVxyXG4gICAgICAgICAgICAgICAgICAgIC50aGVuKChyZXNwb25zZUFyZyk9PntcclxuICAgICAgICAgICAgICAgICAgICAgICAgY29uc29sZS5sb2cocmVzcG9uc2VBcmcpO1xyXG4gICAgICAgICAgICAgICAgICAgICAgICBkb25lKCk7XHJcbiAgICAgICAgICAgICAgICAgICAgfSlcclxuICAgICAgICAgICAgfSk7XHJcbiAgICAgICAgfSk7XHJcbiAgICAgICAgZGVzY3JpYmUoXCIuZ2V0Wm9uZUlkKGRvbWFpbk5hbWUpXCIsZnVuY3Rpb24oKXtcclxuICAgICAgICAgICAgaXQoXCJzaG91bGQgZ2V0IGFuIENsb3VkZmxhcmUgSWQgZm9yIGEgZG9tYWluIHN0cmluZ1wiLGZ1bmN0aW9uKGRvbmUpe1xyXG4gICAgICAgICAgICAgICAgdGhpcy50aW1lb3V0KDEwMDAwKVxyXG4gICAgICAgICAgICAgICAgdGVzdENmbGFyZUFjY291bnQuZ2V0Wm9uZUlkKFwicHVzaC5yb2Nrc1wiKVxyXG4gICAgICAgICAgICAgICAgICAgIC50aGVuKChyZXNwb25zZUFyZyk9PntcclxuICAgICAgICAgICAgICAgICAgICAgICAgY29uc29sZS5sb2cocmVzcG9uc2VBcmcpO1xyXG4gICAgICAgICAgICAgICAgICAgICAgICBkb25lKCk7XHJcbiAgICAgICAgICAgICAgICAgICAgfSk7XHJcbiAgICAgICAgICAgIH0pO1xyXG4gICAgICAgIH0pO1xyXG4gICAgICAgIGRlc2NyaWJlKFwiLmxpc3RSZWNvcmRzKGRvbWFpbk5hbWUpXCIsZnVuY3Rpb24oKXtcclxuICAgICAgICAgICAgaXQoXCJzaG91bGQgbGlzdCBhbGwgcmVjb3JkcyBmb3IgYSBzcGVjaWZpYyBEb21haW4gTmFtZVwiLGZ1bmN0aW9uKGRvbmUpe1xyXG4gICAgICAgICAgICAgICAgdGhpcy50aW1lb3V0KDEwMDAwKTtcclxuICAgICAgICAgICAgICAgIHRlc3RDZmxhcmVBY2NvdW50Lmxpc3RSZWNvcmRzKFwicHVzaC5yb2Nrc1wiKVxyXG4gICAgICAgICAgICAgICAgICAgIC50aGVuKChyZXNwb25zZUFyZykgPT4ge1xyXG4gICAgICAgICAgICAgICAgICAgICAgICBjb25zb2xlLmxvZyhyZXNwb25zZUFyZyk7XHJcbiAgICAgICAgICAgICAgICAgICAgICAgIGRvbmUoKTtcclxuICAgICAgICAgICAgICAgICAgICB9KTtcclxuICAgICAgICAgICAgfSk7XHJcbiAgICAgICAgfSlcclxuICAgICAgICBkZXNjcmliZShcIi5jcmVhdGVSZWNvcmRcIixmdW5jdGlvbigpe1xyXG4gICAgICAgICAgICB0aGlzLnRpbWVvdXQoMTAwMDApO1xyXG4gICAgICAgICAgICBpdChcInNob3VsZCBjcmVhdGUgYSB2YWxpZCByZWNvcmQgZm9yIGEgbGV2ZWwgMiBkb21haW5cIixmdW5jdGlvbihkb25lKXtcclxuICAgICAgICAgICAgICAgIHRlc3RDZmxhcmVBY2NvdW50LmNyZWF0ZVJlY29yZChcImJsZXUuZGVcIixcIkFcIixcIjEyNy4wLjAuMVwiKVxyXG4gICAgICAgICAgICAgICAgICAgIC50aGVuKGZ1bmN0aW9uKHJlc3BvbnNlQXJnKXtcclxuICAgICAgICAgICAgICAgICAgICAgICAgY29uc29sZS5sb2cocmVzcG9uc2VBcmcpO1xyXG4gICAgICAgICAgICAgICAgICAgICAgICBkb25lKCk7XHJcbiAgICAgICAgICAgICAgICAgICAgfSk7XHJcbiAgICAgICAgICAgIH0pO1xyXG4gICAgICAgICAgICBpdChcInNob3VsZCBjcmVhdGUgYSB2YWxpZCByZWNvcmQgZm9yIGEgc3ViZG9tYWluXCIsZnVuY3Rpb24oZG9uZSl7XHJcbiAgICAgICAgICAgICAgICB0ZXN0Q2ZsYXJlQWNjb3VudC5jcmVhdGVSZWNvcmQoXCJzdWJkb21haW4uYmxldS5kZVwiLFwiQVwiLFwiMTI3LjAuMC4xXCIpXHJcbiAgICAgICAgICAgICAgICAgICAgLnRoZW4oZnVuY3Rpb24ocmVzcG9uc2VBcmcpe1xyXG4gICAgICAgICAgICAgICAgICAgICAgICBjb25zb2xlLmxvZyhyZXNwb25zZUFyZyk7XHJcbiAgICAgICAgICAgICAgICAgICAgICAgIGRvbmUoKTtcclxuICAgICAgICAgICAgICAgICAgICB9KTtcclxuICAgICAgICAgICAgfSk7XHJcbiAgICAgICAgfSk7XHJcbiAgICAgICAgZGVzY3JpYmUoXCIucmVtb3ZlUmVjb3JkXCIsZnVuY3Rpb24oKXtcclxuICAgICAgICAgICAgLyppdChcInNob3VsZCByZW1vdmUgYSByZWNvcmQgZnJvbSBDbG91ZGZsYXJlXCIsZnVuY3Rpb24oZG9uZSl7XHJcbiAgICAgICAgICAgICAgICB0ZXN0Q2ZsYXJlQWNjb3VudC5yZW1vdmVSZWNvcmQoKVxyXG4gICAgICAgICAgICAgICAgICAgIC50aGVuKGZ1bmN0aW9uKHJlc3BvbnNlQXJnKXtcclxuICAgICAgICAgICAgICAgICAgICAgICAgY29uc29sZS5sb2cocmVzcG9uc2VBcmcpO1xyXG4gICAgICAgICAgICAgICAgICAgICAgICBkb25lKCk7XHJcbiAgICAgICAgICAgICAgICAgICAgfSk7XHJcbiAgICAgICAgICAgIH0pOyovXHJcbiAgICAgICAgfSk7XHJcbiAgICB9KVxyXG59KTtcclxuIl19 diff --git a/test/test.ts b/test/test.ts index 0831898..d92fd65 100644 --- a/test/test.ts +++ b/test/test.ts @@ -43,22 +43,29 @@ describe("cflare",function(){ }) describe(".createRecord",function(){ this.timeout(10000); - it("should create a valid record for a domain",function(done){ + it("should create a valid record for a level 2 domain",function(done){ testCflareAccount.createRecord("bleu.de","A","127.0.0.1") .then(function(responseArg){ console.log(responseArg); done(); }); }); + it("should create a valid record for a subdomain",function(done){ + testCflareAccount.createRecord("subdomain.bleu.de","A","127.0.0.1") + .then(function(responseArg){ + console.log(responseArg); + done(); + }); + }); }); describe(".removeRecord",function(){ - it("should remove a record from Cloudflare",function(done){ + /*it("should remove a record from Cloudflare",function(done){ testCflareAccount.removeRecord() .then(function(responseArg){ console.log(responseArg); done(); - }) - }); + }); + });*/ }); }) }); diff --git a/ts/cflare.classes.cflareaccount.ts b/ts/cflare.classes.cflareaccount.ts index 50b55a9..3476fbe 100644 --- a/ts/cflare.classes.cflareaccount.ts +++ b/ts/cflare.classes.cflareaccount.ts @@ -43,10 +43,12 @@ export class CflareAccount { }; createRecord(domainNameArg:string,typeArg:string,contentArg:string){ let done = plugins.q.defer(); - this.getZoneId(domainNameArg) + let domain = new plugins.smartstring.Domain(domainNameArg); + let zoneName:string = domain.level2 + "." + domain.level1; + this.getZoneId(zoneName) .then((domainIdArg)=>{ let dataObject = { - name: domainNameArg, + name: domain.fullName, type: typeArg, content: contentArg }; @@ -59,7 +61,12 @@ export class CflareAccount { }; removeRecord(domainNameArg:string,typeArg:string){ let done = plugins.q.defer(); - + let domain = new plugins.smartstring.Domain(domainNameArg); + let zoneName = domain.level2 + "." + domain.level1; + this.listRecords(zoneName) + .then((responseArg) => { + let filteredResponse = responseArg; + }); return done.promise; }; updateRecord(domainNameArg:string,typeArg:string,valueArg){ diff --git a/ts/cflare.plugins.ts b/ts/cflare.plugins.ts index 755b1ec..1347ac4 100644 --- a/ts/cflare.plugins.ts +++ b/ts/cflare.plugins.ts @@ -1,4 +1,5 @@ import "typings-global"; export let beautylog = require("beautylog"); export let q = require("q"); -export let request = require("request"); \ No newline at end of file +export let request = require("request"); +export import smartstring = require("smartstring"); \ No newline at end of file