dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-30 23:13:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
Jan Prochazka
2021-12-26 13:37:00 +01:00
parent 576987ad8c
commit 22295ceef2
3 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/api/src/main.js
View File

@@ -4,11 +4,8 @@ const bodyParser = require('body-parser');
const fileUpload = require('express-fileupload'); const fileUpload = require('express-fileupload');
const http = require('http'); const http = require('http');
const cors = require('cors'); const cors = require('cors');
const fs = require('fs');
const getPort = require('get-port'); const getPort = require('get-port');
const childProcessChecker = require('./utility/childProcessChecker');
const path = require('path'); const path = require('path');
const crypto = require('crypto');
const useController = require('./utility/useController'); const useController = require('./utility/useController');
const socket = require('./utility/socket'); const socket = require('./utility/socket');
@@ -30,10 +27,7 @@ const queryHistory = require('./controllers/queryHistory');
const { rundir } = require('./utility/directories'); const { rundir } = require('./utility/directories');
const platformInfo = require('./utility/platformInfo'); const platformInfo = require('./utility/platformInfo');
const processArgs = require('./utility/processArgs');
const timingSafeCheckToken = require('./utility/timingSafeCheckToken');
let authorization = null;
let checkLocalhostOrigin = null; let checkLocalhostOrigin = null;
function start() { function start() {
@@ -56,9 +50,6 @@ function start() {
} }
app.use(function (req, res, next) { app.use(function (req, res, next) {
if (authorization && !timingSafeCheckToken(req.headers.authorization, authorization)) {
return res.status(403).json({ error: 'Not authorized!' });
}
if (checkLocalhostOrigin) { if (checkLocalhostOrigin) {
if ( if (
req.headers.origin && req.headers.origin &&
@@ -121,7 +112,7 @@ function start() {
} }
} }
if (platformInfo.isNpmDist) { if (platformInfo.isNpmDist) {
app.use(express.static(path.join(__dirname, '../../dbgate-web/public'))); app.use(express.static(path.join(__dirname, '../../dbgate-web/public')));
getPort({ port: 5000 }).then(port => { getPort({ port: 5000 }).then(port => {
server.listen(port, () => { server.listen(port, () => {
@@ -129,7 +120,9 @@ if (platformInfo.isNpmDist) {
}); });
}); });
} else { } else {
server.listen(process.env.PORT || 3000); const port = process.env.PORT || 3000;
console.log('DbGate API listening on port', port);
server.listen(port);
} }
} }

4
packages/web/src/utility/getElectron.ts
View File

@@ -1,11 +1,7 @@
class ElectronApi { class ElectronApi {
// public port?: number;
// public authorization?: string;
private ipcRenderer = getIpcRenderer(); private ipcRenderer = getIpcRenderer();
constructor() { constructor() {
// this.port = args.port;
// this.authorization = args.authorization;
} }
send(msg, args = null) { send(msg, args = null) {

11
packages/web/src/utility/resolveApi.ts
View File

@@ -6,11 +6,6 @@ try {
} catch {} } catch {}
export default function resolveApi() { export default function resolveApi() {
const electron = getElectron();
if (electron?.port) {
return `http://localhost:${electron.port}`;
}
if (apiUrl) { if (apiUrl) {
return apiUrl; return apiUrl;
} }
@@ -20,11 +15,5 @@ export default function resolveApi() {
export function resolveApiHeaders() { export function resolveApiHeaders() {
const electron = getElectron(); const electron = getElectron();
if (electron?.authorization) {
return {
Authorization: electron.authorization,
};
}
return {}; return {};
} }