Draft: Keycloak Integration

.github/dependabot.yml

@@ -12,6 +12,7 @@ updates:
        typescript-eslint:
           patterns:
             - "@typescript-eslint/*"
+            - "typescript-eslint"
        opentelemetry:
           patterns:
             - "@opentelemetry/*"

.github/workflows/ci-package-motion-diff.yml

@@ -17,10 +17,10 @@ jobs:
     name: build-and-test-package-motion-diff
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: 'Install Node'
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
         with:
           node-version: '22.x'
 

.github/workflows/continuous-integration.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone main repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           repository: OpenSlides/OpenSlides
           path: "."
@@ -33,7 +33,7 @@ jobs:
         run: rm -r openslides-client
 
       - name: Clone openslides-client
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           path: "./openslides-client"
 
@@ -101,12 +101,12 @@ jobs:
     name: build-and-test-dev-image
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           submodules: "recursive"
 
       - name: Set up Node.js
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v7
         with:
           node-version: '24'
 
@@ -126,6 +126,10 @@ jobs:
         run: npm run generate-models && git diff --exit-code -- src/app/domain/models
         working-directory: client/
 
+      - name: Check generated defaults are up to date
+        run: npm run generate-defaults && git diff --exit-code -- src/app/domain/models
+        working-directory: client/
+
       - uses: browser-actions/setup-chrome@v2
 
       - name: Build motion diff

.github/workflows/pick-to-staging.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout main
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           ref: main
           fetch-depth: 2

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:24.14-alpine AS base
+FROM node:24.18-alpine AS base
 
 ## Setup
 ARG CONTEXT

client/angular.json

@@ -134,7 +134,12 @@
                         ],
                         "scripts": [],
                         "webWorkerTsConfig": "tsconfig.worker.json",
-                        "sourceMap": false
+                        "sourceMap": false,
+                        "stylePreprocessorOptions": {
+                            "includePaths": [
+                                "."
+                            ]
+                        }
                     }
                 },
                 "lint": {

client/cli/generate-models.ts

@@ -3,8 +3,8 @@ import * as yaml from 'js-yaml';
 import * as path from 'path';
 import { Project, Scope } from 'ts-morph';
 
-const SOURCE_META = path.resolve(path.join(__dirname, `../../meta/collection-meta.yml`));
-const SOURCE_COLLECTIONS = path.resolve(path.join(__dirname, `../../meta/collections/`));
+import { getCollectionsYaml, snakeToPascal } from './utils';
+
 const DESTINATION = path.resolve(path.join(__dirname, `../src/app/domain/models`));
 
 function findModelFile(startPath: string, name: string): string | null {
@@ -30,33 +30,6 @@ function findModelFile(startPath: string, name: string): string | null {
     return null;
 }
 
-function getCollectionsYaml(): string {
-    if (!fs.existsSync(SOURCE_COLLECTIONS)) {
-        console.log(`no dir `, SOURCE_COLLECTIONS);
-        return null;
-    }
-
-    let content = fs.readFileSync(SOURCE_META).toString();
-    content += `\nmodels:`;
-    const files = fs.readdirSync(SOURCE_COLLECTIONS);
-    for (const file of files) {
-        const filename = path.join(SOURCE_COLLECTIONS, file);
-        if (filename.endsWith(`.yml`)) {
-            const collection = fs.readFileSync(filename).toString().replace(/^(.)/gm, `    $1`);
-            content += `\n  ${file.substring(0, file.length - 4)}:\n${collection}`;
-        }
-    }
-
-    return content;
-}
-
-function snakeToPascal(input: string): string {
-    return input
-        .split(`_`)
-        .map(substr => substr.charAt(0).toUpperCase() + substr.slice(1))
-        .join(``);
-}
-
 (async (): Promise<void> => {
     const models: any = yaml.load(getCollectionsYaml())[`models`];
     const project = new Project({});

client/cli/generate-permissions.ts

@@ -3,7 +3,7 @@ import * as yaml from 'js-yaml';
 import * as path from 'path';
 import dedent from 'ts-dedent';
 
-import { overloadJsFunctions } from 'src/app/infrastructure/utils/overload-js-functions';
+import { overloadJsFunctions } from '@app/infrastructure/utils/overload-js-functions';
 
 overloadJsFunctions();
 

client/cli/generate-settings-defaults.ts

@@ -2,41 +2,125 @@ import * as fs from 'fs';
 import * as yaml from 'js-yaml';
 import * as path from 'path';
 import dedent from 'ts-dedent';
+import {
+    ArrayLiteralExpression,
+    CallExpression,
+    ObjectLiteralExpression,
+    Project,
+    PropertyAssignment,
+    SyntaxKind
+} from 'ts-morph';
 
-import { MeetingSettingsDefinitionService } from '../src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definition.service';
+import { getCollectionsYaml } from './utils';
 
-const SOURCE = path.resolve(path.join(__dirname, '../meta/models.yml'));
+const SETTING_DEFINITIONS = path.resolve(
+    path.join(
+        __dirname,
+        '../src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts'
+    )
+);
 const DESTINATION = path.resolve(path.join(__dirname, '../src/app/domain/definitions/meeting-settings-defaults.ts'));
 
 const FILE_TEMPLATE = dedent`
     // THIS FILE IS GENERATED AUTOMATICALLY. DO NOT CHANGE IT MANUALLY.
 
-    import { _ } from "@ngx-translate/core";
-    import { Settings } from 'src/app/domain/models/meetings/meeting';
-
-    export const meetingSettingsDefaults: { [key in keyof Settings]: any } = {
+    export const meetingSettingsDefaults: Record<string, any> = {
 `;
 
-(async () => {
-    const buffer = fs.readFileSync(SOURCE);
-    const models: any = yaml.load(buffer.toString());
-    const meeting = models['meeting'];
+export function isSettingsInput(item: any): any {
+    return `key` in item;
+}
+
+function getMeetingSettings(): string[] {
+    const project = new Project();
+    const sourceFile = project.addSourceFileAtPath(SETTING_DEFINITIONS);
+
+    const meetingSettingsDecl = sourceFile.getVariableDeclarations().find(decl => decl.getName() === 'meetingSettings');
+
+    if (!meetingSettingsDecl) {
+        throw new Error('Variable "meetingSettings" not found.');
+    }
+
+    const initializer = meetingSettingsDecl.getInitializer();
+
+    if (!initializer || initializer.getKind() !== SyntaxKind.CallExpression) {
+        throw new Error('Initializer is not a function call.');
+    }
+
+    const callExpr = initializer as CallExpression;
+
+    const calledFn = callExpr.getExpression();
+    if (calledFn.getText() !== 'fillInSettingsDefaults') {
+        throw new Error(`Expected fillInSettingsDefaults(), got "${calledFn.getText()}".`);
+    }
+
+    const args = callExpr.getArguments();
+    if (args.length === 0) {
+        throw new Error('fillInSettingsDefaults() was called with no arguments.');
+    }
+
+    const arrayArg = args[0];
+
+    if (arrayArg.getKind() !== SyntaxKind.ArrayLiteralExpression) {
+        throw new Error(`Expected an array argument, got ${SyntaxKind[arrayArg.getKind()]}.`);
+    }
+
+    const elements = (arrayArg as ArrayLiteralExpression).getElements();
+
+    const extractedKeys: string[] = [];
+
+    for (const el of elements) {
+        if (el.getKind() === SyntaxKind.ObjectLiteralExpression) {
+            const objectEl = el as ObjectLiteralExpression;
+
+            // Get all descendants with specific property name
+            const keyProps = objectEl
+                .getDescendants()
+                .filter(d => d.getKind() === SyntaxKind.PropertyAssignment)
+                .map(p => p as PropertyAssignment)
+                .filter(p => p.getName() === 'key');
+
+            for (const prop of keyProps) {
+                const initializer = prop.getInitializer();
+                if (!initializer) continue;
+
+                // Check if value is an array literal
+                if (initializer.getKind() === SyntaxKind.ArrayLiteralExpression) {
+                    const array = initializer as ArrayLiteralExpression;
+                    for (const element of array.getElements()) {
+                        const value = element.getText().replace(/['`]/g, '');
+                        extractedKeys.push(value);
+                    }
+                } else {
+                    // Single value
+                    const value = initializer.getText().replace(/['`]/g, '');
+                    extractedKeys.push(value);
+                }
+            }
+        }
+    }
+
+    return extractedKeys;
+}
 
-    const provider = new MeetingSettingsDefinitionService();
+(async (): Promise<void> => {
+    const models: any = yaml.load(getCollectionsYaml())['models'];
+    const meeting = models['meeting']['fields'];
 
     let content = FILE_TEMPLATE + '\n';
-    for (const key of provider.getSettingsKeys()) {
-        const value = provider.settingsMap[key];
-        const defaultValue = meeting[key].default;
+    for (const key of getMeetingSettings()) {
+        const defaultValue = meeting[key]?.default;
         if (defaultValue !== undefined) {
-            provider.validateDefault(key, defaultValue);
-            content += `    "${key}": `;
+            content += `    "${key as string}": `;
             const defaultString = JSON.stringify(defaultValue);
+            /*
             if (value.type === 'string' && !value.dontTranslateDefault) {
                 content += `_(${defaultString}),\n`;
-            } else {
+             else {
                 content += `${defaultString},\n`;
             }
+            */
+            content += `${defaultString},\n`;
         }
     }
     content += '};\n';

client/cli/get-available-languages.ts

@@ -1,6 +1,6 @@
 /**
  * Helper script to print a comma-separated list of all available translations.
  */
-import { availableTranslations } from 'src/app/domain/definitions/languages';
+import { availableTranslations } from '@app/domain/definitions/languages';
 
 console.log(Object.keys(availableTranslations).join(`,`));

client/cli/tsconfig.json

@@ -3,8 +3,10 @@
     "compilerOptions": {
         "baseUrl": "../",
         "module": "commonjs",
+        "types": ["node"],
         "paths": {
             "*": ["*"]
-        }
+        },
+        "rootDir": ".."
     }
 }

client/cli/utils.ts

@@ -0,0 +1,32 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+const SOURCE_META = path.resolve(path.join(__dirname, `../../meta/collection-meta.yml`));
+const SOURCE_COLLECTIONS = path.resolve(path.join(__dirname, `../../meta/collections/`));
+
+export function getCollectionsYaml(): string {
+    if (!fs.existsSync(SOURCE_COLLECTIONS)) {
+        console.log(`no dir `, SOURCE_COLLECTIONS);
+        return null;
+    }
+
+    let content = fs.readFileSync(SOURCE_META).toString();
+    content += `\nmodels:`;
+    const files = fs.readdirSync(SOURCE_COLLECTIONS);
+    for (const file of files) {
+        const filename = path.join(SOURCE_COLLECTIONS, file);
+        if (filename.endsWith(`.yml`)) {
+            const collection = fs.readFileSync(filename).toString().replace(/^(.)/gm, `    $1`);
+            content += `\n  ${file.substring(0, file.length - 4)}:\n${collection}`;
+        }
+    }
+
+    return content;
+}
+
+export function snakeToPascal(input: string): string {
+    return input
+        .split(`_`)
+        .map(substr => substr.charAt(0).toUpperCase() + substr.slice(1))
+        .join(``);
+}

client/eslint.config.mjs

@@ -32,6 +32,7 @@ export default tseslint.config({
     },
     processor: angular.processInlineTemplates,
     rules: {
+        "@angular-eslint/prefer-on-push-component-change-detection": ["off"],
         "@angular-eslint/prefer-standalone": ["off"],
         "@angular-eslint/prefer-inject": ["off"],
         "@angular-eslint/component-selector": ["error", {