Browse Source

gitHost parameter

CrazyDoctor 1 year ago
parent
commit
9e6257c5ce
5 changed files with 14 additions and 8 deletions
  1. 1 1
      .git-credentials.tmpl
  2. 3 2
      build.gradle
  3. 5 4
      config.json
  4. 3 0
      src/index.ts
  5. 2 1
      src/routes/PostAuthorize.ts

+ 1 - 1
.git-credentials.tmpl

@@ -1 +1 @@
-http://${gitUsername}:${gitPassword}@${commentsRepoUrl}
+http://${gitUsername}:${gitPassword}@${gitHost}${commentsRepoUrl}

+ 3 - 2
build.gradle

@@ -31,7 +31,8 @@ ext.nodeCmd = windows ? 'node.exe' : 'node'
 
 def gitDefaults = [
 	adminPassword: '',
-	commentsRepoUrl: '',
+	gitHost: '', // excluding protocol
+	commentsRepoUrl: '', // part after gitHost
 	gitUsername: '',
 	gitEmail: '',
 	gitPassword: ''
@@ -59,7 +60,7 @@ task copySources {
 		copy {
 			from file("${projectDir}/config.json")
 			into file(buildDir)
-			expand(commentsRepoUrl: commentsRepoUrl, adminPassword: adminPassword)
+			expand(commentsRepoUrl: commentsRepoUrl, adminPassword: adminPassword, gitHost: gitHost)
 		}
 
 		copy {

+ 5 - 4
config.json

@@ -1,26 +1,27 @@
 {
 	"server": {
 		"adminPassword": "${adminPassword}",
-		"commentsRepoUrl": "http://${commentsRepoUrl}"
+		"gitHost": "http://${gitHost}",
+		"commentsRepoUrl": "http://${gitHost}/${commentsRepoUrl}"
 	},
 	"sources": {
 		"assetsDir": ".doczilla_js_docs",
 		"repos": [
 			{
 				"name": "org.zenframework.z8",
-				"url": "http://192.168.0.177:3000/z8/org.zenframework.z8",
+				"url": "http://${gitHost}/z8/org.zenframework.z8",
 				"sparseCheckout": "org.zenframework.z8.js",
 				"collectFrom": "org.zenframework.z8.js/src/js"
 			},
 			{
 				"name": "ru.morpher.js",
-				"url": "http://192.168.0.177:3000/doczilla/ru.morpher.js",
+				"url": "http://${gitHost}/doczilla/ru.morpher.js",
 				"sparseCheckout": "src/js",
 				"collectFrom": "src/js"
 			},
 			{
 				"name": "pro.doczilla.base.js",
-				"url": "http://192.168.0.177:3000/doczilla/pro.doczilla.base.js",
+				"url": "http://${gitHost}/doczilla/pro.doczilla.base.js",
 				"sparseCheckout": "src/js",
 				"collectFrom": "src/js"
 			}

+ 3 - 0
src/index.ts

@@ -13,6 +13,7 @@ class ServerApp {
 	public static SourcesUpdating = false;
 	public static Server: Server | null = null;
 	public static WebSocketUrl: string = '/ws';
+	public static GitHost: string = '';
 
 	public static getWebSocketConnections(): Set<WS> | null {
 		return ServerApp.Server?.getWsConnections(ServerApp.WebSocketUrl) || null;
@@ -46,6 +47,8 @@ class ServerApp {
 
 		CommentsManager.init(path.resolve(`${os.homedir()}/${SourcesConfig.assetsDir}/comments`), ServerConfig.commentsRepoUrl);
 
+		ServerApp.GitHost = ServerConfig.gitHost;
+
 		new Server({
 			port: 9080,
 			routesPath: path.resolve(__dirname, './routes'),

+ 2 - 1
src/routes/PostAuthorize.ts

@@ -2,13 +2,14 @@ import { HttpMethod, Route, StatusCodes } from 'org.crazydoctor.expressts';
 import { Request, Response } from 'express';
 import { ISession } from '../session/ISession';
 import SHA256 from '../util/SHA256';
+import ServerApp from '..';
 
 class PostAuthorize extends Route {
 	private AdminLogin = 'Admin';
 
 	private async tryGogsAuth(login: string, password: string): Promise<boolean> {
 		try {
-			const response = await fetch(`https://git.doczilla.pro/api/v1/users/${login}/tokens`, {
+			const response = await fetch(`${ServerApp.GitHost}/api/v1/users/${login}/tokens`, {
 				method: 'GET',
 				headers: {
 					'Content-Type': 'application/json',