more defensive migration, moved end session manipulation into loginco…

…ntroller, css class tweak Signed-off-by: Florian Klinger <[email protected]>
nextcloud · Dec 1, 2023 · 48898d2 · 48898d2
1 parent 1c8edf0
commit 48898d2
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/lib/Controller/LoginController.php b/lib/Controller/LoginController.php
@@ -570,7 +570,13 @@ public function singleLogoutService() {
 					$message = $this->l10n->t('There is not such OpenID Connect provider.');
 					return $this->buildErrorTemplateResponse($message, Http::STATUS_NOT_FOUND, ['provider_id' => $providerId]);
 				}
-				$endSessionEndpoint = $this->discoveryService->obtainDiscovery($provider)['end_session_endpoint'];
+
+				// Check if a custom end_session_endpoint is deposited otherwise use the default one provided by the openid-configuration
+				$discoveryData = $this->discoveryService->obtainDiscovery($provider);
+				$defaultEndSessionEndpoint = $discoveryData['end_session_endpoint'];
+				$customEndSessionEndpoint = json_decode(json_encode($provider), true)['endSessionEndpoint'];
+				$endSessionEndpoint = $customEndSessionEndpoint ?? $defaultEndSessionEndpoint;
+
 				if ($endSessionEndpoint) {
 					$endSessionEndpoint .= '?post_logout_redirect_uri=' . $targetUrl;
 					$endSessionEndpoint .= '&client_id=' . $provider->getClientId();

diff --git a/lib/Db/Provider.php b/lib/Db/Provider.php
@@ -36,6 +36,7 @@
  * @method void setClientSecret(string $clientSecret)
  * @method string getDiscoveryEndpoint()
  * @method void setDiscoveryEndpoint(string $discoveryEndpoint)
+ * @method string getEndSessionEndpoint()
  * @method void setEndSessionEndpoint(string $endSessionEndpoint)
  * @method void setScope(string $scope)
  */

diff --git a/lib/Migration/Version010304Date20231130104459.php b/lib/Migration/Version010304Date20231130104459.php
@@ -30,6 +30,7 @@
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
+use OCP\DB\Types;
 
 /**
  * Auto-generated migration step: Please modify to your needs!
@@ -45,11 +46,15 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
 
-		$table = $schema->getTable('user_oidc_providers');
-		$table->addColumn('end_session_endpoint', 'string', [
-			'notnull' => false,
-			'length' => 255,
-		]);
+		if ($schema->hasTable('user_oidc_providers')) {
+			$table = $schema->getTable('user_oidc_providers');
+			if (!$table->hasColumn('end_session_endpoint')) {
+				$table->addColumn('end_session_endpoint', Types::STRING, [
+					'notnull' => false,
+					'length' => 255,
+				]);
+			}
+		}
 
 		return $schema;
 	}

diff --git a/lib/Service/DiscoveryService.php b/lib/Service/DiscoveryService.php
@@ -81,15 +81,6 @@ public function obtainDiscovery(Provider $provider): array {
 			$response = $client->get($url);
 			$cachedDiscovery = $response->getBody();
 
-			// Manipulate the response with the custom endpoint url
-			$endpointData = json_encode($this->providerService->getProviderWithSettings($provider->getId()));
-			$endpointData = json_decode($endpointData)->endSessionEndpoint;
-			if ($endpointData) {
-				$discoveryData = json_decode($cachedDiscovery);
-				$discoveryData->end_session_endpoint = $endpointData;
-				$cachedDiscovery = json_encode($discoveryData);
-			}
-
 			$this->cache->set($cacheKey, $cachedDiscovery, self::INVALIDATE_DISCOVERY_CACHE_AFTER_SECONDS);
 		}
 

diff --git a/src/components/SettingsForm.vue b/src/components/SettingsForm.vue
@@ -239,7 +239,7 @@ export default {
 			min-width: 200px;
 			flex-grow: 1;
 		}
-		input[type=text].italic-placeholder::placeholder {
+		.italic-placeholder::placeholder {
 			font-style: italic;
 		}
 	}