Merge branch 'master' into labday/small-ux-improvement-mike-d

packages/account-portal

@@ -1 +1 @@
-Subproject commit 52f51dcfb96d3fe58c8cc7a905e7d733f7cd84c2
+Subproject commit cc12291732ee902dc832bc7d93cf2086ffdf0cff

packages/pro

@@ -1 +1 @@
-Subproject commit 4f9616f163039a0eea81319d8e2288340a2ebc79
+Subproject commit aaf7101cd1493215155cc8f83124c70d53eb1be4

packages/server/src/utilities/workerRequests.ts

@@ -1,4 +1,4 @@
-import fetch from "node-fetch"
+import { Response, default as fetch } from "node-fetch"
 import env from "../environment"
 import { checkSlashesInUrl } from "./index"
 import {
@@ -40,25 +40,21 @@ export function request(ctx?: Ctx, request?: any) {
 }
 
 async function checkResponse(
-  response: any,
+  response: Response,
   errorMsg: string,
   { ctx }: { ctx?: Ctx } = {}
 ) {
-  if (response.status !== 200) {
+  if (response.status >= 300) {
-    let error
+    let responseErrorMessage
-    try {
+    if (response.headers.get("content-type")?.includes("json")) {
-      error = await response.json()
+      const error = await response.json()
-      if (!error.message) {
+      responseErrorMessage = error.message ?? JSON.stringify(error)
-        error = JSON.stringify(error)
+    } else {
+      responseErrorMessage = await response.text()
     }
-    } catch (err) {
+    const msg = `Unable to ${errorMsg} - ${responseErrorMessage}`
-      error = await response.text()
-    }
-    const msg = `Unable to ${errorMsg} - ${
-      error.message ? error.message : error
-    }`
     if (ctx) {
-      ctx.throw(400, msg)
+      ctx.throw(msg, response.status)
     } else {
       throw msg
     }

packages/worker/package.json

@@ -63,7 +63,7 @@
     "koa-useragent": "^4.1.0",
     "lodash": "4.17.21",
     "node-fetch": "2.6.7",
-    "nodemailer": "6.7.2",
+    "nodemailer": "6.9.9",
     "passport-google-oauth": "2.0.0",
     "passport-local": "1.0.0",
     "pouchdb": "7.3.0",