Merge branch 'master' into prevent-group-removal

Author: marcojarjour

.github/workflows/integration.yml

@@ -38,16 +38,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: [ "8.0", "8.1", "8.2", "8.3" ]
+        php-versions: [ "8.0", "8.1", "8.2", "8.3", "8.4" ]
         databases: [ "mysql" ]
-        server-versions: [ "stable28", "stable29", "stable30", "master" ]
+        server-versions: [ "stable28", "stable29", "stable30", "stable31", "master" ]
         exclude:
           - server-versions: "master"
             php-versions: "8.0"
             databases: "mysql"
           - server-versions: "master"
             php-versions: "8.2"
             databases: "mysql"
+          - server-versions: "stable31"
+            php-versions: "8.2"
+            databases: "mysql"
+          - server-versions: "stable31"
+            php-versions: "8.1"
+            databases: "mysql"
+          - server-versions: "stable31"
+            php-versions: "8.0"
+            databases: "mysql"
           - server-versions: "stable30"
             php-versions: "8.2"
             databases: "mysql"
@@ -66,6 +75,15 @@ jobs:
           - server-versions: "stable28"
             php-versions: "8.1"
             databases: "mysql"
+          - server-versions: "stable28"
+            php-versions: "8.4"
+            databases: "mysql"
+          - server-versions: "stable29"
+            php-versions: "8.4"
+            databases: "mysql"
+          - server-versions: "stable30"
+            php-versions: "8.4"
+            databases: "mysql"
         include:
           - server-versions: "stable28"
             php-versions: "8.2"

CHANGELOG.md

@@ -5,6 +5,26 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 6.5.0
+
+### Added
+
+* [Feat(deps): Add Nextcloud 32 support (user_saml#921)](https://github.com/nextcloud/user_saml/pull/921)
+
+### Fixed
+
+* [Fix(UI): set value to the require_provisioned_account option also in env mode (user_saml#916)](https://github.com/nextcloud/user_saml/pull/916)
+* [Fix(GroupMigration): issue debug info on why a group is not being migrated (user_saml#923)](https://github.com/nextcloud/user_saml/pull/923)
+
+### Dependencies
+
+* [Build(deps): bump firebase/php-jwt from 6.10.2 to 6.11.0 (user_saml#924)](https://github.com/nextcloud/user_saml/pull/924)
+
+### Under the hood
+
+* [Chore(CI): Adjust testing matrix for Nextcloud 31 on master (user_saml#920)](https://github.com/nextcloud/user_saml/pull/920)
+* [Ci(integration): also test against PHP 8.4 (user_saml#922)](https://github.com/nextcloud/user_saml/pull/922)
+
 ## 6.4.1
 
 ### Fixed

appinfo/info.xml

@@ -20,7 +20,7 @@ The following providers are supported and tested at the moment:
 	* Any other provider that authenticates using the environment variable
 
 While theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.]]></description>
-	<version>6.4.1</version>
+	<version>6.5.0</version>
 	<licence>agpl</licence>
 	<author>Lukas Reschke</author>
 	<namespace>User_SAML</namespace>
@@ -37,7 +37,7 @@ While theoretically any other authentication provider implementing either one of
 	<screenshot>https://raw.githubusercontent.com/nextcloud/user_saml/master/screenshots/1.png</screenshot>
 	<screenshot>https://raw.githubusercontent.com/nextcloud/user_saml/master/screenshots/2.png</screenshot>
 	<dependencies>
-		<nextcloud min-version="28" max-version="31" />
+		<nextcloud min-version="28" max-version="32" />
 	</dependencies>
 	<repair-steps>
 		<post-migration>

composer.lock

@@ -71,6 +71,7 @@
     "URL Location of the IdP where the SP will send the SLO Request" : "Dirección URL de el IdP donde el SP enviará las peticiones SLO",
     "URL Location of the IDP's SLO Response" : "Dirección URL de la respuesta SLO del IDP",
     "Public X.509 certificate of the IdP" : "Certificado público X.509 del IdP",
+    "Request parameters to pass-through to IdP (comma separated list)" : "Parámetros de solicitud a transferir a IdP (lista separada por comas)",
     "Attribute mapping" : "Definición de atributos",
     "If you want to optionally map attributes to the user you can configure these here." : "Si opcionalmente quieres mapear atributos al usuario puedes configurar éstos aquí.",
     "Show attribute mapping settings…" : "Mostrar configuración de mapeado de atributos...",

l10n/es.js

@@ -71,6 +71,7 @@
     "URL Location of the IdP where the SP will send the SLO Request" : "Umiestnenie URL IdP, kam SP zašle SLO požiadavku",
     "URL Location of the IDP's SLO Response" : "Umiestnenie URL IDP, kam SLO pošle odpoveď",
     "Public X.509 certificate of the IdP" : "Verejný certifikát X.509 poskytovateľa prihlasovacích údajov",
+    "Request parameters to pass-through to IdP (comma separated list)" : "Parametre žiadosti pre predanie do IdP (zoznam oddelený čiarkou)",
     "Attribute mapping" : "Mapovanie atribútov",
     "If you want to optionally map attributes to the user you can configure these here." : "Ak chcete voliteľne priradiť atribúty k používateľom, môžete ich nastaviť tu.",
     "Show attribute mapping settings…" : "Zobraziť nastavenia priradzovania atribútov ...",

l10n/es.json

@@ -111,16 +111,31 @@ protected function getGroupsToMigrate(array $samlGroups, array $pool): array {
 
 			$group = $this->groupManager->get($gid);
 			if ($group === null) {
+				$this->logger->debug('Not migrating group "{gid}": not found by the group manager', [
+					'app' => 'user_saml',
+					'gid' => $gid,
+				]);
 				return false;
 			}
 
 			$backendNames = $group->getBackendNames();
 			if (!in_array('Database', $backendNames, true)) {
+				$this->logger->debug('Not migrating group "{gid}": not belonging to local database backend', [
+					'app' => 'user_saml',
+					'gid' => $gid,
+					'backends' => $backendNames,
+				]);
 				return false;
 			}
 
 			foreach ($group->getUsers() as $user) {
 				if ($user->getBackendClassName() !== 'user_saml') {
+					$this->logger->debug('Not migrating group "{gid}": user "{userId}" from a different backend "{userBackend}"', [
+						'app' => 'user_saml',
+						'gid' => $gid,
+						'userId' => $user->getUID(),
+						'userBackend' => $user->getBackendClassName(),
+					]);
 					return false;
 				}
 			}

l10n/sk.js

@@ -175,13 +175,14 @@ public function getForm() {
 		}
 
 		$type = $this->config->getAppValue('user_saml', 'type');
+
+		$generalSettings['require_provisioned_account'] = [
+			'text' => $this->l10n->t('Only allow authentication if an account exists on some other backend (e.g. LDAP).', [$this->defaults->getName()]),
+			'type' => 'checkbox',
+			'global' => true,
+			'value' => $this->config->getAppValue('user_saml', 'general-require_provisioned_account', '0')
+		];
 		if ($type === 'saml') {
-			$generalSettings['require_provisioned_account'] = [
-				'text' => $this->l10n->t('Only allow authentication if an account exists on some other backend (e.g. LDAP).', [$this->defaults->getName()]),
-				'type' => 'checkbox',
-				'global' => true,
-				'value' => $this->config->getAppValue('user_saml', 'general-require_provisioned_account', '0')
-			];
 			$generalSettings['idp0_display_name'] = [
 				'text' => $this->l10n->t('Optional display name of the identity provider (default: "SSO & SAML log in")'),
 				'type' => 'line',