WIP: Release/3.0.0

.docker/nginx.conf

@@ -7,7 +7,6 @@ events {
     worker_connections  1024;
 }
 
-
 http {
     proxy_temp_path /tmp/proxy_temp;
     client_body_temp_path /tmp/client_temp;
@@ -18,7 +17,7 @@ http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
-    set_real_ip_from 172.16.0.0/8;
+    set_real_ip_from 172.16.0.0/16;
     real_ip_recursive on;
     real_ip_header X-Forwarded-For;
 

.docker/templates/default.conf.template

@@ -4,11 +4,23 @@ server {
 
     root ${NGINX_WEB_ROOT};
 
+    client_max_body_size ${NGINX_MAX_BODY_SIZE};
+
+    # This also needs to be set in the single server tag and not only in http.
+    set_real_ip_from 172.16.0.0/16;
+    real_ip_recursive on;
+    real_ip_header X-Forwarded-For;
+
     location / {
         # try to serve file directly, fallback to index.php
         try_files $uri /index.php$is_args$args;
     }
 
+    # Screen client online check should just serve static files
+    location /client/online-check {
+        index index.html index.htm;
+    }
+
     # Protect files and directories from prying eyes.
     location ~* \.(engine|inc|install|make|module|profile|po|sh|.*sql|.tar|.gz|.bz2|theme|twig|tpl(\.php)?|xtmpl|yml)(~|\.sw[op]|\.bak|\.orig|\.save)?$|^(\.(?!well-known).*|Entries.*|Repository|Root|Tag|Template|composer\.(json|lock)|web\.config)$|^#.*#$|\.php(~|\.sw[op]|\.bak|\.orig|\.save)$ {
         deny all;

.editorconfig

@@ -1,4 +1,4 @@
-# Drupal editor configuration normalization
+# Editor configuration normalization
 # @see http://editorconfig.org/
 
 # This is the top-most .editorconfig file; do not search in parent directories.
@@ -8,13 +8,13 @@ root = true
 [*]
 end_of_line = LF
 indent_style = space
-indent_size = 4
+indent_size = 2
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.{js,scss}]
-indent_size = 2
+[config/**.{yml,yaml}]
+indent_size = 4
 
-[docker-compose*.yml]
-indent_size = 2
+[*.php]
+indent_size = 4

.env

@@ -1,5 +1,6 @@
-COMPOSE_PROJECT_NAME=displayapiservice
-COMPOSE_DOMAIN=displayapiservice.local.itkdev.dk
+COMPOSE_PROJECT_NAME=display
+COMPOSE_DOMAIN=display.local.itkdev.dk
+ITKDEV_TEMPLATE=symfony-6
 
 # In all environments, the following files are loaded if they exist,
 # the latter taking precedence over the former:
@@ -38,31 +39,40 @@ CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
 # CORS_ALLOW_ORIGIN="^.*"
 ###< nelmio/cors-bundle ###
 
-###> App ###
-APP_DEFAULT_DATE_FORMAT='Y-m-d\TH:i:s.v\Z'
-APP_ACTIVATION_CODE_EXPIRE_INTERNAL=P2D
-APP_KEY_VAULT_SOURCE=ENVIRONMENT
-APP_KEY_VAULT_JSON="{}"
-###< App ###
-
 ###> lexik/jwt-authentication-bundle ###
 JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
 JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
 JWT_PASSPHRASE=APP_JWT_PASSPHRASE
-# 1 hour
+# Default: 1 hour
 JWT_TOKEN_TTL=3600
-# 15 days
+# Default: 15 days
 JWT_SCREEN_TOKEN_TTL=1296000
 ###< lexik/jwt-authentication-bundle ###
 
 ###> gesdinet/jwt-refresh-token-bundle ###
-# 2 hours
+# Default: 2 hours
 JWT_REFRESH_TOKEN_TTL=7200
-# 30 days
+# Default: 30 days
 JWT_SCREEN_REFRESH_TOKEN_TTL=2592000
 ###< gesdinet/jwt-refresh-token-bundle ###
 
+###> redis ###
+REDIS_CACHE_PREFIX=DisplayApiService
+REDIS_CACHE_DSN=redis://redis:6379/0
+###< redis ###
+
+###> App ###
+APP_DEFAULT_DATE_FORMAT='Y-m-d\TH:i:s.v\Z'
+APP_ACTIVATION_CODE_EXPIRE_INTERVAL=P2D
+APP_KEY_VAULT_SOURCE=ENVIRONMENT
+APP_KEY_VAULT_JSON="{}"
+EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS=300
+TRACK_SCREEN_INFO=false
+TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS=300
+###< App ###
+
 ###> itk-dev/openid-connect-bundle ###
+# See docs/feed/openid-connect.md for variable explanations.
 # internal provider
 INTERNAL_OIDC_METADATA_URL=INTERNAL_OIDC_METADATA_URL
 INTERNAL_OIDC_CLIENT_ID=INTERNAL_OIDC_CLIENT_ID
@@ -81,19 +91,13 @@ EXTERNAL_OIDC_REDIRECT_URI=EXTERNAL_OIDC_REDIRECT_URI
 EXTERNAL_OIDC_LEEWAY=30
 EXTERNAL_OIDC_HASH_SALT=
 EXTERNAL_OIDC_CLAIM_ID=signinname
-###< itk-dev/openid-connect-bundle ###
 
 # cli redirect url
 OIDC_CLI_REDIRECT=APP_CLI_REDIRECT_URI
 ###< itk-dev/openid-connect-bundle ###
 
-###> redis ###
-REDIS_CACHE_PREFIX=DisplayApiService
-REDIS_CACHE_DSN=redis://redis:6379/0
-###< redis ###
-
 ###> Calendar Api Feed Source ###
-# See docs/feed/calendar-api-feed.md for variable explainations.
+# See docs/feed/calendar-api-feed.md for variable explanations.
 CALENDAR_API_FEED_SOURCE_LOCATION_ENDPOINT=
 CALENDAR_API_FEED_SOURCE_RESOURCE_ENDPOINT=
 CALENDAR_API_FEED_SOURCE_EVENT_ENDPOINT=
@@ -104,7 +108,20 @@ CALENDAR_API_FEED_SOURCE_DATE_TIMEZONE=
 CALENDAR_API_FEED_SOURCE_CACHE_EXPIRE_SECONDS=300
 ###< Calendar Api Feed Source ###
 
-EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS=300
+###> Admin configuration ###
+ADMIN_REJSEPLANEN_APIKEY=
+ADMIN_SHOW_SCREEN_STATUS=false
+ADMIN_TOUCH_BUTTON_REGIONS=false
+ADMIN_LOGIN_METHODS='[{"type":"username-password","enabled":true,"provider":"username-password","label":""}]'
+ADMIN_ENHANCED_PREVIEW=false
+###< Admin configuration ###
 
-TRACK_SCREEN_INFO=false
-TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS=300
+###> Client configuration ###
+CLIENT_LOGIN_CHECK_TIMEOUT=20000
+CLIENT_REFRESH_TOKEN_TIMEOUT=300000
+CLIENT_RELEASE_TIMESTAMP_INTERVAL_TIMEOUT=600000
+CLIENT_SCHEDULING_INTERVAL=60000
+CLIENT_PULL_STRATEGY_INTERVAL=90000
+CLIENT_COLOR_SCHEME='{"type":"library","lat":56.0,"lng":10.0}'
+CLIENT_DEBUG=false
+###< Client configuration ###

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
-#### Link to ticket
+#### Link to issue
 
-Please add a link to the ticket being addressed by this change.
+Please add a link to the issue being addressed by this change.
 
 #### Description
 
@@ -17,7 +17,7 @@ If your change affects the user interface you should include a screenshot of the
 - [ ] My code passes our static analysis suite.
 - [ ] My code passes our continuous integration process.
 
-If your code does not pass all the requirements on the checklist you have to add a comment explaining why this change 
+If your code does not pass all the requirements on the checklist you have to add a comment explaining why this change
 should be exempt from the list.
 
 #### Additional comments or questions

.github/workflows/apispec.yaml

@@ -0,0 +1,50 @@
+on: pull_request
+
+name: Api Spec
+
+jobs:
+  apispec:
+    runs-on: ubuntu-latest
+    name: API Specification validation
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ["8.3"]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php}}
+          extensions: apcu, ctype, iconv, imagick, json, redis, soap, xmlreader, zip
+          coverage: none
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ matrix.php }}-composer-
+
+      - name: Install Dependencies
+        run: composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist
+
+      - name: Export specifications (yaml)
+        run: bin/console api:openapi:export --yaml --output=public/api-spec-v2.yaml --no-interaction
+
+      - name: Check for changes in specifications (yaml)
+        run: git diff --diff-filter=ACMRT --exit-code public/api-spec-v2.yaml
+
+      - name: Export specifications (json)
+        run: bin/console api:openapi:export --output=public/api-spec-v2.json --no-interaction
+
+      - name: Check for changes in specifications (json)
+        run: git diff --diff-filter=ACMRT --exit-code public/api-spec-v2.json

.github/workflows/changelog.yaml

@@ -0,0 +1,29 @@
+# Do not edit this file! Make a pull request on changing
+# github/workflows/changelog.yaml in
+# https://github.com/itk-dev/devops_itkdev-docker if need be.
+
+### ### Changelog
+###
+### Checks that changelog has been updated
+
+name: Changelog
+
+on:
+  pull_request:
+
+jobs:
+  changelog:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Git fetch
+        run: git fetch
+
+      - name: Check that changelog has been updated.
+        run: git diff --exit-code origin/${{ github.base_ref }} -- CHANGELOG.md && exit 1 || exit 0

.github/workflows/composer.yaml

@@ -0,0 +1,68 @@
+# Do not edit this file! Make a pull request on changing
+# github/workflows/composer.yaml in
+# https://github.com/itk-dev/devops_itkdev-docker if need be.
+
+### ### Composer
+###
+### Validates composer.json and checks that it's normalized.
+###
+### #### Assumptions
+###
+### 1. A docker compose service named `phpfpm` can be run and `composer` can be
+###    run inside the `phpfpm` service.
+### 2. [ergebnis/composer-normalize](https://github.com/ergebnis/composer-normalize)
+###    is a dev requirement in `composer.json`:
+###
+###    ``` shell
+###    docker compose run --rm phpfpm composer require --dev ergebnis/composer-normalize
+###    ```
+###
+###    Normalize `composer.json` by running
+###
+###    ``` shell
+###    docker compose run --rm phpfpm composer normalize
+###    ```
+
+name: Composer
+
+env:
+  COMPOSE_USER: runner
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+      - develop
+
+jobs:
+  composer-validate:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+      - run: |
+          docker network create frontend
+          docker compose run --rm phpfpm composer validate --strict
+
+  composer-normalized:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+      - run: |
+          docker network create frontend
+          docker compose run --rm phpfpm composer install
+          docker compose run --rm phpfpm composer normalize --dry-run
+
+  composer-audit:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+      - run: |
+          docker network create frontend
+          docker compose run --rm phpfpm composer audit --locked