Merge pull request #30 from RRZE-Webteam/dev

Dev

Author: rvdforst

includes/Authenticate.php

@@ -103,6 +103,13 @@ public function authenticate($user, $userLogin)
         // The entityID of the IdP the user is authenticated against.
         $samlSpIdp = $this->authSimple->getAuthData('saml:sp:IdP');
 
+        // Get the IdP Metadata.
+        $metadata = \SimpleSAML\Metadata\MetaDataStorageHandler::getMetadataHandler();
+        $idpMetadata = $metadata->getMetaData($samlSpIdp, 'saml20-idp-remote');
+        $locale = get_locale();
+        $lang = substr($locale, 0, 2);
+        $idpName = $idpMetadata['name'][$lang] ?? '';
+
         // Retrieve the attributes of the current user.
         // If the user isn't authenticated, an empty array will be returned.
         if (empty($_atts = $this->authSimple->getAttributes())) {
@@ -187,7 +194,7 @@ public function authenticate($user, $userLogin)
         $firstName = $firstName ?: $atts['givenName'] ?? '';
 
         $organizationName = $atts['o'] ?? '';
-        $organizationName = $organizationName ?: $atts['organizationName'] ?? '';
+        $organizationName = $organizationName ?: $atts['organizationName'] ?? $idpName;
 
         $eduPersonAffiliation = $atts['eduPersonAffiliation'] ?? '';
         $eduPersonScopedAffiliation = $atts['eduPersonScopedAffiliation'] ?? '';

includes/Utils.php

@@ -4,7 +4,7 @@
 Plugin Name:      RRZE SSO
 Plugin URI:       https://github.com/RRZE-Webteam/rrze-sso
 Description:      Single-Sign-On (SSO) SAML-Integrations-Plugin für WordPress.
-Version:          1.6.6
+Version:          1.6.7
 Author:           RRZE-Webteam
 Author URI:       https://blogs.fau.de/webworking/
 License:          GNU General Public License v2
@@ -18,7 +18,7 @@
 defined('ABSPATH') || exit;
 
 const RRZE_PHP_VERSION = '8.0';
-const RRZE_WP_VERSION = '6.2';
+const RRZE_WP_VERSION = '6.5';
 
 /**
  * SPL Autoloader (PSR-4).