Fix parsing of source with 2 parts SLD

IonicaBizau · Jul 9, 2018 · 13dae80 · 13dae80
1 parent e58ee36
commit 13dae80
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -49,7 +49,7 @@ function gitUrlParse(url) {
     };
 
     urlInfo.source = sourceParts.length > 2
-                   ? sourceParts.slice(-2).join(".")
+                   ? sourceParts.slice(1 - sourceParts.length).join(".")
                    : urlInfo.source = urlInfo.resource
                    ;
 
@@ -60,9 +60,10 @@ function gitUrlParse(url) {
     urlInfo.owner = decodeURIComponent(urlInfo.user);
 
     switch (urlInfo.source) {
-        case "cloudforge.com":
+        case "git.cloudforge.com":
             urlInfo.owner = urlInfo.user;
             urlInfo.organization = sourceParts[0];
+            urlInfo.source = "cloudforge.com";
             break;
         case "visualstudio.com":
             splits = urlInfo.name.split("/");

diff --git a/test/index.js b/test/index.js
@@ -170,6 +170,14 @@ tester.describe("parse urls", test => {
         test.expect(res.toString()).toBe("https://companyname.visualstudio.com/DefaultCollection/MyProject/_git/MyRepo");
     });
 
+    // custom git hosted URL with 2 parts SLD
+    test.should("parse Gih hosted urls with two parts SLD", () => {
+        var res = gitUrlParse("https://domain.git.com.cn/owner/name.git");
+        test.expect(res.source).toBe("git.com.cn");
+        test.expect(res.owner).toBe("owner");
+        test.expect(res.name).toBe("name");
+    });
+
     // Handle URL encoded names of owners and repositories
     test.should("https URLs with URL encoded characters", () => {
       var res = gitUrlParse("https://companyname.visualstudio.com/My%20Project/_git/My%20Repo");