Implement custom gitlab instance

starxg · Feb 20, 2022 · 51c0d30 · 51c0d30
1 parent d443b8a
commit 51c0d30
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 15 deletions.
diff --git a/src/api.ts b/src/api.ts
@@ -4,7 +4,7 @@ import GitHub from "gist/GitHub";
 import GitLab from "gist/GitLab";
 
 
-export function syncGist(type: 'Gitee' | 'GitHub' | 'GitLab', token: string, gistId: string, files: Array<GistFile>): Promise<string> {
+export function syncGist(type: 'Gitee' | 'GitHub' | 'GitLab', token: string, baseUrl: string, gistId: string, files: Array<GistFile>): Promise<string> {
 
     return new Promise(async (resolve, reject) => {
         try {
@@ -15,7 +15,7 @@ export function syncGist(type: 'Gitee' | 'GitHub' | 'GitLab', token: string, gis
             } else if (type === 'GitHub') {
                 gist = new GitHub(token);
             } else if (type === 'GitLab') {
-                gist = new GitLab(token);
+                gist = new GitLab(token, baseUrl);
             } else {
                 throw "unknown the type " + type;
             }
@@ -28,7 +28,7 @@ export function syncGist(type: 'Gitee' | 'GitHub' | 'GitLab', token: string, gis
     });
 }
 
-export function getGist(type: string, token: string, gistId: string): Promise<Map<string, GistFile>> {
+export function getGist(type: string, token: string, baseUrl: string, gistId: string): Promise<Map<string, GistFile>> {
 
     return new Promise(async (resolve, reject) => {
         try {
@@ -39,7 +39,7 @@ export function getGist(type: string, token: string, gistId: string): Promise<Ma
             } else if (type === 'GitHub') {
                 gist = new GitHub(token);
             } else if (type === 'GitLab') {
-                gist = new GitLab(token);
+                gist = new GitLab(token, baseUrl);
             } else {
                 throw "unknown the type " + type;
             }

diff --git a/src/components/SettingsTab.component.pug b/src/components/SettingsTab.component.pug
@@ -17,6 +17,15 @@ div.sync-config-settings-tab
 
     .row(*ngIf='config.store.syncConfig.type !== "Off"')
         .col-md-7
+            .form-line(*ngIf='config.store.syncConfig.type == "GitLab"')
+                .header
+                    .title Instance URL
+                input.form-control(
+                    type='text', 
+                    placeholder="https://gitlab.com",
+                    [(ngModel)]='config.store.syncConfig.baseUrl', 
+                    (ngModelChange)='config.save()',
+                )   
             .form-line
                 .header
                     .title Token

diff --git a/src/components/SettingsTab.component.ts b/src/components/SettingsTab.component.ts
@@ -6,6 +6,7 @@ import { PasswordStorageService } from 'services/PasswordStorage.service';
 import CryptoJS from 'crypto-js'
 import * as yaml from 'js-yaml'
 import { GistFile } from 'gist/Gist';
+import GitLab from 'gist/GitLab';
 
 /** @hidden */
 @Component({
@@ -49,7 +50,7 @@ export class SyncConfigSettingsTabComponent implements OnInit {
 
     async sync(isUploading: boolean): Promise<void> {
 
-        const { type, token, gist, encryption } = this.config.store.syncConfig;
+        const { type,baseUrl, token, gist, encryption } = this.config.store.syncConfig;
         const selfConfig = JSON.parse(JSON.stringify(this.config.store.syncConfig));
 
         if (!token) {
@@ -82,11 +83,11 @@ export class SyncConfigSettingsTabComponent implements OnInit {
                 // ssh password
                 files.push(new GistFile('ssh.auth.json', JSON.stringify(await this.getSSHPluginAllPasswordInfos(token))));
 
-                this.config.store.syncConfig.gist = await syncGist(type, token, gist, files);
+                this.config.store.syncConfig.gist = await syncGist(type, token, baseUrl, gist, files);
 
             } else {
 
-                const result = await getGist(type, token, gist);
+                const result = await getGist(type, token, baseUrl, gist);
 
                 if (result.has('config.json')) {
                     const config = yaml.load(result.get('config.json').value) as any;

diff --git a/src/config.ts b/src/config.ts
@@ -4,6 +4,7 @@ export class SyncConfigProvider extends ConfigProvider {
     defaults = {
         syncConfig: {
             type: 'Off',
+            baseUrl: '',
             token: '',
             gist: '',
             lastSyncTime: '-',

diff --git a/src/gist/Gist.ts b/src/gist/Gist.ts
@@ -30,9 +30,13 @@ class GistFile {
 abstract class Gist {
 
     protected readonly token: string;
+    protected customBaseUrl: string;
 
-    constructor(token: string) {
+
+    constructor(token: string)
+    constructor(token: string, customBaseUrl?: string) {
         this.token = token;
+        this.customBaseUrl = customBaseUrl;
     }
 
     /**

diff --git a/src/gist/GitLab.ts b/src/gist/GitLab.ts
@@ -2,10 +2,24 @@ import { Gist, GistFile } from "./Gist";
 import axios, { AxiosResponse, AxiosRequestConfig } from "axios";
 class GitLab extends Gist {
 
-    private readonly baseUrl = "https://gitlab.com/api/v4/snippets";
+    public static readonly defaultBaseUrl = "https://gitlab.com";
+    private readonly apiPath = "/api/v4/snippets";
+
+
+    constructor(token: string, customBaseUrl?: string) {
+        super(token);
+        this.customBaseUrl = GitLab.defaultBaseUrl;
+        if (customBaseUrl) {
+            this.customBaseUrl = customBaseUrl;
+        }
+
+
+    }
+
+
 
     get(gist: string): Promise<Map<string, GistFile>> {
-        const url = `${this.baseUrl}/${gist}`;
+        const url = `${this.customBaseUrl}${this.apiPath}/${gist}`;
 
         return new Promise(async (resolve, reject) => {
             this.request({
@@ -34,7 +48,7 @@ class GitLab extends Gist {
             })
         };
 
-        const url = gist ? `${this.baseUrl}/${gist}` : this.baseUrl;
+        const url = gist ? `${this.customBaseUrl}${this.apiPath}/${gist}` : `${this.customBaseUrl}${this.apiPath}`;
         const method = gist ? 'PUT' : 'POST';
 
         return new Promise(async (resolve, reject) => {
@@ -55,7 +69,7 @@ class GitLab extends Gist {
         return new Promise(async (resolve, reject) => {
             this.request({
                 method: 'DELETE',
-                url: `${this.baseUrl}/${gist}`,
+                url: `${this.customBaseUrl}${this.apiPath}/${gist}`,
                 headers: {
                     Authorization: `Bearer ${this.token}`
                 }
@@ -69,7 +83,7 @@ class GitLab extends Gist {
         return new Promise(async (resolve, reject) => {
             this.request({
                 method: 'GET',
-                url: `${this.baseUrl}/${gist}/files/main/${path}/raw`,
+                url: `${this.customBaseUrl}${this.apiPath}/${gist}/files/main/${path}/raw`,
                 headers: {
                     Authorization: `Bearer ${this.token}`
                 },

diff --git a/src/index.ts b/src/index.ts
@@ -6,7 +6,7 @@ import { FormsModule } from '@angular/forms'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { ConfigProvider } from 'terminus-core';
 import { SyncConfigProvider } from 'config';
-import { SyncConfigSettingsTabComponent } from 'components/settingsTab.component'
+import { SyncConfigSettingsTabComponent } from 'components/SettingsTab.component'
 import { ToggleComponent } from 'components/toggle.component'
 
 @NgModule({

diff --git a/src/settings.ts b/src/settings.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { SyncConfigSettingsTabComponent } from 'components/settingsTab.component'
+import { SyncConfigSettingsTabComponent } from 'components/SettingsTab.component'
 import { SettingsTabProvider } from 'terminus-settings'
 @Injectable()
 export class SyncConfigSettingsTabProvider extends SettingsTabProvider {