Production release v1.1.4

.env.dev

@@ -1,7 +1,7 @@
 PG_CONNECTION_STRING=
 REDIS_CONNECTION_STRING=
 PUBLISHER_RENDER_URL=
-REACT_APP_PUBLISHER_SERVER_URL=http://julistegeneraattori-server:4000
+REACT_APP_PUBLISHER_SERVER_URL=http://map-publisher-server:4000
 
 DIGITRANSIT_URL=https://dev-api.digitransit.fi/
 DIGITRANSIT_APIKEY=
@@ -21,7 +21,6 @@ API_CLIENT_SECRET=
 
 REDIRECT_URI=https://dev.kartat.hsl.fi/julkaisin
 LOGIN_PROVIDER_URI=https://hslid-uat.cinfra.fi
-DOMAINS_ALLOWED_TO_GENERATE=
-DOMAINS_ALLOWED_TO_LOGIN=
 
-PUBLISHER_TEST_GROUP=Karttajulkaisin-test
+GROUP_GENERATE=
+GROUP_READONLY=

.env.local

@@ -22,9 +22,8 @@ API_CLIENT_SECRET=
 
 REDIRECT_URI=http://localhost:3000
 LOGIN_PROVIDER_URI=https://hslid-uat.cinfra.fi
-DOMAINS_ALLOWED_TO_GENERATE=
-DOMAINS_ALLOWED_TO_LOGIN=
 
-PUBLISHER_TEST_GROUP=Karttajulkaisin-test
+GROUP_GENERATE=
+GROUP_READONLY=
 
 BUILD_ENV=local

.env.prod

@@ -21,7 +21,6 @@ API_CLIENT_SECRET=
 
 REDIRECT_URI=https://kartat.hsl.fi/julkaisin
 LOGIN_PROVIDER_URI=https://id.hsl.fi
-DOMAINS_ALLOWED_TO_GENERATE=
-DOMAINS_ALLOWED_TO_LOGIN=
 
-PUBLISHER_TEST_GROUP=Karttajulkaisin-test
+GROUP_GENERATE=
+GROUP_READONLY=

.github/dependabot.yml

@@ -1,14 +1,24 @@
-# Specify a non-default branch for pull requests for npm
-
 version: 2
 updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
   - package-ecosystem: "npm"
     directory: "/"
     schedule:
-      interval: "daily"
-    # Raise pull requests for version updates
-    # to npm against the `development` branch
+      interval: "weekly"
+    cooldown:
+      semver-major-days: 90
+      semver-minor-days: 60
+      semver-patch-days: 30
+    groups: 
+      major:
+        update-types:
+          - "major"
+      minor:
+        update-types:
+          - "minor"
+          - "patch"
+    open-pull-requests-limit: 5
     target-branch: "development"
-    # Labels on pull requests for version updates only
-    labels:
-      - "NPM Dependencies"

Dockerfile

@@ -1,6 +1,6 @@
-FROM node:18-buster-slim
+FROM node:18-bullseye-slim
 
-RUN apt-get update \
+RUN apt-get -y update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -yq wget curl gnupg fontconfig fonts-liberation ca-certificates --no-install-recommends \
     # This installs the necessary libs to make the bundled version of Chromium that Puppeteer installs work
     && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \

constants.js

@@ -44,10 +44,9 @@ module.exports = {
   AZURE_STORAGE_KEY: secretsEnv.AZURE_STORAGE_KEY || '',
   CLIENT_SECRET: secretsEnv.CLIENT_SECRET || '',
   API_CLIENT_SECRET: secretsEnv.API_CLIENT_SECRET || '',
-  DOMAINS_ALLOWED_TO_GENERATE: secretsEnv.DOMAINS_ALLOWED_TO_GENERATE || '',
-  DOMAINS_ALLOWED_TO_LOGIN: secretsEnv.DOMAINS_ALLOWED_TO_LOGIN || '',
   HSL_TESTING_HSLID_USERNAME: secretsEnv.HSL_TESTING_HSLID_USERNAME || '',
   HSL_TESTING_HSLID_PASSWORD: secretsEnv.HSL_TESTING_HSLID_PASSWORD || '',
-  PUBLISHER_TEST_GROUP: secretsEnv.PUBLISHER_TEST_GROUP || '',
+  GROUP_GENERATE: secretsEnv.GROUP_GENERATE || '',
+  GROUP_READONLY: secretsEnv.GROUP_READONLY || '',
   TEST_PUBLISHER_SERVER_URL: secretsEnv.TEST_PUBLISHER_SERVER_URL || 'http://localhost:4000',
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hsl-map-publisher",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "HSL Map Publisher",
   "main": "index.js",
   "scripts": {
@@ -23,7 +23,7 @@
     "docker:rebuild": "yarn run docker:stop && yarn run docker:rm && yarn run docker:build && yarn run docker:run",
     "docker:logs": "docker logs publisher",
     "prepare": "husky install",
-    "test": "node -r dotenv/config test/testStops"
+    "test": "node -r dotenv/config test/tests"
   },
   "lint-staged": {
     "*.js": [
@@ -63,7 +63,7 @@
     "eslint-import-resolver-webpack": "^0.10.1",
     "eslint-loader": "^2.1.1",
     "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-jsx-a11y": "^6.1.2",
+    "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-prettier": "^3.0.0",
     "eslint-plugin-react": "^7.11.1",
     "husky": "^8.0.0",
@@ -72,7 +72,7 @@
     "react-refresh": "^0.14.0",
     "webpack-cli": "^3.0.8",
     "webpack-serve": "^1.0.4",
-    "worker-loader": "^2.0.0"
+    "worker-loader": "^3.0.8"
   },
   "dependencies": {
     "@azure/storage-blob": "^10.4.0",
@@ -102,16 +102,16 @@
     "koa-body": "^6.0.1",
     "koa-json-body": "^5.3.0",
     "koa-router": "^7.4.0",
-    "koa-session": "^5.10.1",
+    "koa-session": "6.0.0",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
-    "node-fetch": "^1.7.3",
+    "node-fetch": "2.6.6",
     "p-map": "^1.2.0",
     "pdf-merger-js": "^3.4.0",
     "pg": "^8.7.3",
     "prop-types": "^15.6.0",
     "puppeteer": "^13.7.0",
-    "qrcode": "^1.0.0",
+    "qrcode": "^1.5.4",
     "qs": "^6.5.2",
     "raw-loader": "^0.5.1",
     "react": "18.2.0",
@@ -122,9 +122,8 @@
     "recompose": "^0.30.0",
     "segseg": "^0.2.2",
     "serve": "^13.0.2",
-    "style-loader": "^0.19.0",
+    "style-loader": "^2.0.0",
     "uuid": "^3.1.0",
-    "validator": "^13.15.0",
     "viewport-mercator-project": "^4.1.1",
     "webpack": "^4.12.1",
     "webpack-merge": "^4.1.3"

scripts/auth/authEndpoints.js

@@ -1,31 +1,19 @@
 const { get, clone } = require('lodash');
 const AuthService = require('./authService');
-const validator = require('validator');
 
-const { DOMAINS_ALLOWED_TO_LOGIN, PUBLISHER_TEST_GROUP } = require('../../constants');
+const { GROUP_GENERATE, GROUP_READONLY } = require('../../constants');
 
-const allowedDomains = DOMAINS_ALLOWED_TO_LOGIN.split(',');
+const hasAllowedGroup = async userInfo => {
+  const groups = get(userInfo, 'groups', {});
 
-const hasAllowedDomain = async userInfo => {
-  const groups = get(userInfo, 'groups');
-
-  const emailValidationOptions = {
-    host_whitelist: allowedDomains,
-  };
-
-  if (groups.includes(PUBLISHER_TEST_GROUP)) {
-    return true;
-  }
-
-  if (
-    !validator.isEmail(userInfo.email, emailValidationOptions) &&
-    !groups.includes(PUBLISHER_TEST_GROUP)
-  ) {
-    console.log(`User does not have allowed domain. Logging out.`);
+  if (!groups || !Array.isArray(groups)) {
+    console.log('User does not have valid groups assigned');
     return false;
   }
-
-  return true;
+  if (groups.includes(GROUP_GENERATE) || groups.includes(GROUP_READONLY)) {
+    return true;
+  }
+  return false;
 };
 
 const authorize = async (req, res, session) => {
@@ -68,13 +56,13 @@ const authorize = async (req, res, session) => {
   if (session && tokenResponse.access_token) {
     modifiedSession.accessToken = tokenResponse.access_token;
     const userInfo = await AuthService.requestUserInfo(modifiedSession.accessToken);
-    const isAllowed = await hasAllowedDomain(userInfo);
+    const isAllowed = await hasAllowedGroup(userInfo);
     if (!isAllowed) {
       return {
         status: 401,
         body: {
           isOk: false,
-          message: 'No allowed group.',
+          message: 'User does not have valid groups assigned.',
         },
       };
     }
@@ -105,7 +93,7 @@ const authorize = async (req, res, session) => {
 
 const checkExistingSession = async (req, res, session) => {
   if (session && session.accessToken) {
-    const isAllowed = await hasAllowedDomain(session);
+    const isAllowed = await hasAllowedGroup(session);
     if (!isAllowed) {
       await AuthService.logoutFromIdentityProvider(session.accessToken);
       return {