From ff71de8f6c223ef06a737c285957caada5e4ec04 Mon Sep 17 00:00:00 2001
From: Phil Kunz <github@philkunz.com>
Date: Wed, 25 May 2016 07:06:06 +0200
Subject: [PATCH] improve domain string handling

---
 dist/cflare.classes.cflareaccount.js |  3 ++-
 package.json                         |  4 ++--
 ts/cflare.classes.cflareaccount.ts   | 14 +++++++-------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dist/cflare.classes.cflareaccount.js b/dist/cflare.classes.cflareaccount.js
index 2b9fe38..5e50777 100644
--- a/dist/cflare.classes.cflareaccount.js
+++ b/dist/cflare.classes.cflareaccount.js
@@ -31,6 +31,7 @@ var CflareAccount = (function () {
     };
     CflareAccount.prototype.getRecord = function (domainNameArg, typeArg) {
         var done = plugins.q.defer();
+        var domain = new plugins.smartstring.Domain(domainNameArg);
         this.listRecords(domainNameArg)
             .then(function (responseArg) {
             var filteredResponse = responseArg.result.filter(function (recordArg) {
@@ -135,4 +136,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        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};"]}
+//# 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        let domain = new plugins.smartstring.Domain(domainNameArg);\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/package.json b/package.json
index 637e090..f4147e5 100644
--- a/package.json
+++ b/package.json
@@ -24,11 +24,11 @@
     "beautylog": "^5.0.6",
     "q": "^1.4.1",
     "request": "^2.72.0",
-    "smartstring": "^2.0.0",
+    "smartstring": "^2.0.1",
     "typings-global": "^1.0.3"
   },
   "devDependencies": {
-    "npmts": "^5.1.13",
+    "npmts": "^5.1.14",
     "should": "^8.4.0",
     "typings-test": "^1.0.1"
   }
diff --git a/ts/cflare.classes.cflareaccount.ts b/ts/cflare.classes.cflareaccount.ts
index 86759fd..e17f47c 100644
--- a/ts/cflare.classes.cflareaccount.ts
+++ b/ts/cflare.classes.cflareaccount.ts
@@ -34,7 +34,7 @@ export class CflareAccount {
     getRecord(domainNameArg:string,typeArg:string){
         let done = plugins.q.defer();
         let domain = new plugins.smartstring.Domain(domainNameArg);
-        this.listRecords(domainNameArg)
+        this.listRecords(domain.zoneName)
             .then((responseArg) => {
                 let filteredResponse = responseArg.result.filter((recordArg) => {
                     return (recordArg.type == typeArg && recordArg.name == domainNameArg); 
@@ -45,8 +45,7 @@ export class CflareAccount {
     createRecord(domainNameArg:string,typeArg:string,contentArg:string){
         let done = plugins.q.defer();
         let domain = new plugins.smartstring.Domain(domainNameArg);
-        let zoneName:string = domain.level2 + "." + domain.level1;
-        this.getZoneId(zoneName)
+        this.getZoneId(domain.zoneName)
             .then((domainIdArg)=>{
                 let dataObject = {
                     name: domain.fullName,
@@ -63,20 +62,21 @@ 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)
+        this.getRecord(domain.zoneName,typeArg)
             .then((responseArg) => {
-                let filteredResponse = responseArg;
+                
             });
         return done.promise;
     };
     updateRecord(domainNameArg:string,typeArg:string,valueArg){
         let done = plugins.q.defer();
+        let domain = new plugins.smartstring.Domain(domainNameArg);
         return done.promise;
     };
     listRecords(domainNameArg:string){
         let done = plugins.q.defer();
-        this.getZoneId(domainNameArg)
+        let domain = new plugins.smartstring.Domain(domainNameArg);
+        this.getZoneId(domain.zoneName)
             .then((domainIdArg)=>{
                 this.request("GET","/zones/" + domainIdArg + "/dns_records?per_page=100")
                     .then(function(responseArg){