Merge pull request #117 from OpenConext/feature/sf-subset/apply-allow…

…ed-second-factors-in-ss Apply Allowed Second Factors in SS
OpenConext · Feb 14, 2017 · 41294cc · 41294cc
2 parents b737968 + 9487f5e
commit 41294cc
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         "fortawesome/font-awesome": "~4.2.0",
         "jms/translation-bundle": "~1.1.0",
         "jms/di-extra-bundle": "~1.4.0",
-        "surfnet/stepup-middleware-client-bundle": "^1.3",
+        "surfnet/stepup-middleware-client-bundle": "^1.5",
         "guzzlehttp/guzzle": "~4",
         "surfnet/stepup-saml-bundle": "^2.5",
         "surfnet/stepup-bundle": "^1.5",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Surfnet/StepupSelfService/SelfServiceBundle/Controller/RegistrationController.php b/src/Surfnet/StepupSelfService/SelfServiceBundle/Controller/RegistrationController.php
@@ -31,11 +31,20 @@ class RegistrationController extends Controller
      */
     public function displaySecondFactorTypesAction()
     {
-        $enabledSecondFactors = $this->getParameter('ss.enabled_second_factors');
+        $institutionConfigurationOptions = $this->get('self_service.service.institution_configuration_options')
+            ->getInstitutionConfigurationOptionsFor($this->getIdentity()->institution);
+
+        $availableSecondFactors = $this->getParameter('ss.enabled_second_factors');
+        if (!empty($institutionConfigurationOptions->allowedSecondFactors)) {
+            $availableSecondFactors = array_intersect(
+                $availableSecondFactors,
+                $institutionConfigurationOptions->allowedSecondFactors
+            );
+        }
 
         return [
             'commonName' => $this->getIdentity()->commonName,
-            'enabledSecondFactors' => array_combine($enabledSecondFactors, $enabledSecondFactors),
+            'availableSecondFactors' => array_combine($availableSecondFactors, $availableSecondFactors),
             'tiqrAppAndroidUrl' => $this->getParameter('tiqr_app_android_url'),
             'tiqrAppIosUrl'     => $this->getParameter('tiqr_app_ios_url'),
         ];

diff --git a/...Service/SelfServiceBundle/Resources/views/Registration/displaySecondFactorTypes.html.twig b/...Service/SelfServiceBundle/Resources/views/Registration/displaySecondFactorTypes.html.twig
@@ -12,7 +12,7 @@
     <h2>{{ block('page_title') }}</h2>
 
     <div class="row">
-        {% if enabledSecondFactors.sms is defined %}
+        {% if availableSecondFactors.sms is defined %}
             {% include 'SurfnetStepupSelfServiceSelfServiceBundle::Registration/partial/secondFactor.html.twig' with {
                 'type': 'sms',
                 'security': 2,
@@ -21,7 +21,7 @@
                 'tiqrAppIosUrl': tiqrAppIosUrl,
             } only %}
         {% endif %}
-        {% if enabledSecondFactors.tiqr is defined %}
+        {% if availableSecondFactors.tiqr is defined %}
             {% include 'SurfnetStepupSelfServiceSelfServiceBundle::Registration/partial/secondFactor.html.twig' with {
                 'type': 'tiqr',
                 'security': 2,
@@ -30,7 +30,7 @@
                 'tiqrAppIosUrl': tiqrAppIosUrl,
             } only %}
         {% endif %}
-        {% if enabledSecondFactors.yubikey is defined %}
+        {% if availableSecondFactors.yubikey is defined %}
             {% include 'SurfnetStepupSelfServiceSelfServiceBundle::Registration/partial/secondFactor.html.twig' with {
                 'type': 'yubikey',
                 'security': 3,
@@ -39,7 +39,7 @@
                 'tiqrAppIosUrl': tiqrAppIosUrl,
             } only %}
         {% endif %}
-        {% if enabledSecondFactors.u2f is defined %}
+        {% if availableSecondFactors.u2f is defined %}
             {% include 'SurfnetStepupSelfServiceSelfServiceBundle::Registration/partial/secondFactor.html.twig' with {
                 'type': 'u2f',
                 'security': 3,
@@ -48,7 +48,7 @@
                 'tiqrAppIosUrl': tiqrAppIosUrl,
             } only %}
         {% endif %}
-        {% if enabledSecondFactors.biometric is defined %}
+        {% if availableSecondFactors.biometric is defined %}
             {% include 'SurfnetStepupSelfServiceSelfServiceBundle::Registration/partial/secondFactor.html.twig' with {
                 'type': 'biometric',
                 'security': 3,