Merge branch 'main' into main

Author: prembharne

backend/.env.dist.local

@@ -165,5 +165,5 @@ CROWD_GITHUB_IS_SNOWFLAKE_ENABLED=false
 CROWD_TINYBIRD_BASE_URL=http://localhost:7181/
 
 # Auth0
-CROWD_AUTH0_ISSUER_BASE_URL=
+CROWD_AUTH0_ISSUER_BASE_URLS=
 CROWD_AUTH0_AUDIENCE=

backend/config/custom-environment-variables.json

@@ -154,7 +154,7 @@
   "auth0": {
     "clientId": "CROWD_AUTH0_CLIENT_ID",
     "jwks": "CROWD_AUTH0_JWKS",
-    "issuerBaseURL": "CROWD_AUTH0_ISSUER_BASE_URL",
+    "issuerBaseURLs": "CROWD_AUTH0_ISSUER_BASE_URLS",
     "audience": "CROWD_AUTH0_AUDIENCE"
   },
   "sso": {

backend/package.json

@@ -128,7 +128,7 @@
     "pg": "^8.7.3",
     "pg-promise": "^11.4.3",
     "sanitize-html": "^2.7.1",
-    "sequelize": "6.21.2",
+    "sequelize": "6.37.8",
     "sequelize-cli-typescript": "^3.2.0-c",
     "slack-block-builder": "^2.7.2",
     "socket.io": "^4.5.4",

backend/src/api/index.ts

@@ -7,6 +7,7 @@ import * as http from 'http'
 import os from 'os'
 import { QueryTypes } from 'sequelize'
 
+import { BadRequestError } from '@crowd/common'
 import { getDbConnection } from '@crowd/data-access-layer/src/database'
 import { getServiceLogger } from '@crowd/logging'
 import { getOpensearchClient } from '@crowd/opensearch'
@@ -147,6 +148,14 @@ setImmediate(async () => {
 
   app.use(bodyParser.urlencoded({ limit: '5mb', extended: true }))
 
+  app.use((err: any, req: any, res: any, next: any) => {
+    if (err.type === 'entity.parse.failed') {
+      next(new BadRequestError('Invalid JSON body'))
+      return
+    }
+    next(err)
+  })
+
   app.use((req, res, next) => {
     // @ts-ignore
     req.userData = {

backend/src/api/member/index.ts

@@ -9,7 +9,6 @@ export default (app) => {
   app.put(`/member/:id`, safeWrap(require('./memberUpdate').default))
   app.delete(`/member`, safeWrap(require('./memberDestroy').default))
   app.post(`/member/autocomplete`, safeWrap(require('./memberAutocomplete').default))
-  app.get(`/member/active`, safeWrap(require('./memberActiveList').default))
   app.get(`/member/bot-suggestions`, safeWrap(require('./memberBotSuggestionsList').default))
 
   app.get(`/member/:id`, safeWrap(require('./memberFind').default))

backend/src/api/member/memberActiveList.ts

@@ -6,7 +6,6 @@ export default (app) => {
   app.put(`/organization/:id`, safeWrap(require('./organizationUpdate').default))
   app.delete(`/organization`, safeWrap(require('./organizationDestroy').default))
   app.post(`/organization/autocomplete`, safeWrap(require('./organizationAutocomplete').default))
-  app.get(`/organization/active`, safeWrap(require('./organizationActiveList').default))
   app.get(`/organization/:id`, safeWrap(require('./organizationFind').default))
 
   app.put(`/organization/:organizationId/merge`, safeWrap(require('./organizationMerge').default))

backend/src/api/organization/index.ts

@@ -1,18 +1,12 @@
 import { Router } from 'express'
 
-import { AUTH0_CONFIG } from '../../conf'
-
 import { errorHandler } from './middlewares/errorHandler'
-import { oauth2Middleware } from './middlewares/oauth2Middleware'
-import { staticApiKeyMiddleware } from './middlewares/staticApiKeyMiddleware'
 import { v1Router } from './v1'
-import { devStatsRouter } from './v1/dev-stats'
 
 export function publicRouter(): Router {
   const router = Router()
 
-  router.use('/v1/dev-stats', staticApiKeyMiddleware(), devStatsRouter())
-  router.use('/v1', oauth2Middleware(AUTH0_CONFIG), v1Router())
+  router.use('/v1', v1Router())
   router.use(errorHandler)
 
   return router

backend/src/api/organization/organizationActiveList.ts

@@ -35,7 +35,13 @@ export const errorHandler: ErrorRequestHandler = (
   }
 
   req.log.error(
-    { error, url: req.url, method: req.method, query: req.query, body: req.body },
+    {
+      error: { name: error?.name, message: error?.message, stack: error?.stack },
+      url: req.url,
+      method: req.method,
+      query: req.query,
+      body: req.body,
+    },
     'Unhandled error in public API',
   )