diff --git a/sites/backend/package.json b/sites/backend/package.json index 73c2171fd14..039a70d5e0e 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -7,7 +7,8 @@ "test": "npx mocha tests/*.test.mjs", "initdb": "npx prisma db push", "newdb": "node ./scripts/newdb.mjs", - "rmdb": "node ./scripts/rmdb.mjs" + "rmdb": "node ./scripts/rmdb.mjs", + "prettier": "npx prettier --write 'src/*.mjs' 'tests/*.mjs'" }, "dependencies": { "@prisma/client": "4.5.0", diff --git a/sites/backend/src/config.mjs b/sites/backend/src/config.mjs index 464a30d18aa..ec9f2a0e2cf 100644 --- a/sites/backend/src/config.mjs +++ b/sites/backend/src/config.mjs @@ -30,8 +30,7 @@ const config = { expiresIn: process.env.API_JWT_EXPIRY || '36 days', }, languages: ['en', 'de', 'es', 'fr', 'nl'], - ses: { - }, + ses: {}, oauth: { github: { clientId: process.env.API_GITHUB_CLIENT_ID, @@ -165,16 +164,27 @@ export function verifyConfig() { } if (process.env.API_DUMP_CONFIG_AT_STARTUP) { - console.log("Dumping configuration:", JSON.stringify({ - ...config, - encryption: { - ...config.encryption, - key: config.encryption.key.slice(0, 4) + '[ REDACTED ]' + config.encryption.key.slice(-4), - }, - jwt: { - secretOrKey: config.jwt.secretOrKey.slice(0, 4) + '[ REDACTED ]' + config.jwt.secretOrKey.slice(-4), - } - }, null, 2)) + console.log( + 'Dumping configuration:', + JSON.stringify( + { + ...config, + encryption: { + ...config.encryption, + key: + config.encryption.key.slice(0, 4) + '[ REDACTED ]' + config.encryption.key.slice(-4), + }, + jwt: { + secretOrKey: + config.jwt.secretOrKey.slice(0, 4) + + '[ REDACTED ]' + + config.jwt.secretOrKey.slice(-4), + }, + }, + null, + 2 + ) + ) } return config diff --git a/sites/backend/src/index.mjs b/sites/backend/src/index.mjs index a4a36f73922..eb20d9f634f 100644 --- a/sites/backend/src/index.mjs +++ b/sites/backend/src/index.mjs @@ -29,7 +29,7 @@ const params = { app, passport, ...encryption(config.encryption.key), - config + config, } // Load routes for (const type in routes) routes[type](params) diff --git a/sites/backend/src/middleware.mjs b/sites/backend/src/middleware.mjs index b392006be21..09acfcfb354 100644 --- a/sites/backend/src/middleware.mjs +++ b/sites/backend/src/middleware.mjs @@ -22,7 +22,4 @@ function loadPassportMiddleware(passport, config) { ) } -export { - loadExpressMiddleware, - loadPassportMiddleware, -} +export { loadExpressMiddleware, loadPassportMiddleware } diff --git a/sites/backend/tests/user.test.mjs b/sites/backend/tests/user.test.mjs index 95d4866746d..e96597ac5a9 100644 --- a/sites/backend/tests/user.test.mjs +++ b/sites/backend/tests/user.test.mjs @@ -7,7 +7,6 @@ const expect = chai.expect chai.use(http) describe('Non language-specific User controller signup routes', () => { - it('Should return 400 on signup without body', (done) => { chai .request(config.api) @@ -23,14 +22,20 @@ describe('Non language-specific User controller signup routes', () => { let data = { email: 'test@freesewing.org', language: 'en', - password: 'one two one two, this is just a test' + password: 'one two one two, this is just a test', } - Object.keys(data).map(key => { + Object.keys(data).map((key) => { it(`Should not create signup without ${key}`, (done) => { chai .request(config.api) .post('/signup') - .send(Object.fromEntries(Object.keys(data).filter(name => name !== key).map(name => [name, data[name]]))) + .send( + Object.fromEntries( + Object.keys(data) + .filter((name) => name !== key) + .map((name) => [name, data[name]]) + ) + ) .end((err, res) => { expect(err === null).to.equal(true) expect(res.status).to.equal(400) @@ -50,7 +55,7 @@ describe('Non language-specific User controller signup routes', () => { done() }) }) -/* + /* it('should not create signup without language', (done) => { chai