diff --git a/src/modules/api/api.ts b/src/modules/api/api.ts index abc36e8..8a0de17 100644 --- a/src/modules/api/api.ts +++ b/src/modules/api/api.ts @@ -47,20 +47,12 @@ const moduleName = 'API' // stuff gotten from server.js let userDB: Database -let url: string let httpServer: http.Server let httpsServer: https.Server function GetApp(): ModuleType { const app = express() - let domain: any = url.split('.') - domain.shift() - domain = domain.join('.') // "qmining.com" - logger.DebugLog(`Cookie domain: ${domain}`, 'cookie', 1) - - // ------------------------------------------------------------------------------------------- - app.use( express.urlencoded({ limit: '10mb', @@ -197,7 +189,6 @@ function setupSubModules( const loadedModData = mod.setup({ app: parentApp, userDB: userDB, - url: url, // only used by userManagement.ts moduleSpecificData: moduleSpecificData, httpServer: httpServer, httpsServer: httpsServer, @@ -217,7 +208,6 @@ export default { getApp: GetApp, setup: (data: SetupData): void => { userDB = data.userDB - url = data.url httpServer = data.httpServer httpsServer = data.httpsServer }, diff --git a/src/modules/api/submodules/userManagement.ts b/src/modules/api/submodules/userManagement.ts index b64ca2e..56bff1a 100644 --- a/src/modules/api/submodules/userManagement.ts +++ b/src/modules/api/submodules/userManagement.ts @@ -93,7 +93,6 @@ const validationTokenName = 'qmining' // readValidationTokenName() function setup(data: SubmoduleData): Submodule { const { app, userDB } = data - logger.DebugLog(`Cookie domain: ${constants.domain}`, 'cookie', 1) const userCount = dbtools .TableInfo(userDB, 'users') diff --git a/src/server.ts b/src/server.ts index 328edba..e6272b1 100755 --- a/src/server.ts +++ b/src/server.ts @@ -78,7 +78,6 @@ interface Module { } export interface SetupData { - url: string userDB?: Database nextdir?: string httpServer: http.Server diff --git a/src/utils/files.ts b/src/utils/files.ts index d327f34..b85b55b 100644 --- a/src/utils/files.ts +++ b/src/utils/files.ts @@ -65,7 +65,7 @@ export const validateAndSetupFiles = (): boolean => { return everythingValid } -export const publicDir = './public' +export const publicDir = './public/' export const readAndValidateFile = (file: FileDescriptor): T => { if (!file.schema) return null