;
/**
*
@@ -27898,13 +27933,12 @@ export class UserImportApi extends BaseAPI implements UserImportApiInterface {
/**
* Populates import users from specific user migration populate endpoint.
* @summary Populates import users
- * @param {boolean} [matchByPreferredName] Should the users preferred name from the external system be used for auto-matching to existing users?
* @param {*} [options] Override http request option.
* @throws {RequiredError}
* @memberof UserImportApi
*/
- public importUserControllerPopulateImportUsers(matchByPreferredName?: boolean, options?: any) {
- return UserImportApiFp(this.configuration).importUserControllerPopulateImportUsers(matchByPreferredName, options).then((request) => request(this.axios, this.basePath));
+ public importUserControllerPopulateImportUsers(options?: any) {
+ return UserImportApiFp(this.configuration).importUserControllerPopulateImportUsers(options).then((request) => request(this.axios, this.basePath));
}
/**
diff --git a/src/store/env-config-defaults.ts b/src/store/env-config-defaults.ts
index 81c74c84fb..aff6f21f92 100644
--- a/src/store/env-config-defaults.ts
+++ b/src/store/env-config-defaults.ts
@@ -30,6 +30,7 @@ export const defaultConfigEnvs: ConfigResponse = {
FEATURE_CTL_TOOLS_TAB_ENABLED: false,
FEATURE_CTL_TOOLS_COPY_ENABLED: false,
ACCESSIBILITY_REPORT_EMAIL: "",
+ SUPPORT_PROBLEM_EMAIL_ADDRESS: "",
FEATURE_NEW_SCHOOL_ADMINISTRATION_PAGE_AS_DEFAULT_ENABLED: false,
FEATURE_LTI_TOOLS_TAB_ENABLED: true,
FEATURE_SHOW_MIGRATION_WIZARD: false,
diff --git a/src/store/env-config.ts b/src/store/env-config.ts
index 9afb2b85f4..adeef7bab4 100644
--- a/src/store/env-config.ts
+++ b/src/store/env-config.ts
@@ -144,6 +144,10 @@ export default class EnvConfigModule extends VuexModule {
return this.env.GHOST_BASE_URL;
}
+ get getSupportProblemEmail(): string {
+ return this.env.SUPPORT_PROBLEM_EMAIL_ADDRESS;
+ }
+
get getAccessibilityReportEmail(): string {
return this.env.ACCESSIBILITY_REPORT_EMAIL;
}
diff --git a/src/themes/n21/components/legacy/TheFooter.vue b/src/themes/n21/components/legacy/TheFooter.vue
index 60216f4997..215061e31f 100644
--- a/src/themes/n21/components/legacy/TheFooter.vue
+++ b/src/themes/n21/components/legacy/TheFooter.vue
@@ -58,7 +58,10 @@ export default {
rel: "noopener",
},
{
- href: "mailto:nbc-support@netz-21.de?subject=Niedersächsische%20Bildungscloud%20Anfrage",
+ href:
+ "mailto:" +
+ envConfigModule.getSupportProblemEmail +
+ "?subject=Niedersächsische%20Bildungscloud%20Anfrage",
text: this.$t("components.legacy.footer.contact"),
},
];
diff --git a/src/themes/n21/components/templates/impressum.unit.ts b/src/themes/n21/components/templates/impressum.unit.ts
new file mode 100644
index 0000000000..a41b917644
--- /dev/null
+++ b/src/themes/n21/components/templates/impressum.unit.ts
@@ -0,0 +1,55 @@
+import { envConfigModule } from "@/store";
+import EnvConfigModule from "@/store/env-config";
+import setupStores from "@@/tests/test-utils/setupStores";
+import Impressum from "./impressum.vue";
+import { envsFactory } from "@@/tests/test-utils";
+import { createTestingI18n } from "@@/tests/test-utils/setup";
+
+describe("impressum.vue", () => {
+ beforeEach(() => {
+ setupStores({
+ envConfigModule: EnvConfigModule,
+ });
+ });
+
+ const setup = (mail = "") => {
+ const envs = envsFactory.build({
+ SUPPORT_PROBLEM_EMAIL_ADDRESS: mail,
+ });
+ envConfigModule.setEnvs(envs);
+
+ const wrapper = mount(Impressum, {
+ global: {
+ plugins: [createTestingI18n()],
+ },
+ });
+ return wrapper;
+ };
+
+ it("renders the component", () => {
+ const wrapper = setup();
+ expect(wrapper.findComponent(Impressum).exists()).toBeTruthy();
+ });
+
+ describe("when environment variable is no valid email", () => {
+ it("should use correct values fro supportMail and mailtoSupportMail", () => {
+ const supportMail = "support@example.com";
+ const wrapper = setup(supportMail);
+
+ const mailtoSupportMail = `mailto:${supportMail}`;
+ const supportMailLink = wrapper.find("[data-testid=support-mail]");
+ expect(supportMailLink.attributes("href")).toBe(mailtoSupportMail);
+ expect(supportMailLink.text()).toBe(supportMail);
+ });
+ });
+
+ describe("when environment variable is no valid email", () => {
+ it("should not use environment variable", () => {
+ const wrapper = setup("invalid-email");
+
+ const supportMailLink = wrapper.find("[data-testid=support-mail]");
+ expect(supportMailLink.attributes("href")).toBe("#");
+ expect(supportMailLink.text()).toBe("");
+ });
+ });
+});
diff --git a/src/themes/n21/components/templates/impressum.vue b/src/themes/n21/components/templates/impressum.vue
index 5002e5e8ae..45a28f5568 100644
--- a/src/themes/n21/components/templates/impressum.vue
+++ b/src/themes/n21/components/templates/impressum.vue
@@ -22,8 +22,9 @@
Support-Anfragen richten Sie bitte direkt an
- nbc-support@netz-21.de{{
+ supportMail
+ }}.
Vertretungsberechtigter Geschäftsführer
@@ -89,8 +90,20 @@
-