From 85bbdbf109dca7f0ec0aadf4456fb6c36c69b464 Mon Sep 17 00:00:00 2001
From: Gordon Nicholas <gordon.nicholas@capgemini.com>
Date: Fri, 8 Nov 2024 09:35:37 +0100
Subject: [PATCH 1/9] N21-2166 external logout buttons

---
 .../data/system/SystemApi.composable.ts       |   1 +
 src/modules/data/system/type/System.ts        |   2 +
 src/modules/ui/layout/topbar/UserMenu.unit.ts | 183 ++++++-
 src/modules/ui/layout/topbar/UserMenu.vue     |  64 ++-
 src/serverApi/v3/api.ts                       | 453 ++++++++++++++++++
 src/store/auth.ts                             |   5 +
 src/store/env-config-defaults.ts              |   1 +
 7 files changed, 700 insertions(+), 9 deletions(-)

diff --git a/src/modules/data/system/SystemApi.composable.ts b/src/modules/data/system/SystemApi.composable.ts
index b67365e102..ffe036911d 100644
--- a/src/modules/data/system/SystemApi.composable.ts
+++ b/src/modules/data/system/SystemApi.composable.ts
@@ -15,6 +15,7 @@ export const useSystemApi = () => {
 
 			const system: System = {
 				id: response.data.id,
+				alias: response.data.alias,
 				displayName: response.data.displayName ?? "",
 			};
 
diff --git a/src/modules/data/system/type/System.ts b/src/modules/data/system/type/System.ts
index 4db6241e1d..b0164c9a32 100644
--- a/src/modules/data/system/type/System.ts
+++ b/src/modules/data/system/type/System.ts
@@ -1,5 +1,7 @@
 export interface System {
 	id: string;
 
+	alias?: string | null;
+
 	displayName: string;
 }
diff --git a/src/modules/ui/layout/topbar/UserMenu.unit.ts b/src/modules/ui/layout/topbar/UserMenu.unit.ts
index 25a93766ad..05302762a1 100644
--- a/src/modules/ui/layout/topbar/UserMenu.unit.ts
+++ b/src/modules/ui/layout/topbar/UserMenu.unit.ts
@@ -5,27 +5,58 @@ import {
 	createTestingVuetify,
 } from "@@/tests/test-utils/setup";
 import { createModuleMocks } from "@@/tests/test-utils/mock-store-module";
-import { AUTH_MODULE_KEY, ENV_CONFIG_MODULE_KEY } from "@/utils/inject";
+import { envsFactory } from "@@/tests/test-utils";
+import {
+	AUTH_MODULE_KEY,
+	ENV_CONFIG_MODULE_KEY,
+	NOTIFIER_MODULE_KEY,
+} from "@/utils/inject";
 import AuthModule from "@/store/auth";
 import EnvConfigModule from "@/store/env-config";
 import { LanguageType } from "@/serverApi/v3";
+import { System, useSystemApi } from "@data-system";
+import { createMock, DeepMocked } from "@golevelup/ts-jest";
+import NotifierModule from "@/store/notifier";
+import { VBtn } from "vuetify/lib/components/index.mjs";
+
+jest.mock("@data-system");
 
 describe("@ui-layout/UserMenu", () => {
-	const setup = () => {
+	let useSystemApiMock: DeepMocked<ReturnType<typeof useSystemApi>>;
+
+	const setupWrapper = (
+		isExternalFeatureEnabled = false,
+		mockedSystem?: System
+	) => {
 		const authModule = createModuleMocks(AuthModule, {
 			getLocale: "de",
 			logout: jest.fn(),
+			externalLogout: jest.fn(),
+			getAccessToken:
+				"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwic3lzdGVtSWQiOiJhYmMxMjMiLCJpYX" +
+				"QiOjE1MTYyMzkwMjJ9.Zrpvm5T50Y_s-pd5OoqdxKRBaf3rJGMAviUz7Be84zA",
 		});
+
 		const envConfigModule = createModuleMocks(EnvConfigModule, {
 			getAvailableLanguages: [LanguageType.De, LanguageType.En],
+			getEnv: envsFactory.build({
+				FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED: isExternalFeatureEnabled,
+			}),
 		});
 
+		const notifierModule = createModuleMocks(NotifierModule);
+
+		useSystemApiMock = createMock<ReturnType<typeof useSystemApi>>();
+		jest.mocked(useSystemApi).mockReturnValue(useSystemApiMock);
+		useSystemApiMock.getSystem.mockResolvedValue(mockedSystem);
+
 		const wrapper = mount(UserMenu, {
 			global: {
 				plugins: [createTestingVuetify(), createTestingI18n()],
 				provide: {
 					[AUTH_MODULE_KEY.valueOf()]: authModule,
 					[ENV_CONFIG_MODULE_KEY.valueOf()]: envConfigModule,
+					[NOTIFIER_MODULE_KEY.valueOf()]: notifierModule,
 				},
 			},
 			props: {
@@ -41,15 +72,19 @@ describe("@ui-layout/UserMenu", () => {
 		return { wrapper, authModule };
 	};
 
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
 	it("should render with correct user initials", async () => {
-		const { wrapper } = setup();
+		const { wrapper } = setupWrapper();
 
 		const initials = wrapper.findComponent("[data-testid=user-menu-btn]");
 		expect(initials.text()).toMatch("AD");
 	});
 
 	it("should render correct active user name with role", async () => {
-		const { wrapper } = setup();
+		const { wrapper } = setupWrapper();
 
 		const menuBtn = wrapper.findComponent({ name: "VBtn" });
 		await menuBtn.trigger("click");
@@ -61,7 +96,7 @@ describe("@ui-layout/UserMenu", () => {
 	});
 
 	it("should trigger logout function on logout item click", async () => {
-		const { wrapper, authModule } = setup();
+		const { wrapper, authModule } = setupWrapper();
 
 		const menuBtn = wrapper.findComponent({ name: "VBtn" });
 		await menuBtn.trigger("click");
@@ -72,4 +107,142 @@ describe("@ui-layout/UserMenu", () => {
 
 		expect(authModule.logout).toHaveBeenCalled();
 	});
+
+	describe("external logout", () => {
+		describe("when feature flag is enabled and the user is logged in from moin.schule", () => {
+			const setup = () => {
+				const mockedSystem: System = {
+					id: "testId",
+					displayName: "moin.schule",
+					alias: "SANIS",
+				};
+
+				const { wrapper, authModule } = setupWrapper(true, mockedSystem);
+
+				return { wrapper, authModule, mockedSystem };
+			};
+
+			it("should show the external logout button", async () => {
+				const { wrapper, mockedSystem } = setup();
+
+				const menuBtn = wrapper.findComponent({ name: "VBtn" });
+				await menuBtn.trigger("click");
+
+				const externalLogoutBtn = wrapper.findComponent(
+					"[data-testid=external-logout]"
+				);
+
+				expect(externalLogoutBtn.exists()).toBe(true);
+				expect(externalLogoutBtn.text()).toEqual(
+					`common.labels.logout Bildungscloud & ${mockedSystem.displayName}`
+				);
+			});
+
+			it("should trigger external logout function on logout item click", async () => {
+				const { wrapper, authModule } = setup();
+
+				const menuBtn = wrapper.findComponent({ name: "VBtn" });
+				await menuBtn.trigger("click");
+
+				const externalLogoutBtn = wrapper.findComponent(
+					"[data-testid=external-logout]"
+				);
+
+				expect(externalLogoutBtn.exists()).toBe(true);
+				await externalLogoutBtn.trigger("click");
+
+				expect(authModule.externalLogout).toHaveBeenCalled();
+			});
+
+			it("should show the correct text for the logout button", async () => {
+				const { wrapper } = setup();
+
+				const menuBtn = wrapper.findComponent({ name: "VBtn" });
+				await menuBtn.trigger("click");
+
+				const logoutBtn = wrapper.findComponent("[data-testid=logout]");
+
+				expect(logoutBtn.exists()).toBe(true);
+				expect(logoutBtn.text()).toEqual(`common.labels.logout Bildungscloud`);
+			});
+		});
+
+		describe("when feature flag is disabled", () => {
+			const setup = () => {
+				const mockedSystem: System = {
+					id: "testId",
+					displayName: "moin.schule",
+					alias: "SANIS",
+				};
+
+				const { wrapper } = setupWrapper(false, mockedSystem);
+
+				return { wrapper };
+			};
+
+			it("should not show the external logout button", async () => {
+				const { wrapper } = setup();
+
+				const menuBtn = wrapper.findComponent(VBtn);
+				await menuBtn.trigger("click");
+
+				const externalLogoutBtn = wrapper.findComponent(
+					"[data-testid=external-logout]"
+				);
+
+				expect(externalLogoutBtn.exists()).toBe(false);
+			});
+
+			it("should show the correct text for the logout button", async () => {
+				const { wrapper } = setup();
+
+				const menuBtn = wrapper.findComponent({ name: "VBtn" });
+				await menuBtn.trigger("click");
+
+				const logoutBtn = wrapper.findComponent("[data-testid=logout]");
+
+				expect(logoutBtn.exists()).toBe(true);
+				expect(logoutBtn.text()).toEqual("common.labels.logout");
+			});
+		});
+
+		describe("when user is not logged in from moin.schule", () => {
+			const setup = () => {
+				const mockedSystem: System = {
+					id: "testId",
+					displayName: "mock",
+					alias: "mock-system",
+				};
+
+				const { wrapper } = setupWrapper(true, mockedSystem);
+
+				return { wrapper };
+			};
+
+			it("should not show the external logout button", async () => {
+				const { wrapper } = setup();
+
+				const menuBtn = wrapper.findComponent(VBtn);
+				await menuBtn.trigger("click");
+
+				const externalLogoutBtn = wrapper.findComponent(
+					"[data-testid=external-logout]"
+				);
+
+				expect(externalLogoutBtn.exists()).toBe(false);
+			});
+
+			it("should show the correct text for the logout button", async () => {
+				const { wrapper } = setup();
+
+				const menuBtn = wrapper.findComponent({ name: "VBtn" });
+				await menuBtn.trigger("click");
+
+				const logoutBtn = wrapper.findComponent("[data-testid=logout]");
+
+				expect(logoutBtn.exists()).toBe(true);
+				expect(logoutBtn.text()).toEqual("common.labels.logout");
+			});
+		});
+	});
 });
diff --git a/src/modules/ui/layout/topbar/UserMenu.vue b/src/modules/ui/layout/topbar/UserMenu.vue
index 40a7cf39e0..83a581054e 100644
--- a/src/modules/ui/layout/topbar/UserMenu.vue
+++ b/src/modules/ui/layout/topbar/UserMenu.vue
@@ -1,5 +1,5 @@
 <template>
-	<VMenu width="215">
+	<VMenu :width="isExternalLogoutAllowed ? 'auto' : '215'">
 		<template v-slot:activator="{ props }">
 			<VBtn
 				v-bind="props"
@@ -22,18 +22,32 @@
 				{{ $t("global.topbar.settings") }}
 			</VListItem>
 			<VListItem data-testid="logout" @click="logout">
-				{{ $t("common.labels.logout") }}
+				{{ $t("common.labels.logout")
+				}}{{ isExternalLogoutAllowed ? " Bildungscloud" : "" }}
+			</VListItem>
+			<VListItem
+				v-if="isExternalLogoutAllowed"
+				data-testid="external-logout"
+				@click="externalLogout"
+			>
+				{{ $t("common.labels.logout")
+				}}{{ isExternalLogoutAllowed ? ` Bildungscloud & ${systemName}` : "" }}
 			</VListItem>
 		</VList>
 	</VMenu>
 </template>
 
 <script setup lang="ts">
-import { computed, PropType, toRef } from "vue";
+import { computed, onMounted, PropType, Ref, ref, toRef } from "vue";
 import { useI18n } from "vue-i18n";
 import LanguageMenu from "./LanguageMenu.vue";
 import { MeUserResponse } from "@/serverApi/v3";
-import { injectStrict, AUTH_MODULE_KEY } from "@/utils/inject";
+import {
+	injectStrict,
+	AUTH_MODULE_KEY,
+	ENV_CONFIG_MODULE_KEY,
+} from "@/utils/inject";
+import { System, useSystemApi } from "@data-system";
 
 const props = defineProps({
 	user: {
@@ -48,6 +62,9 @@ const props = defineProps({
 
 const { t } = useI18n();
 const authModule = injectStrict(AUTH_MODULE_KEY);
+const envConfigModule = injectStrict(ENV_CONFIG_MODULE_KEY);
+
+const system = useSystemApi();
 
 const userRole = computed(() => {
 	return t(`common.roleName.${toRef(props.roleNames).value[0]}`).toString();
@@ -57,9 +74,48 @@ const initials = computed(() => {
 	return props.user.firstName.slice(0, 1) + props.user.lastName.slice(0, 1);
 });
 
+const isExternalLogoutAllowed: Ref<boolean> = ref(false);
+
+const systemName: Ref<string> = ref("");
+
 const logout = () => {
 	authModule.logout();
 };
+
+const externalLogout = () => {
+	authModule.externalLogout();
+};
+
+const setSystemValuesFromJwt = async (jwt: string): Promise<void> => {
+	const jwtPayload = JSON.parse(atob(jwt.split(".")[1]));
+	if (!("systemId" in jwtPayload) && !jwtPayload.systemId) {
+		return;
+	}
+
+	const fetchedSystem: System | undefined = await system.getSystem(
+		jwtPayload.systemId
+	);
+
+	if (!fetchedSystem || !fetchedSystem.alias) {
+		return;
+	}
+
+	isExternalLogoutAllowed.value =
+		fetchedSystem.alias === "SANIS" &&
+		envConfigModule.getEnv.FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED;
+	systemName.value = fetchedSystem.displayName;
+};
+
+onMounted(async () => {
+	const jwt = authModule.getAccessToken;
+	if (jwt) {
+		try {
+			await setSystemValuesFromJwt(jwt);
+		} catch (e) {
+			console.error(e);
+		}
+	}
+});
 </script>
 
 <style scoped>
diff --git a/src/serverApi/v3/api.ts b/src/serverApi/v3/api.ts
index dbce02b830..52e8a65faa 100644
--- a/src/serverApi/v3/api.ts
+++ b/src/serverApi/v3/api.ts
@@ -114,6 +114,19 @@ export interface AccountSearchListResponse {
      */
     limit: number;
 }
+/**
+ * 
+ * @export
+ * @interface AddRoomMembersBodyParams
+ */
+export interface AddRoomMembersBodyParams {
+    /**
+     * Array of userIds and their roles inside of the room
+     * @type {Array<UserIdAndRole>}
+     * @memberof AddRoomMembersBodyParams
+     */
+    userIdsAndRoles: Array<UserIdAndRole>;
+}
 /**
  * 
  * @export
@@ -1570,6 +1583,12 @@ export interface ConfigResponse {
      * @memberof ConfigResponse
      */
     FEATURE_ROOMS_ENABLED: boolean;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ConfigResponse
+     */
+    FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED: boolean;
 }
 /**
  * 
@@ -6603,6 +6622,19 @@ export interface RedirectResponse {
      */
     redirect_to: string;
 }
+/**
+ * 
+ * @export
+ * @interface RemoveRoomMembersBodyParams
+ */
+export interface RemoveRoomMembersBodyParams {
+    /**
+     * The IDs of the users
+     * @type {Array<string>}
+     * @memberof RemoveRoomMembersBodyParams
+     */
+    userIds: Array<string>;
+}
 /**
  * 
  * @export
@@ -6968,6 +7000,56 @@ export interface RoomListResponse {
      */
     limit: number;
 }
+/**
+ * 
+ * @export
+ * @interface RoomMemberListResponse
+ */
+export interface RoomMemberListResponse {
+    /**
+     * 
+     * @type {Array<RoomMemberResponse>}
+     * @memberof RoomMemberListResponse
+     */
+    data: Array<RoomMemberResponse>;
+}
+/**
+ * 
+ * @export
+ * @interface RoomMemberResponse
+ */
+export interface RoomMemberResponse {
+    /**
+     * 
+     * @type {string}
+     * @memberof RoomMemberResponse
+     */
+    firstName: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof RoomMemberResponse
+     */
+    lastName: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof RoomMemberResponse
+     */
+    roleName: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof RoomMemberResponse
+     */
+    schoolName: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof RoomMemberResponse
+     */
+    userId: string;
+}
 /**
  * 
  * @export
@@ -7582,6 +7664,12 @@ export interface SchoolUserResponse {
      * @memberof SchoolUserResponse
      */
     lastName: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof SchoolUserResponse
+     */
+    schoolName: string;
     /**
      * 
      * @type {string}
@@ -8788,6 +8876,35 @@ export interface UserDataResponse {
      */
     userId: string;
 }
+/**
+ * 
+ * @export
+ * @interface UserIdAndRole
+ */
+export interface UserIdAndRole {
+    /**
+     * The ID of the user
+     * @type {string}
+     * @memberof UserIdAndRole
+     */
+    userId: string;
+    /**
+     * The role of the user
+     * @type {string}
+     * @memberof UserIdAndRole
+     */
+    roleName: UserIdAndRoleRoleNameEnum;
+}
+
+/**
+    * @export
+    * @enum {string}
+    */
+export enum UserIdAndRoleRoleNameEnum {
+    Editor = 'room_editor',
+    Viewer = 'room_viewer'
+}
+
 /**
  * 
  * @export
@@ -10652,6 +10769,40 @@ export const AuthenticationApiAxiosParamCreator = function (configuration?: Conf
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @summary Logs out a user from the external system.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        logoutControllerExternalSystemLogout: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/logout/external`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication bearer required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration)
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary Logs out a user.
@@ -10729,6 +10880,16 @@ export const AuthenticationApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.loginControllerLoginOauth2(oauth2AuthorizationBodyParams, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @summary Logs out a user from the external system.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async logoutControllerExternalSystemLogout(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.logoutControllerExternalSystemLogout(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @summary Logs out a user.
@@ -10779,6 +10940,15 @@ export const AuthenticationApiFactory = function (configuration?: Configuration,
         loginControllerLoginOauth2(oauth2AuthorizationBodyParams: Oauth2AuthorizationBodyParams, options?: any): AxiosPromise<LoginResponse> {
             return localVarFp.loginControllerLoginOauth2(oauth2AuthorizationBodyParams, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary Logs out a user from the external system.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        logoutControllerExternalSystemLogout(options?: any): AxiosPromise<void> {
+            return localVarFp.logoutControllerExternalSystemLogout(options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary Logs out a user.
@@ -10827,6 +10997,15 @@ export interface AuthenticationApiInterface {
      */
     loginControllerLoginOauth2(oauth2AuthorizationBodyParams: Oauth2AuthorizationBodyParams, options?: any): AxiosPromise<LoginResponse>;
 
+    /**
+     * 
+     * @summary Logs out a user from the external system.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof AuthenticationApiInterface
+     */
+    logoutControllerExternalSystemLogout(options?: any): AxiosPromise<void>;
+
     /**
      * 
      * @summary Logs out a user.
@@ -10881,6 +11060,17 @@ export class AuthenticationApi extends BaseAPI implements AuthenticationApiInter
         return AuthenticationApiFp(this.configuration).loginControllerLoginOauth2(oauth2AuthorizationBodyParams, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @summary Logs out a user from the external system.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof AuthenticationApi
+     */
+    public logoutControllerExternalSystemLogout(options?: any) {
+        return AuthenticationApiFp(this.configuration).logoutControllerExternalSystemLogout(options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @summary Logs out a user.
@@ -19761,6 +19951,50 @@ export class PseudonymApi extends BaseAPI implements PseudonymApiInterface {
  */
 export const RoomApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
+        /**
+         * 
+         * @summary Add members to a room
+         * @param {string} roomId 
+         * @param {AddRoomMembersBodyParams} addRoomMembersBodyParams 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        roomControllerAddMembers: async (roomId: string, addRoomMembersBodyParams: AddRoomMembersBodyParams, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'roomId' is not null or undefined
+            assertParamExists('roomControllerAddMembers', 'roomId', roomId)
+            // verify required parameter 'addRoomMembersBodyParams' is not null or undefined
+            assertParamExists('roomControllerAddMembers', 'addRoomMembersBodyParams', addRoomMembersBodyParams)
+            const localVarPath = `/rooms/{roomId}/members/add`
+                .replace(`{${"roomId"}}`, encodeURIComponent(String(roomId)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication bearer required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration)
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(addRoomMembersBodyParams, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary Create a new room
@@ -19830,6 +20064,44 @@ export const RoomApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @summary Get a list of room members.
+         * @param {string} roomId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        roomControllerGetMembers: async (roomId: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'roomId' is not null or undefined
+            assertParamExists('roomControllerGetMembers', 'roomId', roomId)
+            const localVarPath = `/rooms/{roomId}/members`
+                .replace(`{${"roomId"}}`, encodeURIComponent(String(roomId)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication bearer required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration)
+
+
+    
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -19921,6 +20193,50 @@ export const RoomApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @summary Remove members from a room
+         * @param {string} roomId 
+         * @param {RemoveRoomMembersBodyParams} removeRoomMembersBodyParams 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        roomControllerRemoveMembers: async (roomId: string, removeRoomMembersBodyParams: RemoveRoomMembersBodyParams, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'roomId' is not null or undefined
+            assertParamExists('roomControllerRemoveMembers', 'roomId', roomId)
+            // verify required parameter 'removeRoomMembersBodyParams' is not null or undefined
+            assertParamExists('roomControllerRemoveMembers', 'removeRoomMembersBodyParams', removeRoomMembersBodyParams)
+            const localVarPath = `/rooms/{roomId}/members/remove`
+                .replace(`{${"roomId"}}`, encodeURIComponent(String(roomId)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication bearer required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration)
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(removeRoomMembersBodyParams, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary Create a new room
@@ -19975,6 +20291,18 @@ export const RoomApiAxiosParamCreator = function (configuration?: Configuration)
 export const RoomApiFp = function(configuration?: Configuration) {
     const localVarAxiosParamCreator = RoomApiAxiosParamCreator(configuration)
     return {
+        /**
+         * 
+         * @summary Add members to a room
+         * @param {string} roomId 
+         * @param {AddRoomMembersBodyParams} addRoomMembersBodyParams 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async roomControllerAddMembers(roomId: string, addRoomMembersBodyParams: AddRoomMembersBodyParams, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.roomControllerAddMembers(roomId, addRoomMembersBodyParams, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @summary Create a new room
@@ -19997,6 +20325,17 @@ export const RoomApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.roomControllerDeleteRoom(roomId, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @summary Get a list of room members.
+         * @param {string} roomId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async roomControllerGetMembers(roomId: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<RoomMemberListResponse>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.roomControllerGetMembers(roomId, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @summary Get the details of a room
@@ -20020,6 +20359,18 @@ export const RoomApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.roomControllerGetRooms(skip, limit, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @summary Remove members from a room
+         * @param {string} roomId 
+         * @param {RemoveRoomMembersBodyParams} removeRoomMembersBodyParams 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async roomControllerRemoveMembers(roomId: string, removeRoomMembersBodyParams: RemoveRoomMembersBodyParams, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.roomControllerRemoveMembers(roomId, removeRoomMembersBodyParams, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @summary Create a new room
@@ -20042,6 +20393,17 @@ export const RoomApiFp = function(configuration?: Configuration) {
 export const RoomApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
     const localVarFp = RoomApiFp(configuration)
     return {
+        /**
+         * 
+         * @summary Add members to a room
+         * @param {string} roomId 
+         * @param {AddRoomMembersBodyParams} addRoomMembersBodyParams 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        roomControllerAddMembers(roomId: string, addRoomMembersBodyParams: AddRoomMembersBodyParams, options?: any): AxiosPromise<string> {
+            return localVarFp.roomControllerAddMembers(roomId, addRoomMembersBodyParams, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary Create a new room
@@ -20062,6 +20424,16 @@ export const RoomApiFactory = function (configuration?: Configuration, basePath?
         roomControllerDeleteRoom(roomId: string, options?: any): AxiosPromise<void> {
             return localVarFp.roomControllerDeleteRoom(roomId, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary Get a list of room members.
+         * @param {string} roomId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        roomControllerGetMembers(roomId: string, options?: any): AxiosPromise<RoomMemberListResponse> {
+            return localVarFp.roomControllerGetMembers(roomId, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary Get the details of a room
@@ -20083,6 +20455,17 @@ export const RoomApiFactory = function (configuration?: Configuration, basePath?
         roomControllerGetRooms(skip?: number, limit?: number, options?: any): AxiosPromise<RoomListResponse> {
             return localVarFp.roomControllerGetRooms(skip, limit, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary Remove members from a room
+         * @param {string} roomId 
+         * @param {RemoveRoomMembersBodyParams} removeRoomMembersBodyParams 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        roomControllerRemoveMembers(roomId: string, removeRoomMembersBodyParams: RemoveRoomMembersBodyParams, options?: any): AxiosPromise<string> {
+            return localVarFp.roomControllerRemoveMembers(roomId, removeRoomMembersBodyParams, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary Create a new room
@@ -20103,6 +20486,17 @@ export const RoomApiFactory = function (configuration?: Configuration, basePath?
  * @interface RoomApi
  */
 export interface RoomApiInterface {
+    /**
+     * 
+     * @summary Add members to a room
+     * @param {string} roomId 
+     * @param {AddRoomMembersBodyParams} addRoomMembersBodyParams 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof RoomApiInterface
+     */
+    roomControllerAddMembers(roomId: string, addRoomMembersBodyParams: AddRoomMembersBodyParams, options?: any): AxiosPromise<string>;
+
     /**
      * 
      * @summary Create a new room
@@ -20123,6 +20517,16 @@ export interface RoomApiInterface {
      */
     roomControllerDeleteRoom(roomId: string, options?: any): AxiosPromise<void>;
 
+    /**
+     * 
+     * @summary Get a list of room members.
+     * @param {string} roomId 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof RoomApiInterface
+     */
+    roomControllerGetMembers(roomId: string, options?: any): AxiosPromise<RoomMemberListResponse>;
+
     /**
      * 
      * @summary Get the details of a room
@@ -20144,6 +20548,17 @@ export interface RoomApiInterface {
      */
     roomControllerGetRooms(skip?: number, limit?: number, options?: any): AxiosPromise<RoomListResponse>;
 
+    /**
+     * 
+     * @summary Remove members from a room
+     * @param {string} roomId 
+     * @param {RemoveRoomMembersBodyParams} removeRoomMembersBodyParams 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof RoomApiInterface
+     */
+    roomControllerRemoveMembers(roomId: string, removeRoomMembersBodyParams: RemoveRoomMembersBodyParams, options?: any): AxiosPromise<string>;
+
     /**
      * 
      * @summary Create a new room
@@ -20164,6 +20579,19 @@ export interface RoomApiInterface {
  * @extends {BaseAPI}
  */
 export class RoomApi extends BaseAPI implements RoomApiInterface {
+    /**
+     * 
+     * @summary Add members to a room
+     * @param {string} roomId 
+     * @param {AddRoomMembersBodyParams} addRoomMembersBodyParams 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof RoomApi
+     */
+    public roomControllerAddMembers(roomId: string, addRoomMembersBodyParams: AddRoomMembersBodyParams, options?: any) {
+        return RoomApiFp(this.configuration).roomControllerAddMembers(roomId, addRoomMembersBodyParams, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @summary Create a new room
@@ -20188,6 +20616,18 @@ export class RoomApi extends BaseAPI implements RoomApiInterface {
         return RoomApiFp(this.configuration).roomControllerDeleteRoom(roomId, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @summary Get a list of room members.
+     * @param {string} roomId 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof RoomApi
+     */
+    public roomControllerGetMembers(roomId: string, options?: any) {
+        return RoomApiFp(this.configuration).roomControllerGetMembers(roomId, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @summary Get the details of a room
@@ -20213,6 +20653,19 @@ export class RoomApi extends BaseAPI implements RoomApiInterface {
         return RoomApiFp(this.configuration).roomControllerGetRooms(skip, limit, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @summary Remove members from a room
+     * @param {string} roomId 
+     * @param {RemoveRoomMembersBodyParams} removeRoomMembersBodyParams 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof RoomApi
+     */
+    public roomControllerRemoveMembers(roomId: string, removeRoomMembersBodyParams: RemoveRoomMembersBodyParams, options?: any) {
+        return RoomApiFp(this.configuration).roomControllerRemoveMembers(roomId, removeRoomMembersBodyParams, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @summary Create a new room
diff --git a/src/store/auth.ts b/src/store/auth.ts
index 0d6208ebf5..9bface9d6a 100644
--- a/src/store/auth.ts
+++ b/src/store/auth.ts
@@ -184,4 +184,9 @@ export default class AuthModule extends VuexModule {
 		delete $axios.defaults.headers.common["Authorization"];
 		window.location.replace(redirectUrl);
 	}
+
+	@Action
+	externalLogout(redirectUrl = "/logout/external"): void {
+		window.location.replace(redirectUrl);
+	}
 }
diff --git a/src/store/env-config-defaults.ts b/src/store/env-config-defaults.ts
index 961423679e..28c4cf759f 100644
--- a/src/store/env-config-defaults.ts
+++ b/src/store/env-config-defaults.ts
@@ -77,4 +77,5 @@ export const defaultConfigEnvs: ConfigResponse = {
 	FEATURE_ROOMS_ENABLED: false,
 	CALENDAR_SERVICE_ENABLED: false,
 	FEATURE_PREFERRED_CTL_TOOLS_ENABLED: false,
+	FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED: false,
 };

From 3f4d9f9c7a430d95b53deacd8b94b271e5d5a8f1 Mon Sep 17 00:00:00 2001
From: Gordon Nicholas <gordon.nicholas@capgemini.com>
Date: Fri, 8 Nov 2024 09:35:37 +0100
Subject: [PATCH 2/9] N21-2136 external logout buttons

---
 .../data/system/SystemApi.composable.ts       |   1 +
 src/modules/data/system/type/System.ts        |   2 +
 src/modules/ui/layout/topbar/UserMenu.unit.ts | 183 ++++++-
 src/modules/ui/layout/topbar/UserMenu.vue     |  64 ++-
 src/serverApi/v3/api.ts                       | 453 ++++++++++++++++++
 src/store/auth.ts                             |   5 +
 src/store/env-config-defaults.ts              |   1 +
 7 files changed, 700 insertions(+), 9 deletions(-)

diff --git a/src/modules/data/system/SystemApi.composable.ts b/src/modules/data/system/SystemApi.composable.ts
index b67365e102..ffe036911d 100644
--- a/src/modules/data/system/SystemApi.composable.ts
+++ b/src/modules/data/system/SystemApi.composable.ts
@@ -15,6 +15,7 @@ export const useSystemApi = () => {
 
 			const system: System = {
 				id: response.data.id,
+				alias: response.data.alias,
 				displayName: response.data.displayName ?? "",
 			};
 
diff --git a/src/modules/data/system/type/System.ts b/src/modules/data/system/type/System.ts
index 4db6241e1d..b0164c9a32 100644
--- a/src/modules/data/system/type/System.ts
+++ b/src/modules/data/system/type/System.ts
@@ -1,5 +1,7 @@
 export interface System {
 	id: string;
 
+	alias?: string | null;
+
 	displayName: string;
 }
diff --git a/src/modules/ui/layout/topbar/UserMenu.unit.ts b/src/modules/ui/layout/topbar/UserMenu.unit.ts
index 25a93766ad..05302762a1 100644
--- a/src/modules/ui/layout/topbar/UserMenu.unit.ts
+++ b/src/modules/ui/layout/topbar/UserMenu.unit.ts
@@ -5,27 +5,58 @@ import {
 	createTestingVuetify,
 } from "@@/tests/test-utils/setup";
 import { createModuleMocks } from "@@/tests/test-utils/mock-store-module";
-import { AUTH_MODULE_KEY, ENV_CONFIG_MODULE_KEY } from "@/utils/inject";
+import { envsFactory } from "@@/tests/test-utils";
+import {
+	AUTH_MODULE_KEY,
+	ENV_CONFIG_MODULE_KEY,
+	NOTIFIER_MODULE_KEY,
+} from "@/utils/inject";
 import AuthModule from "@/store/auth";
 import EnvConfigModule from "@/store/env-config";
 import { LanguageType } from "@/serverApi/v3";
+import { System, useSystemApi } from "@data-system";
+import { createMock, DeepMocked } from "@golevelup/ts-jest";
+import NotifierModule from "@/store/notifier";
+import { VBtn } from "vuetify/lib/components/index.mjs";
+
+jest.mock("@data-system");
 
 describe("@ui-layout/UserMenu", () => {
-	const setup = () => {
+	let useSystemApiMock: DeepMocked<ReturnType<typeof useSystemApi>>;
+
+	const setupWrapper = (
+		isExternalFeatureEnabled = false,
+		mockedSystem?: System
+	) => {
 		const authModule = createModuleMocks(AuthModule, {
 			getLocale: "de",
 			logout: jest.fn(),
+			externalLogout: jest.fn(),
+			getAccessToken:
+				"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwic3lzdGVtSWQiOiJhYmMxMjMiLCJpYX" +
+				"QiOjE1MTYyMzkwMjJ9.Zrpvm5T50Y_s-pd5OoqdxKRBaf3rJGMAviUz7Be84zA",
 		});
+
 		const envConfigModule = createModuleMocks(EnvConfigModule, {
 			getAvailableLanguages: [LanguageType.De, LanguageType.En],
+			getEnv: envsFactory.build({
+				FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED: isExternalFeatureEnabled,
+			}),
 		});
 
+		const notifierModule = createModuleMocks(NotifierModule);
+
+		useSystemApiMock = createMock<ReturnType<typeof useSystemApi>>();
+		jest.mocked(useSystemApi).mockReturnValue(useSystemApiMock);
+		useSystemApiMock.getSystem.mockResolvedValue(mockedSystem);
+
 		const wrapper = mount(UserMenu, {
 			global: {
 				plugins: [createTestingVuetify(), createTestingI18n()],
 				provide: {
 					[AUTH_MODULE_KEY.valueOf()]: authModule,
 					[ENV_CONFIG_MODULE_KEY.valueOf()]: envConfigModule,
+					[NOTIFIER_MODULE_KEY.valueOf()]: notifierModule,
 				},
 			},
 			props: {
@@ -41,15 +72,19 @@ describe("@ui-layout/UserMenu", () => {
 		return { wrapper, authModule };
 	};
 
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
 	it("should render with correct user initials", async () => {
-		const { wrapper } = setup();
+		const { wrapper } = setupWrapper();
 
 		const initials = wrapper.findComponent("[data-testid=user-menu-btn]");
 		expect(initials.text()).toMatch("AD");
 	});
 
 	it("should render correct active user name with role", async () => {
-		const { wrapper } = setup();
+		const { wrapper } = setupWrapper();
 
 		const menuBtn = wrapper.findComponent({ name: "VBtn" });
 		await menuBtn.trigger("click");
@@ -61,7 +96,7 @@ describe("@ui-layout/UserMenu", () => {
 	});
 
 	it("should trigger logout function on logout item click", async () => {
-		const { wrapper, authModule } = setup();
+		const { wrapper, authModule } = setupWrapper();
 
 		const menuBtn = wrapper.findComponent({ name: "VBtn" });
 		await menuBtn.trigger("click");
@@ -72,4 +107,142 @@ describe("@ui-layout/UserMenu", () => {
 
 		expect(authModule.logout).toHaveBeenCalled();
 	});
+
+	describe("external logout", () => {
+		describe("when feature flag is enabled and the user is logged in from moin.schule", () => {
+			const setup = () => {
+				const mockedSystem: System = {
+					id: "testId",
+					displayName: "moin.schule",
+					alias: "SANIS",
+				};
+
+				const { wrapper, authModule } = setupWrapper(true, mockedSystem);
+
+				return { wrapper, authModule, mockedSystem };
+			};
+
+			it("should show the external logout button", async () => {
+				const { wrapper, mockedSystem } = setup();
+
+				const menuBtn = wrapper.findComponent({ name: "VBtn" });
+				await menuBtn.trigger("click");
+
+				const externalLogoutBtn = wrapper.findComponent(
+					"[data-testid=external-logout]"
+				);
+
+				expect(externalLogoutBtn.exists()).toBe(true);
+				expect(externalLogoutBtn.text()).toEqual(
+					`common.labels.logout Bildungscloud & ${mockedSystem.displayName}`
+				);
+			});
+
+			it("should trigger external logout function on logout item click", async () => {
+				const { wrapper, authModule } = setup();
+
+				const menuBtn = wrapper.findComponent({ name: "VBtn" });
+				await menuBtn.trigger("click");
+
+				const externalLogoutBtn = wrapper.findComponent(
+					"[data-testid=external-logout]"
+				);
+
+				expect(externalLogoutBtn.exists()).toBe(true);
+				await externalLogoutBtn.trigger("click");
+
+				expect(authModule.externalLogout).toHaveBeenCalled();
+			});
+
+			it("should show the correct text for the logout button", async () => {
+				const { wrapper } = setup();
+
+				const menuBtn = wrapper.findComponent({ name: "VBtn" });
+				await menuBtn.trigger("click");
+
+				const logoutBtn = wrapper.findComponent("[data-testid=logout]");
+
+				expect(logoutBtn.exists()).toBe(true);
+				expect(logoutBtn.text()).toEqual(`common.labels.logout Bildungscloud`);
+			});
+		});
+
+		describe("when feature flag is disabled", () => {
+			const setup = () => {
+				const mockedSystem: System = {
+					id: "testId",
+					displayName: "moin.schule",
+					alias: "SANIS",
+				};
+
+				const { wrapper } = setupWrapper(false, mockedSystem);
+
+				return { wrapper };
+			};
+
+			it("should not show the external logout button", async () => {
+				const { wrapper } = setup();
+
+				const menuBtn = wrapper.findComponent(VBtn);
+				await menuBtn.trigger("click");
+
+				const externalLogoutBtn = wrapper.findComponent(
+					"[data-testid=external-logout]"
+				);
+
+				expect(externalLogoutBtn.exists()).toBe(false);
+			});
+
+			it("should show the correct text for the logout button", async () => {
+				const { wrapper } = setup();
+
+				const menuBtn = wrapper.findComponent({ name: "VBtn" });
+				await menuBtn.trigger("click");
+
+				const logoutBtn = wrapper.findComponent("[data-testid=logout]");
+
+				expect(logoutBtn.exists()).toBe(true);
+				expect(logoutBtn.text()).toEqual("common.labels.logout");
+			});
+		});
+
+		describe("when user is not logged in from moin.schule", () => {
+			const setup = () => {
+				const mockedSystem: System = {
+					id: "testId",
+					displayName: "mock",
+					alias: "mock-system",
+				};
+
+				const { wrapper } = setupWrapper(true, mockedSystem);
+
+				return { wrapper };
+			};
+
+			it("should not show the external logout button", async () => {
+				const { wrapper } = setup();
+
+				const menuBtn = wrapper.findComponent(VBtn);
+				await menuBtn.trigger("click");
+
+				const externalLogoutBtn = wrapper.findComponent(
+					"[data-testid=external-logout]"
+				);
+
+				expect(externalLogoutBtn.exists()).toBe(false);
+			});
+
+			it("should show the correct text for the logout button", async () => {
+				const { wrapper } = setup();
+
+				const menuBtn = wrapper.findComponent({ name: "VBtn" });
+				await menuBtn.trigger("click");
+
+				const logoutBtn = wrapper.findComponent("[data-testid=logout]");
+
+				expect(logoutBtn.exists()).toBe(true);
+				expect(logoutBtn.text()).toEqual("common.labels.logout");
+			});
+		});
+	});
 });
diff --git a/src/modules/ui/layout/topbar/UserMenu.vue b/src/modules/ui/layout/topbar/UserMenu.vue
index 40a7cf39e0..83a581054e 100644
--- a/src/modules/ui/layout/topbar/UserMenu.vue
+++ b/src/modules/ui/layout/topbar/UserMenu.vue
@@ -1,5 +1,5 @@
 <template>
-	<VMenu width="215">
+	<VMenu :width="isExternalLogoutAllowed ? 'auto' : '215'">
 		<template v-slot:activator="{ props }">
 			<VBtn
 				v-bind="props"
@@ -22,18 +22,32 @@
 				{{ $t("global.topbar.settings") }}
 			</VListItem>
 			<VListItem data-testid="logout" @click="logout">
-				{{ $t("common.labels.logout") }}
+				{{ $t("common.labels.logout")
+				}}{{ isExternalLogoutAllowed ? " Bildungscloud" : "" }}
+			</VListItem>
+			<VListItem
+				v-if="isExternalLogoutAllowed"
+				data-testid="external-logout"
+				@click="externalLogout"
+			>
+				{{ $t("common.labels.logout")
+				}}{{ isExternalLogoutAllowed ? ` Bildungscloud & ${systemName}` : "" }}
 			</VListItem>
 		</VList>
 	</VMenu>
 </template>
 
 <script setup lang="ts">
-import { computed, PropType, toRef } from "vue";
+import { computed, onMounted, PropType, Ref, ref, toRef } from "vue";
 import { useI18n } from "vue-i18n";
 import LanguageMenu from "./LanguageMenu.vue";
 import { MeUserResponse } from "@/serverApi/v3";
-import { injectStrict, AUTH_MODULE_KEY } from "@/utils/inject";
+import {
+	injectStrict,
+	AUTH_MODULE_KEY,
+	ENV_CONFIG_MODULE_KEY,
+} from "@/utils/inject";
+import { System, useSystemApi } from "@data-system";
 
 const props = defineProps({
 	user: {
@@ -48,6 +62,9 @@ const props = defineProps({
 
 const { t } = useI18n();
 const authModule = injectStrict(AUTH_MODULE_KEY);
+const envConfigModule = injectStrict(ENV_CONFIG_MODULE_KEY);
+
+const system = useSystemApi();
 
 const userRole = computed(() => {
 	return t(`common.roleName.${toRef(props.roleNames).value[0]}`).toString();
@@ -57,9 +74,48 @@ const initials = computed(() => {
 	return props.user.firstName.slice(0, 1) + props.user.lastName.slice(0, 1);
 });
 
+const isExternalLogoutAllowed: Ref<boolean> = ref(false);
+
+const systemName: Ref<string> = ref("");
+
 const logout = () => {
 	authModule.logout();
 };
+
+const externalLogout = () => {
+	authModule.externalLogout();
+};
+
+const setSystemValuesFromJwt = async (jwt: string): Promise<void> => {
+	const jwtPayload = JSON.parse(atob(jwt.split(".")[1]));
+	if (!("systemId" in jwtPayload) && !jwtPayload.systemId) {
+		return;
+	}
+
+	const fetchedSystem: System | undefined = await system.getSystem(
+		jwtPayload.systemId
+	);
+
+	if (!fetchedSystem || !fetchedSystem.alias) {
+		return;
+	}
+
+	isExternalLogoutAllowed.value =
+		fetchedSystem.alias === "SANIS" &&
+		envConfigModule.getEnv.FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED;
+	systemName.value = fetchedSystem.displayName;
+};
+
+onMounted(async () => {
+	const jwt = authModule.getAccessToken;
+	if (jwt) {
+		try {
+			await setSystemValuesFromJwt(jwt);
+		} catch (e) {
+			console.error(e);
+		}
+	}
+});
 </script>
 
 <style scoped>
diff --git a/src/serverApi/v3/api.ts b/src/serverApi/v3/api.ts
index dbce02b830..52e8a65faa 100644
--- a/src/serverApi/v3/api.ts
+++ b/src/serverApi/v3/api.ts
@@ -114,6 +114,19 @@ export interface AccountSearchListResponse {
      */
     limit: number;
 }
+/**
+ * 
+ * @export
+ * @interface AddRoomMembersBodyParams
+ */
+export interface AddRoomMembersBodyParams {
+    /**
+     * Array of userIds and their roles inside of the room
+     * @type {Array<UserIdAndRole>}
+     * @memberof AddRoomMembersBodyParams
+     */
+    userIdsAndRoles: Array<UserIdAndRole>;
+}
 /**
  * 
  * @export
@@ -1570,6 +1583,12 @@ export interface ConfigResponse {
      * @memberof ConfigResponse
      */
     FEATURE_ROOMS_ENABLED: boolean;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof ConfigResponse
+     */
+    FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED: boolean;
 }
 /**
  * 
@@ -6603,6 +6622,19 @@ export interface RedirectResponse {
      */
     redirect_to: string;
 }
+/**
+ * 
+ * @export
+ * @interface RemoveRoomMembersBodyParams
+ */
+export interface RemoveRoomMembersBodyParams {
+    /**
+     * The IDs of the users
+     * @type {Array<string>}
+     * @memberof RemoveRoomMembersBodyParams
+     */
+    userIds: Array<string>;
+}
 /**
  * 
  * @export
@@ -6968,6 +7000,56 @@ export interface RoomListResponse {
      */
     limit: number;
 }
+/**
+ * 
+ * @export
+ * @interface RoomMemberListResponse
+ */
+export interface RoomMemberListResponse {
+    /**
+     * 
+     * @type {Array<RoomMemberResponse>}
+     * @memberof RoomMemberListResponse
+     */
+    data: Array<RoomMemberResponse>;
+}
+/**
+ * 
+ * @export
+ * @interface RoomMemberResponse
+ */
+export interface RoomMemberResponse {
+    /**
+     * 
+     * @type {string}
+     * @memberof RoomMemberResponse
+     */
+    firstName: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof RoomMemberResponse
+     */
+    lastName: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof RoomMemberResponse
+     */
+    roleName: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof RoomMemberResponse
+     */
+    schoolName: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof RoomMemberResponse
+     */
+    userId: string;
+}
 /**
  * 
  * @export
@@ -7582,6 +7664,12 @@ export interface SchoolUserResponse {
      * @memberof SchoolUserResponse
      */
     lastName: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof SchoolUserResponse
+     */
+    schoolName: string;
     /**
      * 
      * @type {string}
@@ -8788,6 +8876,35 @@ export interface UserDataResponse {
      */
     userId: string;
 }
+/**
+ * 
+ * @export
+ * @interface UserIdAndRole
+ */
+export interface UserIdAndRole {
+    /**
+     * The ID of the user
+     * @type {string}
+     * @memberof UserIdAndRole
+     */
+    userId: string;
+    /**
+     * The role of the user
+     * @type {string}
+     * @memberof UserIdAndRole
+     */
+    roleName: UserIdAndRoleRoleNameEnum;
+}
+
+/**
+    * @export
+    * @enum {string}
+    */
+export enum UserIdAndRoleRoleNameEnum {
+    Editor = 'room_editor',
+    Viewer = 'room_viewer'
+}
+
 /**
  * 
  * @export
@@ -10652,6 +10769,40 @@ export const AuthenticationApiAxiosParamCreator = function (configuration?: Conf
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @summary Logs out a user from the external system.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        logoutControllerExternalSystemLogout: async (options: any = {}): Promise<RequestArgs> => {
+            const localVarPath = `/logout/external`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication bearer required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration)
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary Logs out a user.
@@ -10729,6 +10880,16 @@ export const AuthenticationApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.loginControllerLoginOauth2(oauth2AuthorizationBodyParams, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @summary Logs out a user from the external system.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async logoutControllerExternalSystemLogout(options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.logoutControllerExternalSystemLogout(options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @summary Logs out a user.
@@ -10779,6 +10940,15 @@ export const AuthenticationApiFactory = function (configuration?: Configuration,
         loginControllerLoginOauth2(oauth2AuthorizationBodyParams: Oauth2AuthorizationBodyParams, options?: any): AxiosPromise<LoginResponse> {
             return localVarFp.loginControllerLoginOauth2(oauth2AuthorizationBodyParams, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary Logs out a user from the external system.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        logoutControllerExternalSystemLogout(options?: any): AxiosPromise<void> {
+            return localVarFp.logoutControllerExternalSystemLogout(options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary Logs out a user.
@@ -10827,6 +10997,15 @@ export interface AuthenticationApiInterface {
      */
     loginControllerLoginOauth2(oauth2AuthorizationBodyParams: Oauth2AuthorizationBodyParams, options?: any): AxiosPromise<LoginResponse>;
 
+    /**
+     * 
+     * @summary Logs out a user from the external system.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof AuthenticationApiInterface
+     */
+    logoutControllerExternalSystemLogout(options?: any): AxiosPromise<void>;
+
     /**
      * 
      * @summary Logs out a user.
@@ -10881,6 +11060,17 @@ export class AuthenticationApi extends BaseAPI implements AuthenticationApiInter
         return AuthenticationApiFp(this.configuration).loginControllerLoginOauth2(oauth2AuthorizationBodyParams, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @summary Logs out a user from the external system.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof AuthenticationApi
+     */
+    public logoutControllerExternalSystemLogout(options?: any) {
+        return AuthenticationApiFp(this.configuration).logoutControllerExternalSystemLogout(options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @summary Logs out a user.
@@ -19761,6 +19951,50 @@ export class PseudonymApi extends BaseAPI implements PseudonymApiInterface {
  */
 export const RoomApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
+        /**
+         * 
+         * @summary Add members to a room
+         * @param {string} roomId 
+         * @param {AddRoomMembersBodyParams} addRoomMembersBodyParams 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        roomControllerAddMembers: async (roomId: string, addRoomMembersBodyParams: AddRoomMembersBodyParams, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'roomId' is not null or undefined
+            assertParamExists('roomControllerAddMembers', 'roomId', roomId)
+            // verify required parameter 'addRoomMembersBodyParams' is not null or undefined
+            assertParamExists('roomControllerAddMembers', 'addRoomMembersBodyParams', addRoomMembersBodyParams)
+            const localVarPath = `/rooms/{roomId}/members/add`
+                .replace(`{${"roomId"}}`, encodeURIComponent(String(roomId)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication bearer required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration)
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(addRoomMembersBodyParams, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary Create a new room
@@ -19830,6 +20064,44 @@ export const RoomApiAxiosParamCreator = function (configuration?: Configuration)
 
 
     
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @summary Get a list of room members.
+         * @param {string} roomId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        roomControllerGetMembers: async (roomId: string, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'roomId' is not null or undefined
+            assertParamExists('roomControllerGetMembers', 'roomId', roomId)
+            const localVarPath = `/rooms/{roomId}/members`
+                .replace(`{${"roomId"}}`, encodeURIComponent(String(roomId)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication bearer required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration)
+
+
+    
             setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -19921,6 +20193,50 @@ export const RoomApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @summary Remove members from a room
+         * @param {string} roomId 
+         * @param {RemoveRoomMembersBodyParams} removeRoomMembersBodyParams 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        roomControllerRemoveMembers: async (roomId: string, removeRoomMembersBodyParams: RemoveRoomMembersBodyParams, options: any = {}): Promise<RequestArgs> => {
+            // verify required parameter 'roomId' is not null or undefined
+            assertParamExists('roomControllerRemoveMembers', 'roomId', roomId)
+            // verify required parameter 'removeRoomMembersBodyParams' is not null or undefined
+            assertParamExists('roomControllerRemoveMembers', 'removeRoomMembersBodyParams', removeRoomMembersBodyParams)
+            const localVarPath = `/rooms/{roomId}/members/remove`
+                .replace(`{${"roomId"}}`, encodeURIComponent(String(roomId)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PATCH', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication bearer required
+            // http bearer authentication required
+            await setBearerAuthToObject(localVarHeaderParameter, configuration)
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(removeRoomMembersBodyParams, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary Create a new room
@@ -19975,6 +20291,18 @@ export const RoomApiAxiosParamCreator = function (configuration?: Configuration)
 export const RoomApiFp = function(configuration?: Configuration) {
     const localVarAxiosParamCreator = RoomApiAxiosParamCreator(configuration)
     return {
+        /**
+         * 
+         * @summary Add members to a room
+         * @param {string} roomId 
+         * @param {AddRoomMembersBodyParams} addRoomMembersBodyParams 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async roomControllerAddMembers(roomId: string, addRoomMembersBodyParams: AddRoomMembersBodyParams, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.roomControllerAddMembers(roomId, addRoomMembersBodyParams, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @summary Create a new room
@@ -19997,6 +20325,17 @@ export const RoomApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.roomControllerDeleteRoom(roomId, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @summary Get a list of room members.
+         * @param {string} roomId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async roomControllerGetMembers(roomId: string, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<RoomMemberListResponse>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.roomControllerGetMembers(roomId, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @summary Get the details of a room
@@ -20020,6 +20359,18 @@ export const RoomApiFp = function(configuration?: Configuration) {
             const localVarAxiosArgs = await localVarAxiosParamCreator.roomControllerGetRooms(skip, limit, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
+        /**
+         * 
+         * @summary Remove members from a room
+         * @param {string} roomId 
+         * @param {RemoveRoomMembersBodyParams} removeRoomMembersBodyParams 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async roomControllerRemoveMembers(roomId: string, removeRoomMembersBodyParams: RemoveRoomMembersBodyParams, options?: any): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<string>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.roomControllerRemoveMembers(roomId, removeRoomMembersBodyParams, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @summary Create a new room
@@ -20042,6 +20393,17 @@ export const RoomApiFp = function(configuration?: Configuration) {
 export const RoomApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
     const localVarFp = RoomApiFp(configuration)
     return {
+        /**
+         * 
+         * @summary Add members to a room
+         * @param {string} roomId 
+         * @param {AddRoomMembersBodyParams} addRoomMembersBodyParams 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        roomControllerAddMembers(roomId: string, addRoomMembersBodyParams: AddRoomMembersBodyParams, options?: any): AxiosPromise<string> {
+            return localVarFp.roomControllerAddMembers(roomId, addRoomMembersBodyParams, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary Create a new room
@@ -20062,6 +20424,16 @@ export const RoomApiFactory = function (configuration?: Configuration, basePath?
         roomControllerDeleteRoom(roomId: string, options?: any): AxiosPromise<void> {
             return localVarFp.roomControllerDeleteRoom(roomId, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary Get a list of room members.
+         * @param {string} roomId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        roomControllerGetMembers(roomId: string, options?: any): AxiosPromise<RoomMemberListResponse> {
+            return localVarFp.roomControllerGetMembers(roomId, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary Get the details of a room
@@ -20083,6 +20455,17 @@ export const RoomApiFactory = function (configuration?: Configuration, basePath?
         roomControllerGetRooms(skip?: number, limit?: number, options?: any): AxiosPromise<RoomListResponse> {
             return localVarFp.roomControllerGetRooms(skip, limit, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary Remove members from a room
+         * @param {string} roomId 
+         * @param {RemoveRoomMembersBodyParams} removeRoomMembersBodyParams 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        roomControllerRemoveMembers(roomId: string, removeRoomMembersBodyParams: RemoveRoomMembersBodyParams, options?: any): AxiosPromise<string> {
+            return localVarFp.roomControllerRemoveMembers(roomId, removeRoomMembersBodyParams, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary Create a new room
@@ -20103,6 +20486,17 @@ export const RoomApiFactory = function (configuration?: Configuration, basePath?
  * @interface RoomApi
  */
 export interface RoomApiInterface {
+    /**
+     * 
+     * @summary Add members to a room
+     * @param {string} roomId 
+     * @param {AddRoomMembersBodyParams} addRoomMembersBodyParams 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof RoomApiInterface
+     */
+    roomControllerAddMembers(roomId: string, addRoomMembersBodyParams: AddRoomMembersBodyParams, options?: any): AxiosPromise<string>;
+
     /**
      * 
      * @summary Create a new room
@@ -20123,6 +20517,16 @@ export interface RoomApiInterface {
      */
     roomControllerDeleteRoom(roomId: string, options?: any): AxiosPromise<void>;
 
+    /**
+     * 
+     * @summary Get a list of room members.
+     * @param {string} roomId 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof RoomApiInterface
+     */
+    roomControllerGetMembers(roomId: string, options?: any): AxiosPromise<RoomMemberListResponse>;
+
     /**
      * 
      * @summary Get the details of a room
@@ -20144,6 +20548,17 @@ export interface RoomApiInterface {
      */
     roomControllerGetRooms(skip?: number, limit?: number, options?: any): AxiosPromise<RoomListResponse>;
 
+    /**
+     * 
+     * @summary Remove members from a room
+     * @param {string} roomId 
+     * @param {RemoveRoomMembersBodyParams} removeRoomMembersBodyParams 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof RoomApiInterface
+     */
+    roomControllerRemoveMembers(roomId: string, removeRoomMembersBodyParams: RemoveRoomMembersBodyParams, options?: any): AxiosPromise<string>;
+
     /**
      * 
      * @summary Create a new room
@@ -20164,6 +20579,19 @@ export interface RoomApiInterface {
  * @extends {BaseAPI}
  */
 export class RoomApi extends BaseAPI implements RoomApiInterface {
+    /**
+     * 
+     * @summary Add members to a room
+     * @param {string} roomId 
+     * @param {AddRoomMembersBodyParams} addRoomMembersBodyParams 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof RoomApi
+     */
+    public roomControllerAddMembers(roomId: string, addRoomMembersBodyParams: AddRoomMembersBodyParams, options?: any) {
+        return RoomApiFp(this.configuration).roomControllerAddMembers(roomId, addRoomMembersBodyParams, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @summary Create a new room
@@ -20188,6 +20616,18 @@ export class RoomApi extends BaseAPI implements RoomApiInterface {
         return RoomApiFp(this.configuration).roomControllerDeleteRoom(roomId, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @summary Get a list of room members.
+     * @param {string} roomId 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof RoomApi
+     */
+    public roomControllerGetMembers(roomId: string, options?: any) {
+        return RoomApiFp(this.configuration).roomControllerGetMembers(roomId, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @summary Get the details of a room
@@ -20213,6 +20653,19 @@ export class RoomApi extends BaseAPI implements RoomApiInterface {
         return RoomApiFp(this.configuration).roomControllerGetRooms(skip, limit, options).then((request) => request(this.axios, this.basePath));
     }
 
+    /**
+     * 
+     * @summary Remove members from a room
+     * @param {string} roomId 
+     * @param {RemoveRoomMembersBodyParams} removeRoomMembersBodyParams 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof RoomApi
+     */
+    public roomControllerRemoveMembers(roomId: string, removeRoomMembersBodyParams: RemoveRoomMembersBodyParams, options?: any) {
+        return RoomApiFp(this.configuration).roomControllerRemoveMembers(roomId, removeRoomMembersBodyParams, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @summary Create a new room
diff --git a/src/store/auth.ts b/src/store/auth.ts
index 0d6208ebf5..9bface9d6a 100644
--- a/src/store/auth.ts
+++ b/src/store/auth.ts
@@ -184,4 +184,9 @@ export default class AuthModule extends VuexModule {
 		delete $axios.defaults.headers.common["Authorization"];
 		window.location.replace(redirectUrl);
 	}
+
+	@Action
+	externalLogout(redirectUrl = "/logout/external"): void {
+		window.location.replace(redirectUrl);
+	}
 }
diff --git a/src/store/env-config-defaults.ts b/src/store/env-config-defaults.ts
index 961423679e..28c4cf759f 100644
--- a/src/store/env-config-defaults.ts
+++ b/src/store/env-config-defaults.ts
@@ -77,4 +77,5 @@ export const defaultConfigEnvs: ConfigResponse = {
 	FEATURE_ROOMS_ENABLED: false,
 	CALENDAR_SERVICE_ENABLED: false,
 	FEATURE_PREFERRED_CTL_TOOLS_ENABLED: false,
+	FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED: false,
 };

From c1136a315b8fea86c49ad1841239ca3e51b7be96 Mon Sep 17 00:00:00 2001
From: Gordon Nicholas <gordon.nicholas@capgemini.com>
Date: Fri, 8 Nov 2024 10:58:00 +0100
Subject: [PATCH 3/9] N21-2136 fix tests & cleanup

---
 src/modules/ui/layout/topbar/Topbar.unit.ts | 5 +++++
 src/modules/ui/layout/topbar/UserMenu.vue   | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/modules/ui/layout/topbar/Topbar.unit.ts b/src/modules/ui/layout/topbar/Topbar.unit.ts
index 4847f54b26..fad4839411 100644
--- a/src/modules/ui/layout/topbar/Topbar.unit.ts
+++ b/src/modules/ui/layout/topbar/Topbar.unit.ts
@@ -8,6 +8,7 @@ import { createModuleMocks } from "@@/tests/test-utils/mock-store-module";
 import {
 	AUTH_MODULE_KEY,
 	ENV_CONFIG_MODULE_KEY,
+	NOTIFIER_MODULE_KEY,
 	STATUS_ALERTS_MODULE_KEY,
 } from "@/utils/inject";
 import AuthModule from "@/store/auth";
@@ -18,6 +19,7 @@ import { VApp } from "vuetify/lib/components/index.mjs";
 import { envsFactory } from "@@/tests/test-utils";
 import EnvConfigModule from "@/store/env-config";
 import { SchulcloudTheme } from "@/serverApi/v3";
+import NotifierModule from "@/store/notifier";
 
 describe("@ui-layout/Topbar", () => {
 	const setup = async (windowWidth = 1300, isSidebarExpanded?: boolean) => {
@@ -47,6 +49,8 @@ describe("@ui-layout/Topbar", () => {
 			getStatusAlerts: mockStatusAlerts,
 		});
 
+		const notifierModule = createModuleMocks(NotifierModule);
+
 		Object.defineProperty(window, "innerWidth", {
 			writable: true,
 			configurable: true,
@@ -60,6 +64,7 @@ describe("@ui-layout/Topbar", () => {
 					[AUTH_MODULE_KEY.valueOf()]: authModule,
 					[ENV_CONFIG_MODULE_KEY.valueOf()]: envConfigModule,
 					[STATUS_ALERTS_MODULE_KEY.valueOf()]: statusAlertsModule,
+					[NOTIFIER_MODULE_KEY.valueOf()]: notifierModule,
 				},
 			},
 			slots: {
diff --git a/src/modules/ui/layout/topbar/UserMenu.vue b/src/modules/ui/layout/topbar/UserMenu.vue
index 83a581054e..897a46b64b 100644
--- a/src/modules/ui/layout/topbar/UserMenu.vue
+++ b/src/modules/ui/layout/topbar/UserMenu.vue
@@ -111,8 +111,10 @@ onMounted(async () => {
 	if (jwt) {
 		try {
 			await setSystemValuesFromJwt(jwt);
-		} catch (e) {
-			console.error(e);
+			// eslint-disable-next-line @typescript-eslint/no-unused-vars
+		} catch (err) {
+			isExternalLogoutAllowed.value = false;
+			systemName.value = "";
 		}
 	}
 });

From d4724a92571e03997e2116ff1e3dcaa37388a546 Mon Sep 17 00:00:00 2001
From: Gordon Nicholas <gordon.nicholas@capgemini.com>
Date: Fri, 8 Nov 2024 11:28:36 +0100
Subject: [PATCH 4/9] N21-2136 test coverage

---
 src/store/auth.ts      |  4 ++--
 src/store/auth.unit.ts | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/store/auth.ts b/src/store/auth.ts
index 9bface9d6a..fa986dd9dd 100644
--- a/src/store/auth.ts
+++ b/src/store/auth.ts
@@ -186,7 +186,7 @@ export default class AuthModule extends VuexModule {
 	}
 
 	@Action
-	externalLogout(redirectUrl = "/logout/external"): void {
-		window.location.replace(redirectUrl);
+	externalLogout(): void {
+		window.location.replace("/logout/external");
 	}
 }
diff --git a/src/store/auth.unit.ts b/src/store/auth.unit.ts
index e8c50f0510..681df59cc1 100644
--- a/src/store/auth.unit.ts
+++ b/src/store/auth.unit.ts
@@ -372,5 +372,28 @@ describe("auth store module", () => {
 				});
 			});
 		});
+
+		describe("externalLogout", () => {
+			const setup = () => {
+				const authModule = new AuthModule({});
+
+				const mockReplace = jest.fn();
+				Object.defineProperty(window, "location", {
+					configurable: true,
+					value: { replace: mockReplace },
+				});
+
+				return { authModule, mockReplace };
+			};
+
+			describe("when external logout action is called", () => {
+				it("should replace the window.location", () => {
+					const { authModule, mockReplace } = setup();
+
+					authModule.externalLogout();
+					expect(mockReplace).toHaveBeenLastCalledWith("/logout/external");
+				});
+			});
+		});
 	});
 });

From 0cf108cb4bae0f1022157d7e8a39901658cf4b52 Mon Sep 17 00:00:00 2001
From: Gordon Nicholas <gordon.nicholas@capgemini.com>
Date: Fri, 8 Nov 2024 12:52:43 +0100
Subject: [PATCH 5/9] N21-2136 debugging

---
 src/modules/ui/layout/topbar/UserMenu.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/modules/ui/layout/topbar/UserMenu.vue b/src/modules/ui/layout/topbar/UserMenu.vue
index 897a46b64b..e9134b4098 100644
--- a/src/modules/ui/layout/topbar/UserMenu.vue
+++ b/src/modules/ui/layout/topbar/UserMenu.vue
@@ -100,6 +100,12 @@ const setSystemValuesFromJwt = async (jwt: string): Promise<void> => {
 		return;
 	}
 
+	console.info(JSON.stringify(fetchedSystem));
+	console.info(
+		"Feature flag",
+		envConfigModule.getEnv.FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED
+	);
+
 	isExternalLogoutAllowed.value =
 		fetchedSystem.alias === "SANIS" &&
 		envConfigModule.getEnv.FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED;
@@ -111,8 +117,8 @@ onMounted(async () => {
 	if (jwt) {
 		try {
 			await setSystemValuesFromJwt(jwt);
-			// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		} catch (err) {
+			console.error(err);
 			isExternalLogoutAllowed.value = false;
 			systemName.value = "";
 		}

From cf3850fa0d0fb1d13f92df7b32e5ce045ca443ae Mon Sep 17 00:00:00 2001
From: Gordon Nicholas <gordon.nicholas@capgemini.com>
Date: Fri, 8 Nov 2024 13:18:54 +0100
Subject: [PATCH 6/9] Revert "N21-2136 debugging"

This reverts commit 0cf108cb4bae0f1022157d7e8a39901658cf4b52.
---
 src/modules/ui/layout/topbar/UserMenu.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/modules/ui/layout/topbar/UserMenu.vue b/src/modules/ui/layout/topbar/UserMenu.vue
index e9134b4098..897a46b64b 100644
--- a/src/modules/ui/layout/topbar/UserMenu.vue
+++ b/src/modules/ui/layout/topbar/UserMenu.vue
@@ -100,12 +100,6 @@ const setSystemValuesFromJwt = async (jwt: string): Promise<void> => {
 		return;
 	}
 
-	console.info(JSON.stringify(fetchedSystem));
-	console.info(
-		"Feature flag",
-		envConfigModule.getEnv.FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED
-	);
-
 	isExternalLogoutAllowed.value =
 		fetchedSystem.alias === "SANIS" &&
 		envConfigModule.getEnv.FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED;
@@ -117,8 +111,8 @@ onMounted(async () => {
 	if (jwt) {
 		try {
 			await setSystemValuesFromJwt(jwt);
+			// eslint-disable-next-line @typescript-eslint/no-unused-vars
 		} catch (err) {
-			console.error(err);
 			isExternalLogoutAllowed.value = false;
 			systemName.value = "";
 		}

From e1b103e1426e821daac760e5c33511a591260d2d Mon Sep 17 00:00:00 2001
From: Gordon Nicholas <gordon.nicholas@capgemini.com>
Date: Fri, 8 Nov 2024 14:13:54 +0100
Subject: [PATCH 7/9] N21-2136 fix logout btns order

---
 src/modules/ui/layout/topbar/UserMenu.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/ui/layout/topbar/UserMenu.vue b/src/modules/ui/layout/topbar/UserMenu.vue
index 897a46b64b..567250c551 100644
--- a/src/modules/ui/layout/topbar/UserMenu.vue
+++ b/src/modules/ui/layout/topbar/UserMenu.vue
@@ -21,10 +21,6 @@
 			<VListItem href="/account" data-testid="account-link">
 				{{ $t("global.topbar.settings") }}
 			</VListItem>
-			<VListItem data-testid="logout" @click="logout">
-				{{ $t("common.labels.logout")
-				}}{{ isExternalLogoutAllowed ? " Bildungscloud" : "" }}
-			</VListItem>
 			<VListItem
 				v-if="isExternalLogoutAllowed"
 				data-testid="external-logout"
@@ -33,6 +29,10 @@
 				{{ $t("common.labels.logout")
 				}}{{ isExternalLogoutAllowed ? ` Bildungscloud & ${systemName}` : "" }}
 			</VListItem>
+			<VListItem data-testid="logout" @click="logout">
+				{{ $t("common.labels.logout")
+				}}{{ isExternalLogoutAllowed ? " Bildungscloud" : "" }}
+			</VListItem>
 		</VList>
 	</VMenu>
 </template>

From 697c41790ead081d7fff659ed52326c2394adcf7 Mon Sep 17 00:00:00 2001
From: Gordon Nicholas <gordon.nicholas@capgemini.com>
Date: Mon, 11 Nov 2024 08:46:46 +0100
Subject: [PATCH 8/9] N21-2136 review changes

---
 .../data/system/SystemApi.composable.ts       |  1 -
 src/modules/data/system/type/System.ts        |  2 -
 src/modules/ui/layout/topbar/Topbar.unit.ts   |  3 -
 src/modules/ui/layout/topbar/UserMenu.unit.ts | 64 +++++++------------
 src/modules/ui/layout/topbar/UserMenu.vue     | 46 ++-----------
 src/serverApi/v3/api.ts                       | 37 +++++++++++
 src/store/auth.ts                             |  7 ++
 src/store/auth.unit.ts                        | 29 ++++++++-
 8 files changed, 103 insertions(+), 86 deletions(-)

diff --git a/src/modules/data/system/SystemApi.composable.ts b/src/modules/data/system/SystemApi.composable.ts
index ffe036911d..b67365e102 100644
--- a/src/modules/data/system/SystemApi.composable.ts
+++ b/src/modules/data/system/SystemApi.composable.ts
@@ -15,7 +15,6 @@ export const useSystemApi = () => {
 
 			const system: System = {
 				id: response.data.id,
-				alias: response.data.alias,
 				displayName: response.data.displayName ?? "",
 			};
 
diff --git a/src/modules/data/system/type/System.ts b/src/modules/data/system/type/System.ts
index b0164c9a32..4db6241e1d 100644
--- a/src/modules/data/system/type/System.ts
+++ b/src/modules/data/system/type/System.ts
@@ -1,7 +1,5 @@
 export interface System {
 	id: string;
 
-	alias?: string | null;
-
 	displayName: string;
 }
diff --git a/src/modules/ui/layout/topbar/Topbar.unit.ts b/src/modules/ui/layout/topbar/Topbar.unit.ts
index fad4839411..96533cfb29 100644
--- a/src/modules/ui/layout/topbar/Topbar.unit.ts
+++ b/src/modules/ui/layout/topbar/Topbar.unit.ts
@@ -49,8 +49,6 @@ describe("@ui-layout/Topbar", () => {
 			getStatusAlerts: mockStatusAlerts,
 		});
 
-		const notifierModule = createModuleMocks(NotifierModule);
-
 		Object.defineProperty(window, "innerWidth", {
 			writable: true,
 			configurable: true,
@@ -64,7 +62,6 @@ describe("@ui-layout/Topbar", () => {
 					[AUTH_MODULE_KEY.valueOf()]: authModule,
 					[ENV_CONFIG_MODULE_KEY.valueOf()]: envConfigModule,
 					[STATUS_ALERTS_MODULE_KEY.valueOf()]: statusAlertsModule,
-					[NOTIFIER_MODULE_KEY.valueOf()]: notifierModule,
 				},
 			},
 			slots: {
diff --git a/src/modules/ui/layout/topbar/UserMenu.unit.ts b/src/modules/ui/layout/topbar/UserMenu.unit.ts
index 05302762a1..45c5fe1051 100644
--- a/src/modules/ui/layout/topbar/UserMenu.unit.ts
+++ b/src/modules/ui/layout/topbar/UserMenu.unit.ts
@@ -1,40 +1,31 @@
 import { mount } from "@vue/test-utils";
-import UserMenu from "./UserMenu.vue";
 import {
 	createTestingI18n,
 	createTestingVuetify,
 } from "@@/tests/test-utils/setup";
 import { createModuleMocks } from "@@/tests/test-utils/mock-store-module";
 import { envsFactory } from "@@/tests/test-utils";
-import {
-	AUTH_MODULE_KEY,
-	ENV_CONFIG_MODULE_KEY,
-	NOTIFIER_MODULE_KEY,
-} from "@/utils/inject";
+import { AUTH_MODULE_KEY, ENV_CONFIG_MODULE_KEY } from "@/utils/inject";
 import AuthModule from "@/store/auth";
 import EnvConfigModule from "@/store/env-config";
-import { LanguageType } from "@/serverApi/v3";
-import { System, useSystemApi } from "@data-system";
-import { createMock, DeepMocked } from "@golevelup/ts-jest";
-import NotifierModule from "@/store/notifier";
+import { LanguageType, MeSystemResponse } from "@/serverApi/v3";
 import { VBtn } from "vuetify/lib/components/index.mjs";
+import UserMenu from "./UserMenu.vue";
 
 jest.mock("@data-system");
 
 describe("@ui-layout/UserMenu", () => {
-	let useSystemApiMock: DeepMocked<ReturnType<typeof useSystemApi>>;
-
 	const setupWrapper = (
 		isExternalFeatureEnabled = false,
-		mockedSystem?: System
+		mockedSystem?: MeSystemResponse
 	) => {
 		const authModule = createModuleMocks(AuthModule, {
 			getLocale: "de",
 			logout: jest.fn(),
 			externalLogout: jest.fn(),
-			getAccessToken:
-				"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwic3lzdGVtSWQiOiJhYmMxMjMiLCJpYX" +
-				"QiOjE1MTYyMzkwMjJ9.Zrpvm5T50Y_s-pd5OoqdxKRBaf3rJGMAviUz7Be84zA",
+			get loginSystem(): MeSystemResponse | undefined {
+				return mockedSystem;
+			},
 		});
 
 		const envConfigModule = createModuleMocks(EnvConfigModule, {
@@ -44,19 +35,12 @@ describe("@ui-layout/UserMenu", () => {
 			}),
 		});
 
-		const notifierModule = createModuleMocks(NotifierModule);
-
-		useSystemApiMock = createMock<ReturnType<typeof useSystemApi>>();
-		jest.mocked(useSystemApi).mockReturnValue(useSystemApiMock);
-		useSystemApiMock.getSystem.mockResolvedValue(mockedSystem);
-
 		const wrapper = mount(UserMenu, {
 			global: {
 				plugins: [createTestingVuetify(), createTestingI18n()],
 				provide: {
 					[AUTH_MODULE_KEY.valueOf()]: authModule,
 					[ENV_CONFIG_MODULE_KEY.valueOf()]: envConfigModule,
-					[NOTIFIER_MODULE_KEY.valueOf()]: notifierModule,
 				},
 			},
 			props: {
@@ -109,12 +93,12 @@ describe("@ui-layout/UserMenu", () => {
 	});
 
 	describe("external logout", () => {
-		describe("when feature flag is enabled and the user is logged in from moin.schule", () => {
+		describe("when feature flag is enabled and end session endpoint is available for the system", () => {
 			const setup = () => {
-				const mockedSystem: System = {
+				const mockedSystem: MeSystemResponse = {
 					id: "testId",
-					displayName: "moin.schule",
-					alias: "SANIS",
+					name: "Test System",
+					hasEndSessionEndpoint: true,
 				};
 
 				const { wrapper, authModule } = setupWrapper(true, mockedSystem);
@@ -125,7 +109,7 @@ describe("@ui-layout/UserMenu", () => {
 			it("should show the external logout button", async () => {
 				const { wrapper, mockedSystem } = setup();
 
-				const menuBtn = wrapper.findComponent({ name: "VBtn" });
+				const menuBtn = wrapper.findComponent(VBtn);
 				await menuBtn.trigger("click");
 
 				const externalLogoutBtn = wrapper.findComponent(
@@ -134,14 +118,14 @@ describe("@ui-layout/UserMenu", () => {
 
 				expect(externalLogoutBtn.exists()).toBe(true);
 				expect(externalLogoutBtn.text()).toEqual(
-					`common.labels.logout Bildungscloud & ${mockedSystem.displayName}`
+					`common.labels.logout Bildungscloud & ${mockedSystem.name}`
 				);
 			});
 
 			it("should trigger external logout function on logout item click", async () => {
 				const { wrapper, authModule } = setup();
 
-				const menuBtn = wrapper.findComponent({ name: "VBtn" });
+				const menuBtn = wrapper.findComponent(VBtn);
 				await menuBtn.trigger("click");
 
 				const externalLogoutBtn = wrapper.findComponent(
@@ -157,7 +141,7 @@ describe("@ui-layout/UserMenu", () => {
 			it("should show the correct text for the logout button", async () => {
 				const { wrapper } = setup();
 
-				const menuBtn = wrapper.findComponent({ name: "VBtn" });
+				const menuBtn = wrapper.findComponent(VBtn);
 				await menuBtn.trigger("click");
 
 				const logoutBtn = wrapper.findComponent("[data-testid=logout]");
@@ -169,10 +153,10 @@ describe("@ui-layout/UserMenu", () => {
 
 		describe("when feature flag is disabled", () => {
 			const setup = () => {
-				const mockedSystem: System = {
+				const mockedSystem: MeSystemResponse = {
 					id: "testId",
-					displayName: "moin.schule",
-					alias: "SANIS",
+					name: "Test System",
+					hasEndSessionEndpoint: true,
 				};
 
 				const { wrapper } = setupWrapper(false, mockedSystem);
@@ -196,7 +180,7 @@ describe("@ui-layout/UserMenu", () => {
 			it("should show the correct text for the logout button", async () => {
 				const { wrapper } = setup();
 
-				const menuBtn = wrapper.findComponent({ name: "VBtn" });
+				const menuBtn = wrapper.findComponent(VBtn);
 				await menuBtn.trigger("click");
 
 				const logoutBtn = wrapper.findComponent("[data-testid=logout]");
@@ -206,12 +190,12 @@ describe("@ui-layout/UserMenu", () => {
 			});
 		});
 
-		describe("when user is not logged in from moin.schule", () => {
+		describe("when end session endpoint is not available for the systeme", () => {
 			const setup = () => {
-				const mockedSystem: System = {
+				const mockedSystem: MeSystemResponse = {
 					id: "testId",
-					displayName: "mock",
-					alias: "mock-system",
+					name: "Test System",
+					hasEndSessionEndpoint: false,
 				};
 
 				const { wrapper } = setupWrapper(true, mockedSystem);
@@ -235,7 +219,7 @@ describe("@ui-layout/UserMenu", () => {
 			it("should show the correct text for the logout button", async () => {
 				const { wrapper } = setup();
 
-				const menuBtn = wrapper.findComponent({ name: "VBtn" });
+				const menuBtn = wrapper.findComponent(VBtn);
 				await menuBtn.trigger("click");
 
 				const logoutBtn = wrapper.findComponent("[data-testid=logout]");
diff --git a/src/modules/ui/layout/topbar/UserMenu.vue b/src/modules/ui/layout/topbar/UserMenu.vue
index 567250c551..ec99654fd2 100644
--- a/src/modules/ui/layout/topbar/UserMenu.vue
+++ b/src/modules/ui/layout/topbar/UserMenu.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, PropType, Ref, ref, toRef } from "vue";
+import { computed, ComputedRef, PropType, toRef } from "vue";
 import { useI18n } from "vue-i18n";
 import LanguageMenu from "./LanguageMenu.vue";
 import { MeUserResponse } from "@/serverApi/v3";
@@ -47,7 +47,6 @@ import {
 	AUTH_MODULE_KEY,
 	ENV_CONFIG_MODULE_KEY,
 } from "@/utils/inject";
-import { System, useSystemApi } from "@data-system";
 
 const props = defineProps({
 	user: {
@@ -64,8 +63,6 @@ const { t } = useI18n();
 const authModule = injectStrict(AUTH_MODULE_KEY);
 const envConfigModule = injectStrict(ENV_CONFIG_MODULE_KEY);
 
-const system = useSystemApi();
-
 const userRole = computed(() => {
 	return t(`common.roleName.${toRef(props.roleNames).value[0]}`).toString();
 });
@@ -74,9 +71,13 @@ const initials = computed(() => {
 	return props.user.firstName.slice(0, 1) + props.user.lastName.slice(0, 1);
 });
 
-const isExternalLogoutAllowed: Ref<boolean> = ref(false);
+const isExternalLogoutAllowed: ComputedRef<boolean> = computed(
+	() =>
+		envConfigModule.getEnv.FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED &&
+		!!authModule.loginSystem?.hasEndSessionEndpoint
+);
 
-const systemName: Ref<string> = ref("");
+const systemName: string = authModule.loginSystem?.name ?? "System";
 
 const logout = () => {
 	authModule.logout();
@@ -85,39 +86,6 @@ const logout = () => {
 const externalLogout = () => {
 	authModule.externalLogout();
 };
-
-const setSystemValuesFromJwt = async (jwt: string): Promise<void> => {
-	const jwtPayload = JSON.parse(atob(jwt.split(".")[1]));
-	if (!("systemId" in jwtPayload) && !jwtPayload.systemId) {
-		return;
-	}
-
-	const fetchedSystem: System | undefined = await system.getSystem(
-		jwtPayload.systemId
-	);
-
-	if (!fetchedSystem || !fetchedSystem.alias) {
-		return;
-	}
-
-	isExternalLogoutAllowed.value =
-		fetchedSystem.alias === "SANIS" &&
-		envConfigModule.getEnv.FEATURE_EXTERNAL_SYSTEM_LOGOUT_ENABLED;
-	systemName.value = fetchedSystem.displayName;
-};
-
-onMounted(async () => {
-	const jwt = authModule.getAccessToken;
-	if (jwt) {
-		try {
-			await setSystemValuesFromJwt(jwt);
-			// eslint-disable-next-line @typescript-eslint/no-unused-vars
-		} catch (err) {
-			isExternalLogoutAllowed.value = false;
-			systemName.value = "";
-		}
-	}
-});
 </script>
 
 <style scoped>
diff --git a/src/serverApi/v3/api.ts b/src/serverApi/v3/api.ts
index 52e8a65faa..4d2250f0ee 100644
--- a/src/serverApi/v3/api.ts
+++ b/src/serverApi/v3/api.ts
@@ -4841,6 +4841,12 @@ export interface MeResponse {
      * @memberof MeResponse
      */
     account: MeAccountResponse;
+    /**
+     * 
+     * @type {MeSystemResponse}
+     * @memberof MeResponse
+     */
+    system?: MeSystemResponse;
 }
 /**
  * 
@@ -4905,6 +4911,31 @@ export interface MeSchoolResponse {
      */
     logo: MeSchoolLogoResponse;
 }
+/**
+ * 
+ * @export
+ * @interface MeSystemResponse
+ */
+export interface MeSystemResponse {
+    /**
+     * 
+     * @type {string}
+     * @memberof MeSystemResponse
+     */
+    id: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof MeSystemResponse
+     */
+    name?: string;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof MeSystemResponse
+     */
+    hasEndSessionEndpoint: boolean;
+}
 /**
  * 
  * @export
@@ -6221,6 +6252,12 @@ export interface OauthConfigResponse {
      * @memberof OauthConfigResponse
      */
     jwksEndpoint: string;
+    /**
+     * End session endpoint
+     * @type {string}
+     * @memberof OauthConfigResponse
+     */
+    endSessionEndpoint?: string;
 }
 /**
  * 
diff --git a/src/store/auth.ts b/src/store/auth.ts
index fa986dd9dd..3f11b48aea 100644
--- a/src/store/auth.ts
+++ b/src/store/auth.ts
@@ -4,6 +4,7 @@ import {
 	MeApiInterface,
 	MeResponse,
 	MeSchoolResponse,
+	MeSystemResponse,
 	MeUserResponse,
 	UserApiFactory,
 	UserApiInterface,
@@ -139,6 +140,10 @@ export default class AuthModule extends VuexModule {
 		return !!this.accessToken;
 	}
 
+	get loginSystem(): MeSystemResponse | undefined {
+		return this.me?.system;
+	}
+
 	@Action
 	async login(jwt: string) {
 		const { data } = await this.meApi.meControllerMe();
@@ -187,6 +192,8 @@ export default class AuthModule extends VuexModule {
 
 	@Action
 	externalLogout(): void {
+		localStorage.clear();
+		delete $axios.defaults.headers.common["Authorization"];
 		window.location.replace("/logout/external");
 	}
 }
diff --git a/src/store/auth.unit.ts b/src/store/auth.unit.ts
index 681df59cc1..9195e638a9 100644
--- a/src/store/auth.unit.ts
+++ b/src/store/auth.unit.ts
@@ -1,5 +1,5 @@
 import * as serverApi from "@/serverApi/v3/api";
-import { LanguageType } from "@/serverApi/v3/api";
+import { LanguageType, MeSystemResponse } from "@/serverApi/v3/api";
 import { envConfigModule } from "@/store";
 import { initializeAxios } from "@/utils/api";
 import {
@@ -247,6 +247,23 @@ describe("auth store module", () => {
 				expect(authModule.isLoggedIn).toBe(true);
 			});
 		});
+
+		describe("loginSystem", () => {
+			it("should system info of the user", () => {
+				const authModule = new AuthModule({});
+				const mockedSystem: MeSystemResponse = {
+					id: "test-system-id",
+					name: "test system",
+					hasEndSessionEndpoint: false,
+				};
+				const mockMe = meResponseFactory.build({
+					system: mockedSystem,
+				});
+				authModule.setMe(mockMe);
+
+				expect(authModule.loginSystem).toStrictEqual(mockedSystem);
+			});
+		});
 	});
 
 	describe("actions", () => {
@@ -375,6 +392,16 @@ describe("auth store module", () => {
 
 		describe("externalLogout", () => {
 			const setup = () => {
+				initializeAxios({
+					defaults: {
+						headers: {
+							common: {
+								Authorization: "",
+							},
+						},
+					},
+				} as AxiosInstance);
+
 				const authModule = new AuthModule({});
 
 				const mockReplace = jest.fn();

From 74e27fdb8b7d79f8da258cdb1e2d12ef12b1f5d1 Mon Sep 17 00:00:00 2001
From: Gordon Nicholas <gordon.nicholas@capgemini.com>
Date: Mon, 11 Nov 2024 09:27:58 +0100
Subject: [PATCH 9/9] N21-2136 remove unused imports

---
 src/modules/ui/layout/topbar/Topbar.unit.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/modules/ui/layout/topbar/Topbar.unit.ts b/src/modules/ui/layout/topbar/Topbar.unit.ts
index 96533cfb29..4847f54b26 100644
--- a/src/modules/ui/layout/topbar/Topbar.unit.ts
+++ b/src/modules/ui/layout/topbar/Topbar.unit.ts
@@ -8,7 +8,6 @@ import { createModuleMocks } from "@@/tests/test-utils/mock-store-module";
 import {
 	AUTH_MODULE_KEY,
 	ENV_CONFIG_MODULE_KEY,
-	NOTIFIER_MODULE_KEY,
 	STATUS_ALERTS_MODULE_KEY,
 } from "@/utils/inject";
 import AuthModule from "@/store/auth";
@@ -19,7 +18,6 @@ import { VApp } from "vuetify/lib/components/index.mjs";
 import { envsFactory } from "@@/tests/test-utils";
 import EnvConfigModule from "@/store/env-config";
 import { SchulcloudTheme } from "@/serverApi/v3";
-import NotifierModule from "@/store/notifier";
 
 describe("@ui-layout/Topbar", () => {
 	const setup = async (windowWidth = 1300, isSidebarExpanded?: boolean) => {