Merge pull request #3007 from cloudfoundry-incubator/git-diagnostics-fix

Diagnostics does not show GitHub details when cloned via HTTPS
cloudfoundry · Sep 17, 2018 · 6350c84 · 6350c84
2 parents 02057f5 + f1c527f
commit 6350c84
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/frontend/app/features/about/diagnostics-page/diagnostics-page.component.ts b/src/frontend/app/features/about/diagnostics-page/diagnostics-page.component.ts
@@ -93,9 +93,17 @@ export class DiagnosticsPageComponent implements OnInit {
   }
 
   private getGitHubProject(prj: string): string {
-    const parts = prj.split(':');
-    if (parts.length === 2 && parts[0].indexOf('@github.com') >= 0) {
-      return parts[1];
+    let projectUrl = prj;
+    // Remove trailing .git if it is there
+    if (projectUrl.endsWith('.git')) {
+      projectUrl = projectUrl.substr(0, projectUrl.length - 4);
+    }
+
+    // Handle either SSH or HTTPS GitHub URLs
+    if (projectUrl.toLowerCase().startsWith('git@github.com:')) {
+      return projectUrl.substr(15);
+    } else if (projectUrl.toLowerCase().startsWith('https://github.com/')) {
+      return projectUrl.substr(19);
     }
     return '';
   }