feat(server): allow server to read broken down client url for cors

package.json

@@ -23,26 +23,26 @@
     "access": "public"
   },
   "dependencies": {
-    "@pubsweet/base-model": "^3.6.5",
-    "@pubsweet/errors": "^2.0.32",
-    "@pubsweet/logger": "^0.2.42",
-    "@pubsweet/models": "^0.3.7",
+    "@pubsweet/base-model": "^4.0.3",
+    "@pubsweet/errors": "^2.0.39",
+    "@pubsweet/logger": "^0.2.49",
+    "@pubsweet/models": "^0.3.14",
     "apollo-server-express": "^2.11.0",
     "body-parser": "^1.19.0",
-    "config": "^3.3.1",
+    "config": "^3.3.2",
     "cookie-parser": "^1.4.5",
     "cors": "^2.8.5",
     "express": "^4.17.1",
     "graphql-middleware": "^4.0.2",
-    "graphql-shield": "^7.2.6",
-    "helmet": "^3.22.0",
+    "graphql-shield": "^7.4.1",
+    "helmet": "^3.22.1",
     "http-status-codes": "^1.4.0",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.20",
     "morgan": "^1.10.0",
     "node-cron": "^2.0.3",
     "passport": "^0.4.1",
-    "pubsweet": "^5.1.10",
-    "pubsweet-server": "^13.9.4",
+    "pubsweet": "^5.1.18",
+    "pubsweet-server": "^13.11.5",
     "waait": "^1.0.5"
   },
   "devDependencies": {

src/app.js

@@ -57,15 +57,18 @@ const configureApp = app => {
   }
 
   // Allow CORS from client if host / port is different
-  if (
-    config.has('pubsweet-client.host') &&
-    config.has('pubsweet-client.port')
-  ) {
+  if (config.has('pubsweet-client.host')) {
+    const clientProtocol = config.get('pubsweet-client.protocol') || 'http'
+    const clientHost = config.get('pubsweet-client.host')
+    const clientPort = config.get('pubsweet-client.port')
+
+    const clientUrl = `${clientProtocol}://${clientHost}${
+      clientPort ? `:${clientPort}` : ''
+    }`
+
     app.use(
       cors({
-        origin: `${config.get('pubsweet-client.host')}:${config.get(
-          'pubsweet-client.port',
-        )}`,
+        origin: clientUrl,
         credentials: true,
       }),
     )