Commit 0f16c103 authored by Jae Proctor's avatar Jae Proctor
Browse files

Issue #3239120: Consumer endpoint incorrectly includes the language prefix

parent 5163543c

saml_sp.module

+6 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ use Drupal\saml_sp\Entity\Idp; 
use Drupal\saml_sp\SAML\SamlSPSettings;

use Drupal\saml_sp\SAML\SamlSPAuth;

use Drupal\Core\Url;

use Drupal\Core\Language\LanguageInterface;

use OneLogin\Saml2\Constants;



/**
@@ -100,7 +101,11 @@ function saml_sp__get_settings($idp = NULL) { 
  $settings = [];



  // The consumer endpoint will always be /saml/consume.

  $endpoint_url = Url::fromRoute('saml_sp.consume', [], ['absolute' => TRUE]);

  $languageNone = \Drupal::languageManager()->getLanguage(LanguageInterface::LANGCODE_NOT_APPLICABLE);

  $endpoint_url = Url::fromRoute('saml_sp.consume', [], [

    'language' => $languageNone,

    'absolute' => TRUE,

  ]);



  $settings['idp']['entityId'] = $idp->id() ?: 'none_given';