Skip to content

Commit

Permalink
Move config to import
Browse files Browse the repository at this point in the history
  • Loading branch information
J12934 committed May 6, 2023
1 parent 08bbec0 commit b66f0fd
Show file tree
Hide file tree
Showing 18 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion data/datacreator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import { UserModel } from '../models/user'
import { WalletModel } from '../models/wallet'
import { Address, Card, Challenge, Delivery, Memory, Product, SecurityQuestion, User } from './types'
import logger from '../lib/logger'
import config from 'config'
const datacache = require('./datacache')
const config = require('config')
const utils = require('../lib/utils')
const mongodb = require('./mongodb')
const security = require('../lib/insecurity')
Expand Down
2 changes: 1 addition & 1 deletion lib/challengeUtils.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Op } from 'sequelize'
import { ChallengeModel } from '../models/challenge'
import logger from './logger'
import config from 'config'

const colors = require('colors/safe')
const config = require('config')
const challenges = require('../data/datacache').challenges
const notifications = require('../data/datacache').notifications
const sanitizeHtml = require('sanitize-html')
Expand Down
2 changes: 1 addition & 1 deletion lib/startup/customizeApplication.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import fs = require('fs')
const config = require('config')
import config from 'config'
const replace = require('replace')
const utils = require('../utils')

Expand Down
2 changes: 1 addition & 1 deletion lib/startup/validateConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import process = require('process')
import { Memory, Product } from '../../data/types'
import logger from '../logger'
const config = require('config')
import config from 'config'
const colors = require('colors/safe')
const path = require('path')
const validateSchema = require('yaml-schema-validator/src')
Expand Down
2 changes: 1 addition & 1 deletion lib/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import packageJson from '../package.json'
import fs = require('fs')
import logger from './logger'
import config from 'config'

const jsSHA = require('jssha')
const config = require('config')
const download = require('download')
const crypto = require('crypto')
const clarinet = require('clarinet')
Expand Down
2 changes: 1 addition & 1 deletion lib/webhook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

import request = require('request')
import logger from './logger'
import config from 'config'
const { promisify } = require('util')
const colors = require('colors/safe')
const antiCheat = require('./antiCheat')
const utils = require('./utils')
const os = require('os')
const config = require('config')
const post = promisify(request.post)

export const notify = async (challenge: { key: any, name: any }, cheatScore = -1, webhook = process.env.SOLUTIONS_WEBHOOK) => {
Expand Down
2 changes: 1 addition & 1 deletion routes/chatbot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import { UserModel } from '../models/user'
import { JwtPayload, VerifyErrors } from 'jsonwebtoken'
import challengeUtils = require('../lib/challengeUtils')
import logger from '../lib/logger'
import config from 'config'

const { Bot } = require('juicy-chat-bot')
const security = require('../lib/insecurity')
const jwt = require('jsonwebtoken')
const utils = require('../lib/utils')
const botUtils = require('../lib/botUtils')
const config = require('config')
const download = require('download')
const challenges = require('../data/datacache').challenges

Expand Down
2 changes: 1 addition & 1 deletion routes/login.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import { User } from '../data/types'
import { BasketModel } from '../models/basket'
import { UserModel } from '../models/user'
import challengeUtils = require('../lib/challengeUtils')
import config from 'config'

const utils = require('../lib/utils')
const security = require('../lib/insecurity')
const challenges = require('../data/datacache').challenges
const users = require('../data/datacache').users
const config = require('config')

// vuln-code-snippet start loginAdminChallenge loginBenderChallenge loginJimChallenge
module.exports = function login () {
Expand Down
2 changes: 1 addition & 1 deletion routes/metrics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { ComplaintModel } from '../models/complaint'
import { Op } from 'sequelize'
import challengeUtils = require('../lib/challengeUtils')
import logger from '../lib/logger'
import config from 'config'

const Prometheus = require('prom-client')
const onFinished = require('on-finished')
Expand All @@ -22,7 +23,6 @@ const challenges = require('../data/datacache').challenges
const utils = require('../lib/utils')
const antiCheat = require('../lib/antiCheat')
const accuracy = require('../lib/accuracy')
const config = require('config')

const register = Prometheus.register

Expand Down
2 changes: 1 addition & 1 deletion routes/order.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ import { QuantityModel } from '../models/quantity'
import { DeliveryModel } from '../models/delivery'
import { WalletModel } from '../models/wallet'
import challengeUtils = require('../lib/challengeUtils')
import config from 'config'

const fs = require('fs')
const PDFDocument = require('pdfkit')
const utils = require('../lib/utils')
const security = require('../lib/insecurity')
const products = require('../data/datacache').products
const challenges = require('../data/datacache').challenges
const config = require('config')
const db = require('../data/mongodb')

interface Product{
Expand Down
2 changes: 1 addition & 1 deletion routes/userProfile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import { Request, Response, NextFunction } from 'express'

import { UserModel } from '../models/user'
import challengeUtils = require('../lib/challengeUtils')
import config from 'config'
const utils = require('../lib/utils')
const security = require('../lib/insecurity')
const challenges = require('../data/datacache').challenges
const pug = require('pug')
const config = require('config')
const themes = require('../views/themes/themes').themes
const Entities = require('html-entities').AllHtmlEntities
const entities = new Entities()
Expand Down
2 changes: 1 addition & 1 deletion routes/verify.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { FeedbackModel } from '../models/feedback'
import { ComplaintModel } from '../models/complaint'
import { Op } from 'sequelize'
import challengeUtils = require('../lib/challengeUtils')
import config from 'config'

const utils = require('../lib/utils')
const security = require('../lib/insecurity')
Expand All @@ -18,7 +19,6 @@ const jws = require('jws')
const cache = require('../data/datacache')
const challenges = cache.challenges
const products = cache.products
const config = require('config')

exports.emptyUserRegistration = () => (req: Request, res: Response, next: NextFunction) => {
challengeUtils.solveIf(challenges.emptyUserRegistration, () => {
Expand Down
2 changes: 1 addition & 1 deletion routes/videoHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import fs = require('fs')
import { Request, Response } from 'express'
import challengeUtils = require('../lib/challengeUtils')
import config from 'config'

const pug = require('pug')
const config = require('config')
const challenges = require('../data/datacache').challenges
const utils = require('../lib/utils')
const themes = require('../views/themes/themes').themes
Expand Down
2 changes: 1 addition & 1 deletion server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { FeedbackModel } from './models/feedback'
import { ProductModel } from './models/product'
import { WalletModel } from './models/wallet'
import logger from './lib/logger'
import config from 'config'

const startTime = Date.now()
const path = require('path')
Expand Down Expand Up @@ -102,7 +103,6 @@ const updateUserProfile = require('./routes/updateUserProfile')
const videoHandler = require('./routes/videoHandler')
const twoFactorAuth = require('./routes/2fa')
const languageList = require('./routes/languages')
const config = require('config')
const imageCaptcha = require('./routes/imageCaptcha')
const dataExport = require('./routes/dataExport')
const address = require('./routes/address')
Expand Down
2 changes: 1 addition & 1 deletion test/server/appVersionSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import sinon = require('sinon')
const config = require('config')
import config from 'config'
const chai = require('chai')
const sinonChai = require('sinon-chai')
const expect = chai.expect
Expand Down
2 changes: 1 addition & 1 deletion test/server/blueprintSpec.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import chai = require('chai')
import config from 'config'
const sinonChai = require('sinon-chai')
const expect = chai.expect
chai.use(sinonChai)
const config = require('config')
const fs = require('fs')
const path = require('path')
const ExifImage = require('exif').ExifImage
Expand Down
2 changes: 1 addition & 1 deletion test/server/countryMappingSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import sinon = require('sinon')
const config = require('config')
import config from 'config'
const chai = require('chai')
const sinonChai = require('sinon-chai')
const expect = chai.expect
Expand Down
2 changes: 1 addition & 1 deletion test/server/verifySpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
*/

import sinon = require('sinon')
import config from 'config'
const chai = require('chai')
const sinonChai = require('sinon-chai')
const expect = chai.expect
chai.use(sinonChai)
const cache = require('../../data/datacache')
const security = require('../../lib/insecurity')
const config = require('config')
const utils = require('../../lib/utils')

describe('verify', () => {
Expand Down

0 comments on commit b66f0fd

Please sign in to comment.