Merge pull request #4722 from coralproject/develop

v9.6.2
coralproject · Jan 15, 2025 · 33d89fc · 33d89fc
2 parents d399c8e + b5dfc7b
commit 33d89fc
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 26 deletions.
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "9.6.1",
+  "version": "9.6.2",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [
@@ -22,7 +22,7 @@
   "description": "A better commenting experience from Vox Media.",
   "scripts": {
     "build:client": "NODE_OPTIONS=\"--openssl-legacy-provider --no-experimental-fetch\" ts-node --transpile-only ./scripts/build.ts",
-    "build:development": "NODE_OPTIONS=\"--openssl-legacy-provider --no-experimental-fetch\" NODE_ENV=development pnpm run --parallel generate build:client",
+    "build:development": "NODE_OPTIONS=\"--openssl-legacy-provider --no-experimental-fetch\" NODE_ENV=development pnpm run generate && pnpm run build:client",
     "build:withProfiler": "NODE_ENV=production REACT_PROFILER=true pnpm run --parallel generate build:client",
     "build": "NODE_OPTIONS=\"--openssl-legacy-provider --no-experimental-fetch\" NODE_ENV=production pnpm run generate-persist && pnpm run build:client",
     "docs:css-variables": "ts-node ./scripts/generateCSSVariablesDocs.ts ./src/core/client/ui/theme/streamVariables.ts ./CSS_VARIABLES.md",

diff --git a/client/src/core/client/framework/lib/errors/relayNetworkRequestError.ts b/client/src/core/client/framework/lib/errors/relayNetworkRequestError.ts
@@ -3,6 +3,80 @@ import { RRNLRequestError } from "react-relay-network-modern/es";
 
 import { getMessage } from "../i18n";
 
+interface DupErrorObj {
+  error?: {
+    traceID: string;
+    code: string;
+    message: string;
+  };
+}
+
+const parseDuplicateEmailError = (
+  error: RRNLRequestError
+): DupErrorObj | null => {
+  if (!error.res || error.res.status !== 403 || !error.res.text) {
+    return null;
+  }
+
+  try {
+    const json = JSON.parse(error.res.text) as DupErrorObj;
+    if (!json || !json.error || json.error.code !== "DUPLICATE_EMAIL") {
+      return null;
+    }
+
+    return json;
+  } catch {
+    return null;
+  }
+};
+
+const computeCodeMessage = (
+  error: RRNLRequestError,
+  localeBundles: FluentBundle[]
+) => {
+  if (!error.res) {
+    return "";
+  }
+
+  const codePrefix = getMessage(
+    localeBundles,
+    "framework-error-relayNetworkRequestError-code",
+    "Code"
+  );
+
+  let msg = `[${codePrefix}]`;
+  if (error.res && error.res.status) {
+    msg += ` ${error.res.status.toString()}`;
+  }
+  if (error.res && error.res.statusText) {
+    msg += ` ${error.res.statusText}`;
+  }
+
+  return msg;
+};
+
+const computeMessage = (
+  error: RRNLRequestError,
+  localeBundles: FluentBundle[]
+): string => {
+  const defaultMessage = getMessage(
+    localeBundles,
+    "framework-error-relayNetworkRequestError-anUnexpectedNetworkError",
+    "An unexpected network error occured, please try again later."
+  );
+
+  const dupeEmail = parseDuplicateEmailError(error);
+  if (dupeEmail && dupeEmail.error) {
+    return dupeEmail.error.message;
+  }
+
+  if (error.res) {
+    return `${defaultMessage} ${computeCodeMessage(error, localeBundles)}`;
+  }
+
+  return defaultMessage;
+};
+
 /**
  * RelayNetworkRequestError wraps Request errors thrown by Relay Network Layer.
  */
@@ -11,26 +85,7 @@ export default class RelayNetworkRequestError extends Error {
   public origin: RRNLRequestError;
 
   constructor(error: RRNLRequestError, localeBundles: FluentBundle[]) {
-    let msg = getMessage(
-      localeBundles,
-      "framework-error-relayNetworkRequestError-anUnexpectedNetworkError",
-      "An unexpected network error occured, please try again later."
-    );
-
-    if (error.res) {
-      const codePrefix = getMessage(
-        localeBundles,
-        "framework-error-relayNetworkRequestError-code",
-        "Code"
-      );
-
-      msg += ` [${codePrefix}: ${error.res.status.toString()}`;
-      if (error.res.statusText) {
-        msg += " " + error.res.statusText;
-      }
-      msg += "]";
-    }
-    super(msg);
+    super(computeMessage(error, localeBundles));
 
     // Maintains proper stack trace for where our error was thrown.
     if (Error.captureStackTrace) {

diff --git a/common/package.json b/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "9.6.1",
+  "version": "9.6.2",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/config/package.json b/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "9.6.1",
+  "version": "9.6.2",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "9.6.1",
+  "version": "9.6.2",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [

diff --git a/server/src/core/server/errors/index.ts b/server/src/core/server/errors/index.ts
@@ -318,7 +318,11 @@ export class DuplicateSiteAllowedOriginError extends CoralError {
 
 export class DuplicateEmailError extends CoralError {
   constructor(email: string) {
-    super({ code: ERROR_CODES.DUPLICATE_EMAIL, context: { pvt: { email } } });
+    super({
+      code: ERROR_CODES.DUPLICATE_EMAIL,
+      context: { pvt: { email } },
+      status: 403,
+    });
   }
 }