Skip to content
Snippets Groups Projects
Commit 1778b87e authored by Tim van Dijen's avatar Tim van Dijen
Browse files

Add www-directory to psalm-config and fix some issues

parent c8106cea
No related branches found
No related tags found
No related merge requests found
......@@ -12,6 +12,7 @@
<directory name="metadata-templates" />
<directory name="modules" />
<directory name="tests" />
<directory name="www" />
<!-- Ignore certain directories -->
<ignoreFiles>
......
......@@ -15,6 +15,7 @@ use SAML2\ArtifactResponse;
use SAML2\DOMDocumentFactory;
use SAML2\SOAP;
use SAML2\XML\saml\Issuer;
use SimpleSAML\Assert\Assert;
use SimpleSAML\Configuration;
use SimpleSAML\Error;
use SimpleSAML\Module;
......@@ -57,7 +58,10 @@ if (!($request instanceof ArtifactResolve)) {
throw new Exception('Message received on ArtifactResolutionService wasn\'t a ArtifactResolve request.');
}
$issuer = $request->getIssuer()->getValue();
$issuer = $request->getIssuer();
/** @psalm-assert \SAML2\XML\saml\Issuer $issuer */
Assert::notNull($issuer);
$issuer = $issuer->getValue();
$spMetadata = $metadata->getMetaDataConfig($issuer, 'saml20-sp-remote');
$artifact = $request->getArtifact();
$responseData = $store->get('artifact', $artifact);
......@@ -65,7 +69,7 @@ $store->delete('artifact', $artifact);
if ($responseData !== null) {
$document = DOMDocumentFactory::fromString($responseData);
$responseXML = $document->firstChild;
$responseXML = $document->documentElement;
} else {
$responseXML = null;
}
......
......@@ -5,7 +5,7 @@ require_once('../../_include.php');
use SimpleSAML\Assert\Assert;
use SimpleSAML\Configuration;
use SimpleSAML\Error;
use SimpleSAML\Idp;
use SimpleSAML\IdP;
use SimpleSAML\Logger;
use SimpleSAML\Metadata;
use SimpleSAML\Module;
......
......@@ -201,9 +201,11 @@ try {
$technicalContactEmail = $config->getString('technicalcontact_email', false);
if ($technicalContactEmail && $technicalContactEmail !== 'na@example.org') {
$techcontact['emailAddress'] = $technicalContactEmail;
$techcontact['name'] = $config->getString('technicalcontact_name', null);
$techcontact['contactType'] = 'technical';
$techcontact = [
'emailAddress' => $technicalContactEmail,
'name' => $config->getString('technicalcontact_name', null),
'contactType' => 'technical',
];
$metaArray['contacts'][] = Metadata::getContact($techcontact);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment