Merge commit 'ccad9b0d8aeffd057686740b3c778bf22a1e9a2d' into user-groups

# Conflicts:
#	composer.lock

.github/workflows/test-sca.yml

@@ -10,4 +10,3 @@ jobs:
         uses: maikschneider/reusable-workflows/.github/workflows/sca.yml@main
         with:
             php-version: 8.1
-            php-extensions: mailparse

Configuration/Icons.php

@@ -5,4 +5,8 @@
         'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class,
         'source' => 'EXT:xima_oauth2_extended/Resources/Public/Icons/xima-x.svg',
     ],
+    'authentik' => [
+        'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class,
+        'source' => 'EXT:xima_oauth2_extended/Resources/Public/Icons/authentik.svg',
+    ],
 ];

README.md

@@ -104,6 +104,15 @@ https://domain.de/typo3/login?loginProvider=1616569531&oauth2-provider=yourProvi
 
 Replace `domain.de` and `yourProviderId` with your data!
 
+### Login not working
+
+Make sure `cookieSameSite` is set to `lax`.
+
+```php
+$GLOBALS['TYPO3_CONF_VARS']['BE']['cookieSameSite'] = 'lax';
+$GLOBALS['TYPO3_CONF_VARS']['FE']['cookieSameSite'] = 'lax';
+```
+
 ### Order of login provider
 
 To change the order of provider displayed at the `/typo3` login page (OAuth

composer.json

@@ -1,46 +1,46 @@
 {
-	"name": "xima/xima-oauth2-extended",
-	"description": "Additional OAuth2 provider + on-the-fly user creation",
-	"type": "typo3-cms-extension",
-	"license": "GPL-2.0-or-later",
-	"authors": [
-		{
-			"name": "Maik Schneider",
-			"email": "maik.schneider@xima.de",
-			"role": "Developer"
-		}
-	],
-	"require": {
-		"php": ">=8.1",
-		"league/oauth2-client": ">=2.7",
-		"waldhacker/typo3-oauth2-client": ">=2.1.1 || dev-feature/v12-compatibility-1",
-		"ext-pdo": "*"
-	},
-	"require-dev": {
-		"saschaegerer/phpstan-typo3": "^1.8",
-		"friendsofphp/php-cs-fixer": "^3.6",
-		"phpstan/extension-installer": "^1.3",
-		"typo3/cms-base-distribution": "^12.4"
-	},
-	"extra": {
-		"typo3/cms": {
-			"extension-key": "xima_oauth2_extended"
-		}
-	},
-	"autoload": {
-		"psr-4": {
-			"Xima\\XimaOauth2Extended\\": "Classes"
-		}
-	},
-	"scripts": {
-		"php:fixer": "./vendor/bin/php-cs-fixer --config=php-cs-fixer.php fix",
-		"php:stan": "./vendor/bin/phpstan --generate-baseline=phpstan-baseline.neon --allow-empty-baseline"
-	},
-	"config": {
-		"allow-plugins": {
-			"typo3/cms-composer-installers": true,
-			"typo3/class-alias-loader": true,
-			"phpstan/extension-installer": true
-		}
-	}
+  "name": "xima/xima-oauth2-extended",
+  "description": "Additional OAuth2 provider + on-the-fly user creation",
+  "type": "typo3-cms-extension",
+  "license": "GPL-2.0-or-later",
+  "authors": [
+    {
+      "name": "Maik Schneider",
+      "email": "maik.schneider@xima.de",
+      "role": "Developer"
+    }
+  ],
+  "require": {
+    "php": ">=8.1",
+    "league/oauth2-client": ">=2.7",
+    "waldhacker/typo3-oauth2-client": ">=2.1.1 || dev-feature/v12-compatibility-1",
+    "ext-pdo": "*",
+    "typo3/cms-core": "^11.0 || ^12.0"
+  },
+  "require-dev": {
+    "saschaegerer/phpstan-typo3": "^1.8",
+    "friendsofphp/php-cs-fixer": "^3.6",
+    "phpstan/extension-installer": "^1.3"
+  },
+  "extra": {
+    "typo3/cms": {
+      "extension-key": "xima_oauth2_extended"
+    }
+  },
+  "autoload": {
+    "psr-4": {
+      "Xima\\XimaOauth2Extended\\": "Classes"
+    }
+  },
+  "scripts": {
+    "php:fixer": "./vendor/bin/php-cs-fixer --config=php-cs-fixer.php fix",
+    "php:stan": "./vendor/bin/phpstan --generate-baseline=phpstan-baseline.neon --allow-empty-baseline"
+  },
+  "config": {
+    "allow-plugins": {
+      "typo3/cms-composer-installers": true,
+      "typo3/class-alias-loader": true,
+      "phpstan/extension-installer": true
+    }
+  }
 }