diff --git a/package-lock.json b/package-lock.json index 93e5c72d5..44664d5f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -86,6 +86,7 @@ "@types/express": "^5.0.4", "@types/i18n": "^0.13.12", "@types/jasmine": "2.5.38", + "@types/jsonwebtoken": "^9.0.10", "@types/node": "^18.19.130", "@types/passport": "^1.0.17", "@types/request-promise": "^4.1.51", @@ -5292,6 +5293,17 @@ "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", "license": "MIT" }, + "node_modules/@types/jsonwebtoken": { + "version": "9.0.10", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.10.tgz", + "integrity": "sha512-asx5hIG9Qmf/1oStypjanR7iKTv0gXQ1Ov/jfrX6kS/EO0OFni8orbmGCn0672NHR3kXHwpAwR+B368ZGN/2rA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/ms": "*", + "@types/node": "*" + } + }, "node_modules/@types/lodash": { "version": "4.17.20", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz", diff --git a/package.json b/package.json index 52c5b83d3..38575d79c 100644 --- a/package.json +++ b/package.json @@ -139,6 +139,7 @@ "@types/express": "^5.0.4", "@types/i18n": "^0.13.12", "@types/jasmine": "2.5.38", + "@types/jsonwebtoken": "^9.0.10", "@types/node": "^18.19.130", "@types/passport": "^1.0.17", "@types/request-promise": "^4.1.51", diff --git a/src/app/controllers/webhooks/webhook-github.js b/src/app/controllers/webhooks/webhook-github.ts similarity index 95% rename from src/app/controllers/webhooks/webhook-github.js rename to src/app/controllers/webhooks/webhook-github.ts index 062188e0f..fe86f20e6 100644 --- a/src/app/controllers/webhooks/webhook-github.js +++ b/src/app/controllers/webhooks/webhook-github.ts @@ -3,17 +3,18 @@ if (process.env.NODE_ENV !== 'production') { require('dotenv').config() } -const i18n = require('i18n') +import i18n from 'i18n' const dateFormat = require('dateformat') -const moment = require('moment') +import moment from 'moment' const models = require('../../../models') const constants = require('../../../modules/mail/constants') const TaskMail = require('../../../modules/mail/task') const SendMail = require('../../../modules/mail/mail') const IssueClosedMail = require('../../../modules/mail/issueClosed') +import type { Request, Response } from 'express' -exports.github = async (req, res) => { - const response = req.body || res.body +export const github = async (req: Request, res: Response) => { + const response = req.body || (res as any).body const labels = response && response.issue && response.issue.labels if (req.headers.authorization === `Bearer ${process.env.GITHUB_WEBHOOK_APP_TOKEN}`) { // below would update issue status if someone updates it on Github @@ -55,9 +56,9 @@ exports.github = async (req, res) => { } if (response.action === 'labeled') { try { - const totalLabelResponse = [] + const totalLabelResponse: any[] = [] await Promise.all( - labels.map(async (label) => { + labels.map(async (label: any) => { let persistedLabel = await models.Label.findOne({ where: { name: label.name @@ -70,7 +71,7 @@ exports.github = async (req, res) => { } const labelId = persistedLabel.dataValues.id if (label.name === 'notify') { - let finalResponse = {} + let finalResponse: any = {} try { console.log('it is labeled notify') const user = await models.User.findOne({ @@ -155,7 +156,7 @@ exports.github = async (req, res) => { if (label.name === 'gitpay') { // eslint-disable-next-line no-console console.log('it is labeled Gitpay') - let finalResponse = {} + let finalResponse: any = {} try { const user = await models.User.findOne({ where: { diff --git a/src/app/index.js b/src/app/index.ts similarity index 57% rename from src/app/index.js rename to src/app/index.ts index 233cf44f1..335cbe4e5 100644 --- a/src/app/index.js +++ b/src/app/index.ts @@ -1,35 +1,35 @@ -const express = require('express') -require('../models') - -const routerProject = require('./routes/projects') -const routerTask = require('./routes/tasks') -const routerTeam = require('./routes/team') -const routerOrder = require('./routes/orders') -const routerWebhook = require('./routes/webhooks') -const routerInfo = require('./routes/info') -const routerOrganization = require('./routes/organization') -const routerContact = require('./routes/contact') -const routerTypes = require('./routes/types') -const routerTaskSolution = require('./routes/taskSolutions') -const routerCoupon = require('./routes/coupon') -const routerLabel = require('./routes/label') -const routerOffer = require('./routes/offer') -const routerTransfer = require('./routes/transfer') -const routerPayout = require('./routes/payout') -const routerWallet = require('./routes/wallet') -const routerWalletOrder = require('./routes/walletOrder') -const routerLanguage = require('./routes/language') -const routerPaymentRequest = require('./routes/paymentRequest') -const routerPaymentRequestTransfer = require('./routes/paymentRequestTransfer') +import express from 'express' +import '../models' +import routerProject from './routes/projects' +import routerTask from './routes/tasks' +import routerTeam from './routes/team' +import routerOrder from './routes/orders' +import routerWebhook from './routes/webhooks' +import routerInfo from './routes/info' +import routerOrganization from './routes/organization' +import routerContact from './routes/contact' +import routerTypes from './routes/types' +import routerTaskSolution from './routes/taskSolutions' +import routerCoupon from './routes/coupon' +import routerLabel from './routes/label' +import routerOffer from './routes/offer' +import routerTransfer from './routes/transfer' +import routerPayout from './routes/payout' +import routerWallet from './routes/wallet' +import routerWalletOrder from './routes/walletOrder' +import routerLanguage from './routes/language' +import routerPaymentRequest from './routes/paymentRequest' +import routerPaymentRequestTransfer from './routes/paymentRequestTransfer' import routerAuth from './routes/auth' import routerUsers from './routes/users' import routerUser from './routes/user' import routerPaymentRequestPayments from './routes/paymentRequestPayment' import routerPaymentRequestBalance from './routes/paymentRequestBalance' import routerDashboard from './routes/dashboard' +import type { Express } from 'express' -exports.init = (app) => { +export const init = (app: Express) => { app.use('/webhooks', express.raw({ type: 'application/json' }), routerWebhook) app.use(express.json()) diff --git a/src/app/routes/contact.js b/src/app/routes/contact.js deleted file mode 100644 index 3527d7409..000000000 --- a/src/app/routes/contact.js +++ /dev/null @@ -1,7 +0,0 @@ -const express = require('express') -const router = express.Router() -const controllers = require('../controllers/contact') - -router.post('/recruiters', controllers.contactRecruiters) - -module.exports = router diff --git a/src/app/routes/contact.ts b/src/app/routes/contact.ts new file mode 100644 index 000000000..510e4b4a0 --- /dev/null +++ b/src/app/routes/contact.ts @@ -0,0 +1,8 @@ +import express from 'express' +import * as controllers from '../controllers/contact' + +const router = express.Router() + +router.post('/recruiters', controllers.contactRecruiters) + +export default router diff --git a/src/app/routes/coupon.js b/src/app/routes/coupon.js deleted file mode 100644 index 47fb1043e..000000000 --- a/src/app/routes/coupon.js +++ /dev/null @@ -1,11 +0,0 @@ -const express = require('express') -const router = express.Router() -require('../../modules/authenticationHelpers') -const controllers = require('../controllers/coupon') -const secure = require('./secure') - -router.use(secure) - -router.post('/validate', controllers.validateCoupon) - -module.exports = router diff --git a/src/app/routes/coupon.ts b/src/app/routes/coupon.ts new file mode 100644 index 000000000..338c8146d --- /dev/null +++ b/src/app/routes/coupon.ts @@ -0,0 +1,12 @@ +import express from 'express' +import '../../modules/authenticationHelpers' +import * as controllers from '../controllers/coupon' +import secure from './secure' + +const router = express.Router() + +router.use(secure) + +router.post('/validate', controllers.validateCoupon) + +export default router diff --git a/src/app/routes/info.js b/src/app/routes/info.js deleted file mode 100644 index 10699cd11..000000000 --- a/src/app/routes/info.js +++ /dev/null @@ -1,9 +0,0 @@ -const express = require('express') -const router = express.Router() -require('../../models') -require('../../modules/authenticationHelpers') -const controllers = require('../controllers/info') - -router.get('/all', controllers.info) - -module.exports = router diff --git a/src/app/routes/info.ts b/src/app/routes/info.ts new file mode 100644 index 000000000..5d8a2a227 --- /dev/null +++ b/src/app/routes/info.ts @@ -0,0 +1,10 @@ +import express from 'express' +import '../../models' +import '../../modules/authenticationHelpers' +import * as controllers from '../controllers/info' + +const router = express.Router() + +router.get('/all', controllers.info) + +export default router diff --git a/src/app/routes/label.js b/src/app/routes/label.js deleted file mode 100644 index f59d02a40..000000000 --- a/src/app/routes/label.js +++ /dev/null @@ -1,8 +0,0 @@ -const express = require('express') -const router = express.Router() -require('../../modules/authenticationHelpers') -const controllers = require('../controllers/label') - -router.get('/search', controllers.labelSearchController) - -module.exports = router diff --git a/src/app/routes/label.ts b/src/app/routes/label.ts new file mode 100644 index 000000000..b5a389b70 --- /dev/null +++ b/src/app/routes/label.ts @@ -0,0 +1,9 @@ +import express from 'express' +import '../../modules/authenticationHelpers' +import * as controllers from '../controllers/label' + +const router = express.Router() + +router.get('/search', controllers.labelSearchController) + +export default router diff --git a/src/app/routes/language.js b/src/app/routes/language.ts similarity index 50% rename from src/app/routes/language.js rename to src/app/routes/language.ts index 501daa898..186dfe5ce 100644 --- a/src/app/routes/language.js +++ b/src/app/routes/language.ts @@ -1,9 +1,10 @@ -const express = require('express') +import express from 'express' +import '../../modules/authenticationHelpers' +import * as controllers from '../controllers/language' + const router = express.Router() -require('../../modules/authenticationHelpers') -const controllers = require('../controllers/language') router.get('/search', controllers.languageSearchController) router.get('/task/search', controllers.projectLanguageSearchController) -module.exports = router +export default router diff --git a/src/app/routes/offer.js b/src/app/routes/offer.js deleted file mode 100644 index 0946b44c4..000000000 --- a/src/app/routes/offer.js +++ /dev/null @@ -1,11 +0,0 @@ -const express = require('express') -const router = express.Router() -require('../../modules/authenticationHelpers') - -const controllers = require('../controllers/offer') -const secure = require('./secure') - -router.use(secure) -router.put('/:id', controllers.updateOffer) - -module.exports = router diff --git a/src/app/routes/offer.ts b/src/app/routes/offer.ts new file mode 100644 index 000000000..0029cc201 --- /dev/null +++ b/src/app/routes/offer.ts @@ -0,0 +1,11 @@ +import express from 'express' +import '../../modules/authenticationHelpers' +import * as controllers from '../controllers/offer' +import secure from './secure' + +const router = express.Router() + +router.use(secure) +router.put('/:id', controllers.updateOffer) + +export default router diff --git a/src/app/routes/orders.js b/src/app/routes/orders.ts similarity index 71% rename from src/app/routes/orders.js rename to src/app/routes/orders.ts index bf3a69b5d..b6c3ab794 100644 --- a/src/app/routes/orders.js +++ b/src/app/routes/orders.ts @@ -1,10 +1,11 @@ -const express = require('express') +import express from 'express' +import 'passport' +import secure from './secure' +import '../../modules/authenticationHelpers' +import '../../models' +import * as controllers from '../controllers/order' + const router = express.Router() -require('passport') -const secure = require('./secure') -require('../../modules/authenticationHelpers') -require('../../models') -const controllers = require('../controllers/order') router.get('/authorize', controllers.authorizeOrder) @@ -20,4 +21,4 @@ router.post('/:id/cancel', controllers.cancelOrder) router.post('/:id/payments', controllers.paymentOrder) router.put('/:id', controllers.updateOrder) -module.exports = router +export default router diff --git a/src/app/routes/organization.js b/src/app/routes/organization.ts similarity index 52% rename from src/app/routes/organization.js rename to src/app/routes/organization.ts index 4b96205e7..ea3d55f55 100644 --- a/src/app/routes/organization.js +++ b/src/app/routes/organization.ts @@ -1,16 +1,17 @@ -const express = require('express') +import express from 'express' +import 'passport' +import '../../modules/authenticationHelpers' +import '../../models' +import * as controllers from '../controllers/organization' +import secure from './secure' + const router = express.Router() -require('passport') -require('../../modules/authenticationHelpers') -require('../../models') -const controllers = require('../controllers/organization') router.get('/list', controllers.listOrganizations) router.get('/fetch/:id', controllers.fetchOrganization) -const secure = require('./secure') router.use(secure) router.post('/create', controllers.createOrganization) router.put('/update', controllers.updateOrganization) -module.exports = router +export default router diff --git a/src/app/routes/paymentRequest.js b/src/app/routes/paymentRequest.ts similarity index 50% rename from src/app/routes/paymentRequest.js rename to src/app/routes/paymentRequest.ts index 6ca98e672..7512df1a3 100644 --- a/src/app/routes/paymentRequest.js +++ b/src/app/routes/paymentRequest.ts @@ -1,12 +1,13 @@ -const express = require('express') +import express from 'express' +import '../../modules/authenticationHelpers' +import secure from './secure' +import * as controllers from '../controllers/payment-request' + const router = express.Router() -require('../../modules/authenticationHelpers') -const secure = require('./secure') -const controllers = require('../controllers/payment-request') router.use(secure) router.post('/', controllers.createPaymentRequest) router.get('/', controllers.listPaymentRequests) router.put('/:id', controllers.updatePaymentRequest) -module.exports = router +export default router diff --git a/src/app/routes/paymentRequestTransfer.js b/src/app/routes/paymentRequestTransfer.ts similarity index 62% rename from src/app/routes/paymentRequestTransfer.js rename to src/app/routes/paymentRequestTransfer.ts index 5ab3eba21..bb4f312e3 100644 --- a/src/app/routes/paymentRequestTransfer.js +++ b/src/app/routes/paymentRequestTransfer.ts @@ -1,8 +1,9 @@ -const express = require('express') +import express from 'express' +import secure from './secure' +import '../../modules/authenticationHelpers' +import * as controllers from '../controllers/payment-request-transfer' + const router = express.Router() -const secure = require('./secure') -require('../../modules/authenticationHelpers') -const controllers = require('../controllers/payment-request-transfer') router.use(secure) router.post('/', controllers.createPaymentRequestTransfer) @@ -11,4 +12,4 @@ router.put('/:id', controllers.updatePaymentRequestTransfer) //router.get('/search', controllers.searchPaymentRequestTransfer) //router.get('/:id', controllers.fetchPaymentRequestTransfer) -module.exports = router +export default router diff --git a/src/app/routes/payout.js b/src/app/routes/payout.ts similarity index 50% rename from src/app/routes/payout.js rename to src/app/routes/payout.ts index a7ed9455a..a5bc0729d 100644 --- a/src/app/routes/payout.js +++ b/src/app/routes/payout.ts @@ -1,12 +1,13 @@ -const express = require('express') +import express from 'express' +import secure from './secure' +import '../../modules/authenticationHelpers' +import * as controllers from '../controllers/payout' + const router = express.Router() -const secure = require('./secure') -require('../../modules/authenticationHelpers') -const controllers = require('../controllers/payout') router.use(secure) router.post('/create', controllers.createPayout) router.post('/request', controllers.requestPayout) router.get('/search', controllers.searchPayout) -module.exports = router +export default router diff --git a/src/app/routes/projects.js b/src/app/routes/projects.js deleted file mode 100644 index d807c9073..000000000 --- a/src/app/routes/projects.js +++ /dev/null @@ -1,9 +0,0 @@ -const express = require('express') -const router = express.Router() -require('../../modules/authenticationHelpers') -const controllers = require('../controllers/project') - -router.get('/fetch/:id', controllers.fetchProject) -router.get('/list', controllers.listProjects) - -module.exports = router diff --git a/src/app/routes/projects.ts b/src/app/routes/projects.ts new file mode 100644 index 000000000..b995c3d43 --- /dev/null +++ b/src/app/routes/projects.ts @@ -0,0 +1,10 @@ +import express from 'express' +import '../../modules/authenticationHelpers' +import * as controllers from '../controllers/project' + +const router = express.Router() + +router.get('/fetch/:id', controllers.fetchProject) +router.get('/list', controllers.listProjects) + +export default router diff --git a/src/app/routes/secure.js b/src/app/routes/secure.ts similarity index 64% rename from src/app/routes/secure.js rename to src/app/routes/secure.ts index 02ca07ef0..c31f71a16 100644 --- a/src/app/routes/secure.js +++ b/src/app/routes/secure.ts @@ -1,7 +1,8 @@ -const jwt = require('jsonwebtoken') -const { userExists } = require('../../modules/users') +import jwt from 'jsonwebtoken' +import { userExists } from '../../modules/users' +import type { Request, Response, NextFunction } from 'express' -module.exports = (req, res, next) => { +export default (req: Request, res: Response, next: NextFunction) => { // CORS preflight request if (req.method === 'OPTIONS') { next() @@ -14,16 +15,16 @@ module.exports = (req, res, next) => { if (!token) return res.status(403).send({ errors: ['No token provided'] }) - jwt.verify(token, process.env.SECRET_PHRASE, async (err, decoded) => { + jwt.verify(token, process.env.SECRET_PHRASE as string, async (err: any, decoded: any) => { if (err) return res.status(403).send({ errors: ['Failed to authenticate token'] }) - req.decoded = decoded + ;(req as any).decoded = decoded try { const user = await userExists(decoded) if (!user) { return res.status(403).send({ errors: ['User not found'] }) } - req.user = user + ;(req as any).user = user next() } catch (e) { return next(e) diff --git a/src/app/routes/taskSolutions.js b/src/app/routes/taskSolutions.ts similarity index 56% rename from src/app/routes/taskSolutions.js rename to src/app/routes/taskSolutions.ts index 44c39eac9..7f3edc1cd 100644 --- a/src/app/routes/taskSolutions.js +++ b/src/app/routes/taskSolutions.ts @@ -1,8 +1,9 @@ -const express = require('express') +import express from 'express' +import '../../modules/authenticationHelpers' +import * as controllers from '../controllers/taskSolution' +import secure from './secure' + const router = express.Router() -require('../../modules/authenticationHelpers') -const controllers = require('../controllers/taskSolution') -const secure = require('./secure') router.use(secure) @@ -11,4 +12,4 @@ router.get('/fetch', controllers.fetchPullRequestData) router.post('/create', controllers.createTaskSolution) router.patch('/:id', controllers.updateTaskSolution) -module.exports = router +export default router diff --git a/src/app/routes/tasks.js b/src/app/routes/tasks.ts similarity index 85% rename from src/app/routes/tasks.js rename to src/app/routes/tasks.ts index 750c7a5c6..071c7923b 100644 --- a/src/app/routes/tasks.js +++ b/src/app/routes/tasks.ts @@ -1,8 +1,9 @@ -const express = require('express') +import express from 'express' +import '../../modules/authenticationHelpers' +import * as controllers from '../controllers/task' +import secure from './secure' + const router = express.Router() -require('../../modules/authenticationHelpers') -const controllers = require('../controllers/task') -const secure = require('./secure') router.get('/fetch/:id', controllers.fetchTask) router.get('/:id/sync/:field', controllers.syncTask) @@ -26,4 +27,4 @@ router.put('/:id/assignment/remove', controllers.removeAssignedUser) router.put('/assignment/request', controllers.assignedUser) router.post('/assignment/request', controllers.requestAssignedUser) -module.exports = router +export default router diff --git a/src/app/routes/team.js b/src/app/routes/team.js deleted file mode 100644 index bf2827917..000000000 --- a/src/app/routes/team.js +++ /dev/null @@ -1,7 +0,0 @@ -const express = require('express') -const router = express.Router() -const controllers = require('../controllers/team') - -router.post('/core/join', controllers.requestJoinCoreTeamController) - -module.exports = router diff --git a/src/app/routes/team.ts b/src/app/routes/team.ts new file mode 100644 index 000000000..cdce42352 --- /dev/null +++ b/src/app/routes/team.ts @@ -0,0 +1,8 @@ +import express from 'express' +import * as controllers from '../controllers/team' + +const router = express.Router() + +router.post('/core/join', controllers.requestJoinCoreTeamController) + +export default router diff --git a/src/app/routes/transfer.js b/src/app/routes/transfer.ts similarity index 59% rename from src/app/routes/transfer.js rename to src/app/routes/transfer.ts index 0667ae9c2..4d83cebaf 100644 --- a/src/app/routes/transfer.js +++ b/src/app/routes/transfer.ts @@ -1,11 +1,12 @@ -const express = require('express') +import express from 'express' +import '../../modules/authenticationHelpers' +import * as controllers from '../controllers/transfer' + const router = express.Router() -require('../../modules/authenticationHelpers') -const controllers = require('../controllers/transfer') router.post('/create', controllers.createTransfer) router.get('/search', controllers.searchTransfer) router.put('/update', controllers.updateTransfer) router.get('/fetch/:id', controllers.fetchTransfer) -module.exports = router +export default router diff --git a/src/app/routes/types.js b/src/app/routes/types.js deleted file mode 100644 index 4adb7aeb9..000000000 --- a/src/app/routes/types.js +++ /dev/null @@ -1,8 +0,0 @@ -const express = require('express') -const router = express.Router() -require('../../modules/authenticationHelpers') -const controllers = require('../controllers/type') - -router.get('/search', controllers.typeSearchController) - -module.exports = router diff --git a/src/app/routes/types.ts b/src/app/routes/types.ts new file mode 100644 index 000000000..c23037195 --- /dev/null +++ b/src/app/routes/types.ts @@ -0,0 +1,9 @@ +import express from 'express' +import '../../modules/authenticationHelpers' +import * as controllers from '../controllers/type' + +const router = express.Router() + +router.get('/search', controllers.typeSearchController) + +export default router diff --git a/src/app/routes/wallet.js b/src/app/routes/wallet.ts similarity index 53% rename from src/app/routes/wallet.js rename to src/app/routes/wallet.ts index bad061414..c0427b913 100644 --- a/src/app/routes/wallet.js +++ b/src/app/routes/wallet.ts @@ -1,8 +1,9 @@ -const express = require('express') +import express from 'express' +import '../../modules/authenticationHelpers' +import * as controllers from '../controllers/wallet' +import secure from './secure' + const router = express.Router() -require('../../modules/authenticationHelpers') -const controllers = require('../controllers/wallet') -const secure = require('./secure') router.use(secure) @@ -11,4 +12,4 @@ router.put('/:id', controllers.updateWallet) router.get('/', controllers.walletList) router.get('/:id', controllers.walletFetch) -module.exports = router +export default router diff --git a/src/app/routes/walletOrder.js b/src/app/routes/walletOrder.ts similarity index 55% rename from src/app/routes/walletOrder.js rename to src/app/routes/walletOrder.ts index ba35ac484..773dc67b3 100644 --- a/src/app/routes/walletOrder.js +++ b/src/app/routes/walletOrder.ts @@ -1,8 +1,9 @@ -const express = require('express') +import express from 'express' +import '../../modules/authenticationHelpers' +import * as controllers from '../controllers/walletOrder' +import secure from './secure' + const router = express.Router() -require('../../modules/authenticationHelpers') -const controllers = require('../controllers/walletOrder') -const secure = require('./secure') router.use(secure) @@ -11,4 +12,4 @@ router.put('/:id', controllers.updateWalletOrder) router.get('/', controllers.walletOrderList) router.get('/:id', controllers.walletOrderFetch) -module.exports = router +export default router diff --git a/src/app/routes/webhooks.js b/src/app/routes/webhooks.ts similarity index 73% rename from src/app/routes/webhooks.js rename to src/app/routes/webhooks.ts index 5290f9a2c..1925159be 100644 --- a/src/app/routes/webhooks.js +++ b/src/app/routes/webhooks.ts @@ -1,11 +1,12 @@ -const express = require('express') -const router = express.Router() +import express from 'express' const controllerConnect = require('../controllers/webhooks/webhook-connect') const controllerPlatform = require('../controllers/webhooks/webhook-platform') -const controllerGithub = require('../controllers/webhooks/webhook-github') +import * as controllerGithub from '../controllers/webhooks/webhook-github' + +const router = express.Router() router.post('/stripe-platform', controllerPlatform.webhookPlatform) router.post('/stripe-connect', controllerConnect.webhookConnect) router.post('/github', controllerGithub.github) -module.exports = router +export default router diff --git a/src/modules/tasks/taskClaim.ts b/src/modules/tasks/taskClaim.ts index 1976f5dd1..9f3428826 100644 --- a/src/modules/tasks/taskClaim.ts +++ b/src/modules/tasks/taskClaim.ts @@ -9,7 +9,7 @@ import jwt from 'jsonwebtoken' const currentModels = models as any const sendConfirmationEmail = (task: any, user: any, comments: string) => { - const token = jwt.sign(task.id, process.env.SECRET_PHRASE) + const token = jwt.sign(task.id, process.env.SECRET_PHRASE as string) const formattedfComments = comments.replace(/\s/g, '-') const approveURL = `${process.env.FRONTEND_HOST}/#/task/${task.id}/claim?comments=${formattedfComments}&token=${token}` const language = user.language || 'en' @@ -32,7 +32,7 @@ const verifyIssueAndClaim = async (task: any, user: any, comments: string, token const language = user.language || 'en' i18n.setLocale(language) - return jwt.verify(token, process.env.SECRET_PHRASE, async (err: any, decoded: any) => { + return jwt.verify(token, process.env.SECRET_PHRASE as string, async (err: any, decoded: any) => { // the 401 code is for unauthorized status if (err || parseInt(decoded) !== parseInt(task.id)) { throw new Error('invalid_token') diff --git a/src/modules/tasks/taskReport.ts b/src/modules/tasks/taskReport.ts index f6ca76a6f..d5b163a58 100644 --- a/src/modules/tasks/taskReport.ts +++ b/src/modules/tasks/taskReport.ts @@ -8,7 +8,7 @@ import * as constants from '../mail/constants' const currentModels = models as any export async function taskReport({ id }: any, { task, reason, baseUrl }: any) { - const token = jwt.sign(id, process.env.SECRET_PHRASE) + const token = jwt.sign(id, process.env.SECRET_PHRASE as string) const title = task.title.replace(/\s/g, '-') const formattedReason = reason.replace(/\s/g, '-') const userId = task.User ? task.User.id : ''