Merge branch 'compdemocracy:edge' into edge

.github/workflows/cypress-tests.yml

@@ -38,7 +38,7 @@ jobs:
         if: failure()
         run: |
           echo "Health check failed. Dumping Docker logs..."
-          docker-compose logs
+          docker compose -f docker-compose.yml -f docker-compose.test.yml --env-file test.env logs
 
       - name: Cypress Run
         uses: cypress-io/github-action@v5

client-admin/package.json

@@ -59,7 +59,7 @@
     "prop-types": "~15.7.2",
     "react": "~16.14.0",
     "react-dom": "~16.14.0",
-    "react-easy-emoji": "~1.4.0",
+    "react-easy-emoji": "~1.8.1",
     "react-redux": "7.2.2",
     "react-router-dom": "~5.2.0",
     "redux": "~4.0.5",

client-report/webpack.config.js

@@ -2,8 +2,8 @@
 
 const common = require('./webpack.common');
 const path = require('path');
-const webpack = require("webpack");
-const CompressionPlugin = require("compression-webpack-plugin");
+const webpack = require('webpack');
+const CompressionPlugin = require('compression-webpack-plugin');
 const EventHooksPlugin = require('event-hooks-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const writeHeadersJsonTask = require('./writeHeadersJsonTask');
@@ -14,6 +14,7 @@ module.exports = {
   output: {
     filename: 'report_bundle.[contenthash].js',
     path: path.resolve(__dirname, 'dist'),
+    publicPath: '/',
     clean: true,
   },
   plugins: [
@@ -34,7 +35,8 @@ module.exports = {
       filename: 'report_style.[contenthash].css',
     }),
     new webpack.DefinePlugin({
-      "process.env.NODE_ENV": JSON.stringify("production")
+      'process.env.NODE_ENV': JSON.stringify('production'),
+      'process.env.SERVICE_URL': null,
     })
   ],
   performance: {

client-report/webpack.dev.js

@@ -14,6 +14,7 @@ module.exports = {
   output: {
     filename: 'report_bundle.js',
     path: path.resolve(__dirname, 'devel'),
+    publicPath: '/',
   },
   plugins: [
     ...common.plugins,

example.env

@@ -21,10 +21,10 @@ SERVER_LOG_LEVEL=
 # Optional DB replica for reads:
 READ_ONLY_DATABASE_URL=
 POSTGRES_DB=polis-dev
-POSTGRES_HOST=postgres:5432
-POSTGRES_PASSWORD=oiPorg3Nrz0yqDLE
 POSTGRES_PORT=5432
+POSTGRES_HOST=postgres:${POSTGRES_PORT}
 POSTGRES_USER=postgres
+POSTGRES_PASSWORD=oiPorg3Nrz0yqDLE
 DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}/${POSTGRES_DB}
 
 
@@ -125,3 +125,14 @@ ENCRYPTION_PASSWORD_00001=
 # (Deprecated) Basic Auth settings for certain requests between math and api services.
 WEBSERVER_PASS=ws-pass
 WEBSERVER_USERNAME=ws-user
+
+
+###### CLIENT SIDE CONFIG ######
+# If building client assets, only the following variables are needed:
+# * EMBED_SERVICE_HOSTNAME
+# * FB_APP_ID
+# * GA_TRACKING_ID
+# * ENABLE_TWITTER_WIDGETS
+# * SERVICE_URL (if static assests are served from a separate domain than API, as described above)
+
+

server/src/server.ts

@@ -1131,12 +1131,6 @@ function initializePolisHelpers() {
     "", // for API
   ];
 
-  let whitelistedBuckets = {
-    "pol.is": "pol.is",
-    "embed.pol.is": "pol.is",
-    "survey.pol.is": "survey.pol.is",
-    "preprod.pol.is": "preprod.pol.is",
-  };
   function hasWhitelistMatches(host: string) {
     let hostWithoutProtocol = host;
     if (host.startsWith("http://")) {
@@ -13330,7 +13324,7 @@ Thanks for using Polis!
   }
 
   function proxy(req: { headers?: { host: string }; path: any }, res: any) {
-    let hostname = buildStaticHostname(req, res);
+    let hostname = Config.staticFilesHost;
     if (!hostname) {
       let host = req?.headers?.host || "";
       let re = new RegExp(Config.getServerHostname() + "$");
@@ -13367,37 +13361,6 @@ Thanks for using Polis!
     // }
   }
 
-  function buildStaticHostname(req: { headers?: { host: string } }, res: any) {
-    if (devMode || domainOverride) {
-      return Config.staticFilesHost;
-    } else {
-      let origin = req?.headers?.host;
-      // Element implicitly has an 'any' type because expression of type 'string' can't be used to index type '{ "pol.is": string; "embed.pol.is": string; "survey.pol.is": string; "preprod.pol.is": string; }'.
-      // No index signature with a parameter of type 'string' was found on type '{ "pol.is": string; "embed.pol.is": string; "survey.pol.is": string; "preprod.pol.is": string; }'.ts(7053)
-      // @ts-ignore
-      if (!whitelistedBuckets[origin || ""]) {
-        if (hasWhitelistMatches(origin || "")) {
-          // Use the prod bucket for non pol.is domains
-          return (
-            whitelistedBuckets["pol.is"] + "." + Config.staticFilesHost
-          );
-        } else {
-          logger.error(
-            "got request with host that's not whitelisted: (" +
-              req?.headers?.host +
-              ")"
-          );
-          return;
-        }
-      }
-      // Element implicitly has an 'any' type because expression of type 'string' can't be used to index type '{ "pol.is": string; "embed.pol.is": string; "survey.pol.is": string; "preprod.pol.is": string; }'.
-      // No index signature with a parameter of type 'string' was found on type '{ "pol.is": string; "embed.pol.is": string; "survey.pol.is": string; "preprod.pol.is": string; }'.ts(7053)
-      // @ts-ignore
-      origin = whitelistedBuckets[origin || ""];
-      return origin + "." + Config.staticFilesHost;
-    }
-  }
-
   function makeRedirectorTo(path: string) {
     return function (
       req: { headers?: { host: string } },
@@ -13473,7 +13436,7 @@ Thanks for using Polis!
       req: { headers?: { host: any }; path: any; pipe: (arg0: any) => void },
       res: { set: (arg0: any) => void }
     ) {
-      let hostname = buildStaticHostname(req, res);
+      let hostname = Config.staticFilesHost;
       if (!hostname) {
         fail(res, 500, "polis_err_file_fetcher_serving_to_domain");
         return;