Fix for missing session data

Signed-off-by: H2CK <dev@jagel.net>

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.9.4] - 2024-09-11
+
+### Changed
+
+- Fixed bug for lost session data in case of client authentication uses BasicAuth
+- Updated dependencies
+- Updated translations
+
 ## [0.9.3] - 2024-08-29
 
 ### Changed

appinfo/info.xml

@@ -14,7 +14,7 @@ Full documentation can be found at:
 - [Developer Documentation](https://github.com/H2CK/oidc/wiki#developer-documentation)
 
 	]]></description>
-  <version>0.9.3</version>
+  <version>0.9.4</version>
   <licence>agpl</licence>
   <author mail="dev@jagel.net" homepage="https://github.com/H2CK/oidc">Thorsten Jagel</author>
   <namespace>OIDCIdentityProvider</namespace>

lib/Controller/LoginRedirectorController.php

@@ -193,13 +193,13 @@ public function authorize(
         {
         if (!$this->userSession->isLoggedIn()) {
             // Not authenticated yet
-            // Store things in user session to be available after login
-            $this->session->set('client_id', $client_id);
-            $this->session->set('state', $state);
-            $this->session->set('response_type', $response_type);
-            $this->session->set('redirect_uri', $redirect_uri);
-            $this->session->set('scope', $scope);
-            $this->session->set('nonce', $nonce);
+            // Store oidc attributes in user session to be available after login
+            $this->session->set('oidc_client_id', $client_id);
+            $this->session->set('oidc_state', $state);
+            $this->session->set('oidc_response_type', $response_type);
+            $this->session->set('oidc_redirect_uri', $redirect_uri);
+            $this->session->set('oidc_scope', $scope);
+            $this->session->set('oidc_nonce', $nonce);
 
             $afterLoginRedirectUrl = $this->urlGenerator->linkToRoute('oidc.Page.index', []);
 
@@ -216,22 +216,22 @@ public function authorize(
         }
 
         if (empty($client_id)) {
-            $client_id = $this->session->get('client_id');
+            $client_id = $this->session->get('oidc_client_id');
         }
         if (empty($state)) {
-            $state = $this->session->get('state');
+            $state = $this->session->get('oidc_state');
         }
         if (empty($response_type)) {
-            $response_type = $this->session->get('response_type');
+            $response_type = $this->session->get('oidc_response_type');
         }
         if (empty($redirect_uri)) {
-            $redirect_uri = $this->session->get('redirect_uri');
+            $redirect_uri = $this->session->get('oidc_redirect_uri');
         }
         if (empty($scope)) {
-            $scope = $this->session->get('scope');
+            $scope = $this->session->get('oidc_scope');
         }
         if (empty($nonce)) {
-            $nonce = $this->session->get('nonce');
+            $nonce = $this->session->get('oidc_nonce');
         }
 
         // Set default scope if scope is not set at all

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "oidc",
 	"description": "Use Nextcloud as OIDC Identity Provider",
-	"version": "0.9.3",
+	"version": "0.9.4",
 	"author": "Thorsten Jagel <dev@jagel.net>",
 	"bugs": {
 		"url": "https://github.com/H2CK/oidc/issues"