Merge pull request #458 from nextcloud/fix/logout_if_slo_errors

Handle failing SLO

Author: rullzer

lib/Controller/SAMLController.php

@@ -406,7 +406,12 @@ public function singleLogoutService() {
 				$nameIdNameQualifier = $this->session->get('user_saml.samlNameIdNameQualifier');
 				$nameIdSPNameQualifier = $this->session->get('user_saml.samlNameIdSPNameQualifier');
 				$sessionIndex = $this->session->get('user_saml.samlSessionIndex');
-				$targetUrl = $auth->logout(null, [], $nameId, $sessionIndex, $stay, $nameIdFormat, $nameIdNameQualifier, $nameIdSPNameQualifier);
+				try {
+					$targetUrl = $auth->logout(null, [], $nameId, $sessionIndex, $stay, $nameIdFormat, $nameIdNameQualifier, $nameIdSPNameQualifier);
+				} catch (Error $e) {
+					$this->logger->logException($e, ['level' => ILogger::WARN]);
+					$this->userSession->logout();
+				}
 			}
 			if(!empty($targetUrl) && !$auth->getLastErrorReason()){
 				$this->userSession->logout();