Merge branch 'main' into BC-6871-board-refactor

ansible/roles/schulcloud-server-core/templates/common-cartridge-onepassword.yml.j2

@@ -1,7 +1,7 @@
 apiVersion: onepassword.com/v1
 kind: OnePasswordItem
 metadata:
-  name: common-cartridge
+  name: common-cartridge-secret
   namespace: {{ NAMESPACE }}
   labels:
     app: common-cartridge

apps/server/src/apps/common-cartridge.app.ts

@@ -1,7 +1,7 @@
 /* istanbul ignore file */
 /* eslint-disable no-console */
 import { NestFactory } from '@nestjs/core';
-import { Logger } from '@src/core/logger';
+import { LegacyLogger, Logger } from '@src/core/logger';
 import { install as sourceMapInstall } from 'source-map-support';
 import { ExpressAdapter } from '@nestjs/platform-express';
 import { CommonCartridgeApiModule } from '@src/modules/common-cartridge/common-cartridge-api.module';
@@ -18,12 +18,13 @@ async function bootstrap() {
 	const nestExpress = express();
 	const nestExpressAdapter = new ExpressAdapter(nestExpress);
 	const nestApp = await NestFactory.create(CommonCartridgeApiModule, nestExpressAdapter);
-	const logger = await nestApp.resolve(Logger);
 
-	nestApp.useLogger(await nestApp.resolve(Logger));
+	// WinstonLogger
+	nestApp.useLogger(await nestApp.resolve(LegacyLogger));
 	await nestApp.init();
 
 	const rootExpress = express();
+	const logger = await nestApp.resolve(Logger);
 
 	addPrometheusMetricsMiddlewaresIfEnabled(logger, rootExpress);
 

apps/server/src/infra/etherpad-client/etherpad-api-client/.openapi-generator-ignore

@@ -0,0 +1,28 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
+.gitignore
+.npmignore
+git_push.sh
+FILES
+VERSION

apps/server/src/infra/etherpad-client/etherpad-api-client/.openapi-generator/FILES

@@ -0,0 +1,60 @@
+api.ts
+api/author-api.ts
+api/default-api.ts
+api/group-api.ts
+api/pad-api.ts
+api/session-api.ts
+base.ts
+common.ts
+configuration.ts
+index.ts
+models/create-author-using-get200-response-data.ts
+models/create-author-using-get200-response.ts
+models/create-diff-htmlusing-get200-response.ts
+models/create-group-using-get200-response-data.ts
+models/create-group-using-get200-response.ts
+models/create-group-using-get400-response.ts
+models/create-group-using-get401-response.ts
+models/create-group-using-get500-response.ts
+models/create-session-using-get200-response-data.ts
+models/create-session-using-get200-response.ts
+models/delete-group-using-get200-response.ts
+models/get-author-name-using-get200-response-data-info.ts
+models/get-author-name-using-get200-response-data.ts
+models/get-author-name-using-get200-response.ts
+models/get-chat-head-using-get200-response-data.ts
+models/get-chat-head-using-get200-response.ts
+models/get-chat-history-using-get200-response-data-messages-inner.ts
+models/get-chat-history-using-get200-response-data.ts
+models/get-chat-history-using-get200-response.ts
+models/get-htmlusing-get200-response-data.ts
+models/get-htmlusing-get200-response.ts
+models/get-last-edited-using-get200-response-data.ts
+models/get-last-edited-using-get200-response.ts
+models/get-public-status-using-get200-response-data.ts
+models/get-public-status-using-get200-response.ts
+models/get-read-only-idusing-get200-response-data.ts
+models/get-read-only-idusing-get200-response.ts
+models/get-revisions-count-using-get200-response-data.ts
+models/get-revisions-count-using-get200-response.ts
+models/get-session-info-using-get200-response-data-info.ts
+models/get-session-info-using-get200-response-data.ts
+models/get-session-info-using-get200-response.ts
+models/get-text-using-get200-response-data.ts
+models/get-text-using-get200-response.ts
+models/index.ts
+models/list-all-groups-using-get200-response-data.ts
+models/list-all-groups-using-get200-response.ts
+models/list-authors-of-pad-using-get200-response-data.ts
+models/list-authors-of-pad-using-get200-response.ts
+models/list-pads-using-get200-response-data.ts
+models/list-pads-using-get200-response.ts
+models/list-sessions-of-group-using-get200-response-data.ts
+models/list-sessions-of-group-using-get200-response.ts
+models/message.ts
+models/pad-users-count-using-get200-response-data.ts
+models/pad-users-count-using-get200-response.ts
+models/pad-users-using-get200-response-data.ts
+models/pad-users-using-get200-response.ts
+models/session-info.ts
+models/user-info.ts

apps/server/src/infra/etherpad-client/etherpad-api-client/.openapi-generator/VERSION

@@ -0,0 +1 @@
+7.6.0