Merge pull request #224 from SELab-2/main

release 0.2.0: Merge `main` into `dev`

.github/workflows/backend-testing.yml

@@ -9,13 +9,13 @@ name: Backend Testing
 #   - a draft PR to "dev" with backend js/ts files is marked as ready for review
 on:
   push:
-    branches: [ "dev" ]
+    branches: [ "dev", "main" ]
     paths:
       - 'backend/src/**.[jt]s'
       - 'backend/tests/**.[jt]s'
       - 'backend/vitest.config.ts'
   pull_request:
-    branches: [ "dev" ]
+    branches: [ "dev", "main" ]
     types: ["synchronize", "ready_for_review", "opened", "reopened"]
     paths:
       - 'backend/src/**.[jt]s'

.github/workflows/deployment.yml

@@ -15,8 +15,8 @@ jobs:
         uses: actions/checkout@v4
       -
         name: Copy environment variables to correct file
-        run: cp /home/dev/.backend.env backend/.env
+        run: cp /home/dev/.backend.env backend/.env && cp /home/dev/.idp.env config/idp/.env
       -
         name: Start docker
-        run: docker compose -f compose.production.yml up --build -d
+        run: docker compose -f compose.yml -f compose.production.yml up --build -d
-        
+        

.github/workflows/frontend-testing.yml

@@ -9,7 +9,7 @@ name: Frontend Testing
 #   - a draft PR to "dev" with frontend js/ts/vue/css files is marked as ready for review
 on:
     push:
-      branches: [ "dev" ]
+      branches: [ "dev", "main" ]
       paths:
         - 'frontend/src/**.[jt]s'
         - 'frontend/src/**.vue'
@@ -20,7 +20,7 @@ on:
         - 'frontend/vitest.config.ts'
         - 'frontend/playwright.config.ts'
     pull_request:
-      branches: [ "dev" ]
+      branches: [ "dev", "main" ]
       types: ["synchronize", "ready_for_review", "opened", "reopened"]
       paths:
         - 'frontend/src/**.[jt]s'

.github/workflows/lint-action.yml

@@ -4,13 +4,11 @@ on:
     # Trigger the workflow on push or pull request,
     # but only for the main branch
     push:
-        branches:
+        branches: [ "dev", "main" ]
-            - dev
     # Replace pull_request with pull_request_target if you
     # plan to use this action with forks, see the Limitations section
     pull_request:
-        branches:
+        branches: [ "dev", "main" ]
-            - dev
         types: ["synchronize", "ready_for_review", "opened", "reopened"]
 
 

backend/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dwengo-1/backend",
-    "version": "0.1.1",
+    "version": "0.2.0",
     "description": "Backend for Dwengo-1",
     "private": true,
     "type": "module",

common/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dwengo-1/common",
-    "version": "0.1.1",
+    "version": "0.2.0",
     "description": "Common types and utilities for Dwengo-1",
     "private": true,
     "type": "module",

compose.production.yml

@@ -42,18 +42,37 @@ services:
         networks:
             - dwengo-1
 
+    keycloak-db:
+        image: postgres:latest
+        ports:
+            - '5442:5432' # Port number 10 higher than normal postgres ports
+        restart: unless-stopped
+        volumes:
+            - dwengo_postgres_keycloak:/var/lib/postgresql/keycloak
+        environment:
+            POSTGRES_USER: keycloak
+            POSTGRES_PASSWORD: ChangeMe
+            POSTGRES_DB: keycloak
+        networks:
+            - dwengo-1
+
     idp:
         extends:
             file: ./compose.yml
             service: idp
-        # TODO Replace with proper production command
+        command: ['start', '--http-port', '7080', '--https-port', '7443', '--import-realm']
-        command: ['start-dev', '--http-port', '7080', '--https-port', '7443', '--import-realm']
         networks:
             - dwengo-1
         labels:
             - 'traefik.enable=true'
             - 'traefik.http.routers.idp.rule=PathPrefix(`/idp`)'
             - 'traefik.http.services.idp.loadbalancer.server.port=7080'
+            - 'traefik.http.routers.block-admin.rule=PathPrefix(`/idp/admin`)'
+            - 'traefik.http.routers.block-admin.service=web'
+        depends_on:
+            - keycloak-db
+        volumes:
+            - /etc/keycloak:/keycloak
         env_file:
             - ./config/idp/.env
         environment:
@@ -62,6 +81,13 @@ services:
             KC_PROXY_HEADERS: 'xforwarded'
             KC_HTTP_ENABLED: 'true'
             KC_HTTP_RELATIVE_PATH: '/idp'
+            KC_HTTPS_CERTIFICATE_FILE: '/keycloak/cert.pem'
+            KC_HTTPS_CERTIFICATE_KEY_FILE: '/keycloak/key.pem'
+            KC_HTTP_MAX_QUEUED_REQUESTS: 30 # Prevent overload situations by limiting number of requests
+            KC_DB: 'postgres'
+            KC_DB_USERNAME: 'keycloak'
+            KC_DB_PASSWORD: 'ChangeMe'
+            KC_DB_URL: 'jdbc:postgresql://keycloak-db:5432/keycloak'
 
     reverse-proxy:
         image: traefik:v3.3
@@ -121,6 +147,7 @@ volumes:
     dwengo_grafana_data:
     dwengo_letsencrypt:
     dwengo_loki_data:
+    dwengo_postgres_keycloak:
 
 networks:
     dwengo-1:

compose.yml

@@ -25,8 +25,6 @@ services:
         restart: unless-stopped
         volumes:
             - ./config/idp:/opt/keycloak/data/import
-        depends_on:
-            - db
         environment:
             KC_HOSTNAME: localhost
             KC_HOSTNAME_PORT: 7080

docs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dwengo-1-docs",
-    "version": "0.0.1",
+    "version": "0.2.0",
     "description": "Documentation for Dwengo-1",
     "private": true,
     "scripts": {

frontend/index.html

@@ -10,7 +10,7 @@
             name="viewport"
             content="width=device-width, initial-scale=1.0"
         />
-        <title>Vite App</title>
+        <title>Dwengo-1</title>
     </head>
     <body>
         <div id="app"></div>

frontend/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dwengo-1-frontend",
-    "version": "0.1.1",
+    "version": "0.2.0",
     "description": "Frontend for Dwengo-1",
     "private": true,
     "type": "module",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "dwengo-1",
-    "version": "0.1.1",
+    "version": "0.2.0",
     "description": "Monorepo for Dwengo-1",
     "private": true,
     "type": "module",
@@ -42,8 +42,5 @@
         "eslint-config-prettier": "^10.0.1",
         "jiti": "^2.4.2",
         "typescript-eslint": "^8.24.1"
-    },
-    "dependencies": {
-        "swagger": "^0.7.5"
     }
 }