Merge branch 'release/4.0'

OpenConext · Apr 13, 2023 · c4afc2e · c4afc2e
2 parents 3beed11 + 7f455c1
commit c4afc2e
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,14 @@
 # Changelog
+
+## 4.0.5
+**Maintenance:**
+- Framework: esi, fragments not used so disable
+- Security upgrades are installed
+
+**Bugfixes:**
+- SMS prove possession route not found #288
+- Repair return type inconsistency in recovery token trait #287
+
 ## 4.0.4
 - Support self-vetting using a self-asserted token #284
 

diff --git a/composer.lock b/composer.lock
diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml
@@ -1,5 +1,5 @@
 framework:
-  #esi:             ~
+  esi:             false
   secret:          "%secret%"
   form:            ~
   csrf_protection: ~
@@ -13,5 +13,5 @@ framework:
     name: sess_selfservice
     cookie_httponly: true
     cookie_secure: true
-  fragments:       ~
+  fragments:       false
   http_method_override: true
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
         "ts-jest": "^27",
         "ts-loader": "^9.0",
         "typescript": "^4",
-        "webpack": "^5.75.0",
+        "webpack": "^5.76.0",
         "webpack-cli": "^5.0.0",
         "webpack-import-glob-loader": "^1.6.3"
     },

diff --git a/src/Surfnet/StepupSelfService/SelfServiceBundle/Controller/RecoveryTokenControllerTrait.php b/src/Surfnet/StepupSelfService/SelfServiceBundle/Controller/RecoveryTokenControllerTrait.php
@@ -73,7 +73,8 @@ private function handleSmsChallenge(
 
             if ($otpRequestsRemaining === 0) {
                 $this->addFlash('error', 'ss.prove_phone_possession.challenge_request_limit_reached');
-                return array_merge(['form' => $form->createView()], $viewVariables);
+                $parameters = array_merge(['form' => $form->createView()], $viewVariables);
+                return $this->render($templateName, $parameters);
             }
 
             if ($this->smsService->sendChallenge($command)) {

diff --git a/src/Surfnet/StepupSelfService/SelfServiceBundle/Controller/Registration/SmsController.php b/src/Surfnet/StepupSelfService/SelfServiceBundle/Controller/Registration/SmsController.php
@@ -46,7 +46,11 @@ public function sendChallengeAction(Request $request)
         $service = $this->get('surfnet_stepup_self_service_self_service.service.sms_second_factor');
         $otpRequestsRemaining = $service->getOtpRequestsRemainingCount(SmsSecondFactorServiceInterface::REGISTRATION_SECOND_FACTOR_ID);
         $maximumOtpRequests = $service->getMaximumOtpRequestsCount();
-        $viewVariables = ['otpRequestsRemaining' => $otpRequestsRemaining, 'maximumOtpRequests' => $maximumOtpRequests];
+        $viewVariables = [
+            'otpRequestsRemaining' => $otpRequestsRemaining,
+            'maximumOtpRequests' => $maximumOtpRequests,
+            'verifyEmail' => $this->emailVerificationIsRequired(),
+        ];
 
         if ($form->isSubmitted() && $form->isValid()) {
             $command->identity = $identity->id;
@@ -67,7 +71,6 @@ public function sendChallengeAction(Request $request)
         return array_merge(
             [
                 'form' => $form->createView(),
-                'verifyEmail' => $this->emailVerificationIsRequired(),
             ],
             $viewVariables
         );

diff --git a/src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/config/routing.yml b/src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/config/routing.yml
@@ -130,6 +130,11 @@ ss_registration_sms_send_challenge:
     methods:  [GET,POST]
     defaults: { _controller: SurfnetStepupSelfServiceSelfServiceBundle:Registration/Sms:sendChallenge }
 
+ss_registration_sms_prove_possession:
+    path:     /registration/sms/prove-possession
+    methods:  [GET,POST]
+    defaults: { _controller: SurfnetStepupSelfServiceSelfServiceBundle:Registration/Sms:provePossession }
+
 ss_registration_gssf_status_report:
     path:     /registration/gssf/{provider}/status
     methods:  [GET]

diff --git a/yarn.lock b/yarn.lock
@@ -6587,10 +6587,10 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5.75.0:
-  version "5.75.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152"
-  integrity sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==
+webpack@^5.76.0:
+  version "5.76.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.0.tgz#f9fb9fb8c4a7dbdcd0d56a98e56b8a942ee2692c"
+  integrity sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^0.0.51"