N21-2136 show buttons only to moin.schule users

hpi-schul-cloud · Nov 3, 2024 · 6195d8d · 6195d8d
1 parent ffc9338
commit 6195d8d
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 16 deletions.
diff --git a/helpers/authentication.js b/helpers/authentication.js
@@ -64,7 +64,7 @@ const clearCookie = async (req, res, options = { destroySession: false }) => {
 			});
 		});
 	}
-	
+
 	res.clearCookie('jwt');
 	// this is deprecated and only used for cookie removal from now on,
 	// and can be removed after one month (max cookie lifetime from life systems)
@@ -101,12 +101,27 @@ const isAuthenticated = (req) => {
 };
 
 const populateCurrentUser = async (req, res) => {
+	async function setExternalSystemFromJwt(decodedJwt) {
+		if (!("systemId" in decodedJwt) && !decodedJwt.systemId) {
+			return;
+		}
+
+		try {
+			const response = await api(req, { version: 'v3' }).get(`/systems/public/${decodedJwt.systemId}`);
+			res.locals.externalSystem = response.alias;
+		} catch (err) {
+			const metadata = { error: err.toString() };
+			logger.error('Unable to find out the external login system used by user', metadata);
+		}
+	}
+
 	let payload = {};
 	if (isJWT(req)) {
 		try {
 			// eslint-disable-next-line prefer-destructuring
 			payload = (jwt.decode(req.cookies.jwt, { complete: true }) || {}).payload;
 			res.locals.currentPayload = payload;
+			await setExternalSystemFromJwt(payload);
 		} catch (err) {
 			logger.error('Broken JWT / JWT decoding failed', formatError(err));
 			return clearCookie(req, res, { destroySession: true })

diff --git a/locales/de.json b/locales/de.json
@@ -2440,9 +2440,9 @@
 			"tab_label": {
 				"settings": "Einstellungen",
 				"signOut": "Logout",
-				"n21": {
+				"sanis": {
 					"signOut": "Logout Bildungscloud",
-					"signOutWithMoinSchule": "Logout Bildungscloud & moin.schule"
+					"externalSignOut": "Logout Bildungscloud & moin.schule"
 				}
 			},
 			"text": {

diff --git a/locales/en.json b/locales/en.json
@@ -2440,9 +2440,9 @@
 			"tab_label": {
 				"settings": "Settings",
 				"signOut": "Sign out",
-				"n21": {
+				"sanis": {
 					"signOut": "Logout Bildungscloud",
-					"signOutWithMoinSchule": "Logout Bildungscloud & moin.schule"
+					"externalSignOut": "Logout Bildungscloud & moin.schule"
 				}
 			},
 			"text": {

diff --git a/locales/es.json b/locales/es.json
@@ -2440,9 +2440,9 @@
 			"tab_label": {
 				"settings": "Configuración",
 				"signOut": "Cerrar sesión",
-				"n21": {
+				"sanis": {
 					"signOut": "Cerrar sesión Bildungscloud",
-					"signOutWithMoinSchule": "Cerrar sesión Bildungscloud & moin.schule"
+					"externalSignOut": "Cerrar sesión Bildungscloud & moin.schule"
 				}
 			},
 			"text": {

diff --git a/locales/uk.json b/locales/uk.json
@@ -2608,9 +2608,9 @@
 			"tab_label": {
 				"settings": "Налаштування",
 				"signOut": "Вийти з системи",
-				"n21": {
+				"sanis": {
 					"signOut": "Вийти з системи Bildungscloud",
-					"signOutWithMoinSchule": "Вийти з системи Bildungscloud & moin.schule"
+					"externalSignOut": "Вийти з системи Bildungscloud & moin.schule"
 				}
 			},
 			"text": {

diff --git a/views/lib/topbar.hbs b/views/lib/topbar.hbs
@@ -59,15 +59,16 @@
                   <hr>
                   {{> "user/forms/language" language=@root.userLanguage }}
                   <li><a class="dropdown-item" data-testid="settings" href="/account/" role="menuitem" aria-label="{{$t 'lib.loggedin.tab_label.settings' }}">{{$t "lib.loggedin.tab_label.settings" }}</a></li>
-                  {{#ifeq @root.theme.name "n21"}}
-                      <li><a class="dropdown-item localstorageclear" data-testid="logout-external" href="/logout/external/" role="menuitem" aria-label="{{$t 'lib.loggedin.tab_label.n21.signOutWithMoinSchule'}}">{{$t "lib.loggedin.tab_label.n21.signOutWithMoinSchule"}}</a></li>
-                  {{/ifeq}}
-                  <li><a class="dropdown-item localstorageclear"
+                  {{#ifeq externalSystem "SANIS"}}
+                    <li><a class="dropdown-item localstorageclear" data-testid="logout-external" href="/logout/external/" role="menuitem" aria-label="{{$t 'lib.loggedin.tab_label.sanis.signOut'}}">{{$t "lib.loggedin.tab_label.sanis.externalSignOut"}}</a></li>
+                    <li><a class="dropdown-item localstorageclear" data-testid="logout" href= {{#hasConfig "OAUTH2_LOGOUT_URI"}} {{getConfig "OAUTH2_LOGOUT_URI"}} {{else}} "/logout/" {{/hasConfig}} role="menuitem" aria-label="{{$t 'lib.loggedin.tab_label.sanis.signOut'}}">{{$t 'lib.loggedin.tab_label.sanis.signOut'}}</a></li>
+                  {{else}}
+                    <li><a class="dropdown-item localstorageclear"
                          data-testid="logout"
                          href= {{#hasConfig "OAUTH2_LOGOUT_URI"}} {{getConfig "OAUTH2_LOGOUT_URI"}} {{else}} "/logout/" {{/hasConfig}} role="menuitem"
-                         aria-label="{{#ifeq @root.theme.name "n21"}} {{$t 'lib.loggedin.tab_label.n21.signOut'}} {{else}} {{$t 'lib.loggedin.tab_label.signOut'}} {{/ifeq}}">
-                      {{#ifeq @root.theme.name "n21"}} {{$t 'lib.loggedin.tab_label.n21.signOut'}} {{else}} {{$t 'lib.loggedin.tab_label.signOut'}} {{/ifeq}}
-                  </a></li>
+                         aria-label="{{$t 'lib.loggedin.tab_label.signOut'}}">
+                    {{$t 'lib.loggedin.tab_label.signOut'}}</a></li>
+                  {{/ifeq}}
               </ul>
           </div>
       </li>