Merge pull request #4686 from coralproject/develop

v9.5.0

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "9.4.1",
+  "version": "9.5.0",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [

common/lib/errors.ts

@@ -472,5 +472,10 @@ export enum ERROR_CODES {
    * priming of comments for the story in the data caches `commentCache` returns an undefined
    * result. This usually means something went very wrong loading from Redis or Mongo.
    */
-  UNABLE_TO_PRIME_CACHED_COMMENTS_FOR_STORY = "UNABLE_TO_PRIME_CACHED_COMMENTS_FOR_STORY"
+  UNABLE_TO_PRIME_CACHED_COMMENTS_FOR_STORY = "UNABLE_TO_PRIME_CACHED_COMMENTS_FOR_STORY",
+  /**
+   * SITE_NOT_FOUND is returned when the site being looked up via an ID does not
+   * exist in the database or when a siteID has been deleted from a document.
+   */
+  SITE_NOT_FOUND = "SITE_NOT_FOUND",
 }

common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "9.4.1",
+  "version": "9.5.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "9.4.1",
+  "version": "9.5.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "9.4.1",
+  "version": "9.5.0",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [
@@ -126,7 +126,7 @@
     "metascraper-description": "^5.22.5",
     "metascraper-image": "^5.22.5",
     "metascraper-title": "^5.22.5",
-    "mongodb": "^3.5.9",
+    "mongodb": "^6.9.0",
     "mongodb-core": "^3.2.7",
     "ms": "^2.1.2",
     "node-fetch": "^2.6.1",
@@ -201,7 +201,6 @@
     "@types/luxon": "^1.22.0",
     "@types/marked": "^0.7.3",
     "@types/mini-css-extract-plugin": "^1.4.3",
-    "@types/mongodb": "3.1.22",
     "@types/ms": "^0.7.31",
     "@types/node": "^12.12.34",
     "@types/node-fetch": "^2.5.5",
@@ -363,11 +362,6 @@
       "Newer versions has problems with using nunjucks.",
       "Update when the following issue is resolved:",
       "https://github.com/tj/consolidate.js/issues/244"
-    ],
-    "@types/mongodb@3.1.22": [
-      "Newer versions has problems with optional fields when querying with null",
-      "Update when the following issue is resolved:",
-      "https://github.com/DefinitelyTyped/DefinitelyTyped/issues/47686"
     ]
   },
   "graphql-schema-linter": {

server/src/core/server/app/middleware/csp.spec.ts

@@ -1,3 +1,6 @@
+import { patchTextUtil } from "coral-server/test/textEncoder";
+patchTextUtil();
+
 import { generateFrameOptions } from "coral-server/app/middleware/csp";
 import { Request } from "coral-server/types/express";
 

server/src/core/server/app/middleware/csp.ts

@@ -6,6 +6,7 @@ import { AppOptions } from "coral-server/app";
 import { getOrigin, prefixSchemeIfRequired } from "coral-server/app/url";
 import { Config } from "coral-server/config";
 import { MongoContext } from "coral-server/data/context";
+import { SiteNotFoundError } from "coral-server/errors";
 import {
   retrieveSite,
   retrieveSiteByOrigin,
@@ -50,6 +51,10 @@ async function retrieveSiteFromQuery(
       return null;
     }
 
+    if (!story.siteID) {
+      throw new SiteNotFoundError(null, storyID);
+    }
+
     // If the site can't be found based on it's allowed origins and the story
     // URL (which is a allowed list), then we know it isn't allowed.
     return retrieveSite(mongo, tenant.id, story.siteID);

server/src/core/server/app/middleware/passport/strategies/verifiers/jwt.spec.ts

@@ -1,3 +1,6 @@
+import { patchTextUtil } from "coral-server/test/textEncoder";
+patchTextUtil();
+
 import jwt from "jsonwebtoken";
 import { DateTime } from "luxon";
 

server/src/core/server/app/middleware/passport/strategies/verifiers/sso.spec.ts

@@ -1,3 +1,6 @@
+import { patchTextUtil } from "coral-server/test/textEncoder";
+patchTextUtil();
+
 import {
   SSOTokenSchema,
   SSOUserProfileSchema,

server/src/core/server/app/middleware/tenant.ts

@@ -1,7 +1,7 @@
 import { v1 as uuid } from "uuid";
 
 import { MongoContext } from "coral-server/data/context";
-import { TenantNotFoundError } from "coral-server/errors";
+import { SiteNotFoundError, TenantNotFoundError } from "coral-server/errors";
 import logger from "coral-server/logger";
 import {
   retrieveSite,
@@ -110,6 +110,10 @@ async function retrieveSiteFromQuery(
       return null;
     }
 
+    if (!story.siteID) {
+      throw new SiteNotFoundError(null, storyID);
+    }
+
     // If the site can't be found based on it's allowed origins and the story
     // URL (which is a allowed list), then we know it isn't allowed.
     return retrieveSite(mongo, tenant.id, story.siteID);

server/src/core/server/data/cache/commentCache.spec.ts

@@ -24,8 +24,8 @@ const createRedis = (): AugmentedRedis => {
 
 const createMongo = async (): Promise<MongoContext> => {
   const uri = "mongodb://127.0.0.1:27017/coral";
-  const live = await createMongoDB(uri);
-  const archive = await createMongoDB(uri);
+  const live = (await createMongoDB(uri)).db;
+  const archive = (await createMongoDB(uri)).db;
 
   const context = new MongoContextImpl(live, archive);