Fix git repo matching by using the git-url-parse library in the Bitbucket, Gitea, GitHub, and GitLab API files.

Author: mms-gianni

src/git/bitbucket.ts

@@ -2,6 +2,7 @@ import debug from 'debug';
 import * as crypto from "crypto"
 import { IWebhook, IRepository, IWebhookR, IDeploykeyR} from './types';
 import { Repo } from './repo';
+import gitUrlParse = require("git-url-parse");
 debug('app:kubero:bitbucket:api')
 
 //const { Octokit } = require("@octokit/core");
@@ -40,9 +41,9 @@ export class BitbucketApi extends Repo {
             }
         }
 
-        // TODO : Improve matching here
-        let owner = gitrepo.match(/^git@bitbucket.org:(.*)\/.*$/)?.[1] as string;
-        let repo = gitrepo.match(/^git@bitbucket.org:.*\/(.*).git$/)?.[1] as string;
+        let parsed = gitUrlParse(gitrepo)
+        let repo = parsed.name
+        let owner = parsed.owner
 
         console.log(owner, repo);
         try {

src/git/gitea.ts

@@ -2,6 +2,7 @@ import debug from 'debug';
 import * as crypto from "crypto"
 import { IWebhook, IRepository, IWebhookR, IDeploykeyR} from './types';
 import { Repo } from './repo';
+import gitUrlParse = require("git-url-parse");
 debug('app:kubero:gitea:api')
 
 //https://www.npmjs.com/package/gitea-js
@@ -31,9 +32,9 @@ export class GiteaApi extends Repo {
             }
         }
 
-        // TODO : Improve matching here
-        let owner = gitrepo.match(/^git@.*:(.*)\/.*$/)?.[1] as string;
-        let repo = gitrepo.match(/^git@.*:.*\/(.*)\.git$/)?.[1] as string;
+        let parsed = gitUrlParse(gitrepo)
+        let repo = parsed.name
+        let owner = parsed.owner
 
         let res = await this.gitea.repos.repoGet(owner, repo)
         .catch((error: any) => {

src/git/github.ts

@@ -2,6 +2,7 @@ import debug from 'debug';
 import * as crypto from "crypto"
 import { IWebhook, IRepository, IWebhookR, IDeploykeyR} from './types';
 import { Repo } from './repo';
+import gitUrlParse = require("git-url-parse");
 debug('app:kubero:github:api')
 
 //const { Octokit } = require("@octokit/core");
@@ -30,9 +31,9 @@ export class GithubApi extends Repo {
             }
         }
 
-        // TODO : Improve matching here or use default function in Superclass
-        let owner = gitrepo.match(/^git@github.com:(.*)\/.*$/)?.[1] as string;
-        let repo = gitrepo.match(/^git@github.com:.*\/(.*).git$/)?.[1] as string;
+        let parsed = gitUrlParse(gitrepo)
+        let repo = parsed.name
+        let owner = parsed.owner
 
         try {
             let res = await this.octokit.request('GET /repos/{owner}/{repo}', {

src/git/gitlab.ts

@@ -5,6 +5,7 @@ import { IWebhook, IRepository, IWebhookR, IDeploykeyR} from './types';
 import { Repo } from './repo';
 import {Client as GitlabClient} from '@nerdvision/gitlab-js';
 import {Options} from 'got';
+import gitUrlParse = require("git-url-parse");
 
 
 export class GitlabApi extends Repo {
@@ -40,9 +41,9 @@ export class GitlabApi extends Repo {
             }
         }
 
-        // TODO : Improve matching here
-        let owner = gitrepo.match(/^git@.*:(.*)\/.*$/)?.[1] as string;
-        let repo = gitrepo.match(/^git@.*:.*\/(.*)\.git$/)?.[1] as string;
+        let parsed = gitUrlParse(gitrepo)
+        let repo = parsed.name
+        let owner = parsed.owner
 
         let res: any = await this.gitlab.get(`projects/${owner}%2F${repo}`)
         .catch((error: any) => {