modified views and checks for GitHub BaseUrl usage

Author: phoferic

client/src/components/apps/form.vue

@@ -1802,10 +1802,13 @@ export default defineComponent({
         (v: any) => /^[a-zA-Z0-9][a-zA-Z0-9_-]*$/.test(v) || 'Allowed characters : [a-zA-Z0-9_-]',
       ],
       repositoryRules: [
-        //v => !!v || 'Repository is required',
-        (v: any) => v.length <= 120 || 'Repository must be less than 120 characters',
+        //(v: any) => !!v || 'Repository is required',
+        //(v: any) => v.length <= 120 || 'Repository must be less than 120 characters',
         //    ((git|ssh|http(s)?)|(git@[\w\.]+))(:(//)?)([\w\.@\:/\-~]+)(\.git)(/)?
-        (v: any) => /((git|ssh|http(s)?)|(git@[\w.]+))(:(\/\/)?)([\w.@:/\-~]+)(\.git)(\/)?/.test(v) || 'Format "owner/repository"',
+        //    ((git|ssh|http(s)?)|(git@[\w.]+))(:(\/\/)?)([\w.@:\/\-~]+)(\.git)
+        //    (git@[\w.]+:\/\/)([\w.\/\-~]+)(\.git) // not working
+        //    ((git|ssh|http(s)?)|(git@[\w\.-]+))(:(//)?)([\w\.@\:/\-~]+)(\.git)(/)?
+        (v: any) => /^((git|ssh|http(s)?)|(git@[\w\.-]+))(:(\/\/)?)([\w\.@\:\/\-~]+)(\.git)(\/)?/.test(v) || 'Format "[email protected]:organisation/repository.git"',
       ],
       domainRules: [
         (v: any) => !!v || 'Domain is required',

client/src/components/settings/form-deployment.vue

@@ -54,9 +54,19 @@
 
         <h4 class="text-uppercase">Github</h4>
         <v-row>
+            <v-col 
+                cols="12"
+                md="3"
+            >
+                <v-text-field
+                v-model="settings.secrets.GITHUB_BASEURL"
+                label="github Base Url" 
+                required
+                ></v-text-field>  
+            </v-col>
             <v-col
                 cols="12"
-                md="6"
+                md="3"
             >
                 <v-text-field
                 v-model="settings.secrets.GITHUB_PERSONAL_ACCESS_TOKEN"
@@ -218,4 +228,4 @@ export default defineComponent({
     }
 })
 
-</script>
+</script>

client/src/components/settings/form.vue

@@ -65,6 +65,7 @@ import FormNotifications from './form-notifications.vue'
 
 // types & interfaces
 export interface Secrets {
+  GITHUB_BASEURL: string;
   GITHUB_PERSONAL_ACCESS_TOKEN: string;
   GITEA_PERSONAL_ACCESS_TOKEN: string;
   GITEA_BASEURL: string;
@@ -389,6 +390,7 @@ export default defineComponent({
       show: false,
       settings: {
         secrets: {
+          GITHUB_BASEURL: '',
           GITHUB_PERSONAL_ACCESS_TOKEN: '',
           GITEA_PERSONAL_ACCESS_TOKEN: '',
           GITEA_BASEURL: '',
@@ -548,4 +550,4 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
-</style>
+</style>

server/src/git/github.ts

@@ -12,10 +12,16 @@ import { RequestError } from '@octokit/types';
 export class GithubApi extends Repo {
     private octokit: any;
 
-    constructor(token: string) {
+    constructor(baseUrl: string, token: string) {
         super("github");
+
+        if (baseUrl === '') {
+            baseUrl = 'https://api.github.com';
+        }
+
         this.octokit = new Octokit({
-            auth: token
+            auth: token,
+            baseUrl: baseUrl,
         });
     }
 
@@ -398,4 +404,4 @@ export class GithubApi extends Repo {
 
         return ret;
     }
-}
+}

server/src/modules/settings.ts

@@ -64,6 +64,7 @@ export class Settings {
         }
 
         config["secrets"] = {
+            GITHUB_BASEURL: process.env.GITHUB_BASEURL || '',
             GITHUB_PERSONAL_ACCESS_TOKEN: process.env.GITHUB_PERSONAL_ACCESS_TOKEN || '',
             GITEA_PERSONAL_ACCESS_TOKEN: process.env.GITEA_PERSONAL_ACCESS_TOKEN || '',
             GITEA_BASEURL: process.env.GITEA_BASEURL || '',
@@ -143,6 +144,7 @@ export class Settings {
             process.env[key] = secrets[key]
         }
         */
+        process.env.GITHUB_BASEURL = secrets.GITHUB_BASEURL
         process.env.GITHUB_PERSONAL_ACCESS_TOKEN = secrets.GITHUB_PERSONAL_ACCESS_TOKEN
         process.env.GITEA_PERSONAL_ACCESS_TOKEN = secrets.GITEA_PERSONAL_ACCESS_TOKEN
         process.env.GITEA_BASEURL = secrets.GITEA_BASEURL