Update package.json with the new devDependency "@types/git-url-parse" version "^9.0.1", and import the module "git-url-parse" in gogs.ts to improve git owner and repo extraction from the gitrepo string.

Author: mms-gianni

package.json

@@ -46,6 +46,7 @@
     "yaml": "^2.1.1"
   },
   "devDependencies": {
+    "@types/git-url-parse": "^9.0.1",
     "@types/connect-history-api-fallback": "^1.3.5",
     "@types/cookie-session": "^2.0.44",
     "@types/cors": "^2.8.12",

src/git/gogs.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:gogs:api')
 
 //https://www.npmjs.com/package/gitea-js
@@ -31,9 +32,18 @@ export class GogsApi 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
+        
+        if ( owner == undefined ){
+            debug.log("git owner extraction failed");
+            throw new Error("git owner extraction failed");
+        }
+        if ( repo == undefined ){
+            debug.log("git owner extraction failed");
+            throw new Error("git repo extraction failed");
+        }
 
         let res = await this.gitea.repos.repoGet(owner, repo)
         .catch((error: any) => {

yarn.lock

@@ -946,6 +946,11 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
+"@types/git-url-parse@^9.0.1":
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/@types/git-url-parse/-/git-url-parse-9.0.1.tgz#1c7cc89527ca8b5afcf260ead3b0e4e373c43938"
+  integrity sha512-Zf9mY4Mz7N3Nyi341nUkOtgVUQn4j6NS4ndqEha/lOgEbTkHzpD7wZuRagYKzrXNtvawWfsrojoC1nhsQexvNA==
+
 "@types/got@^9.6.9":
   version "9.6.12"
   resolved "https://registry.yarnpkg.com/@types/got/-/got-9.6.12.tgz#fd42a6e1f5f64cd6bb422279b08c30bb5a15a56f"