Fix/minor translation and style fixes (#6)

* fix trust device FIELD_TRUST_DEVICE checkbox optional (if empty there was a php error) * minor translation & visual fixes. Use zed gui layout when 2FA is enforced and user has to setup (instead of layout-plain). Add css class to
ufirstgroup · Jan 16, 2023 · b04576b · b04576b
1 parent 55026cf
commit b04576b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 39 deletions.
diff --git a/src/SprykerUFirst/Zed/SecondFactorAuth/Communication/Controller/AuthenticationController.php b/src/SprykerUFirst/Zed/SecondFactorAuth/Communication/Controller/AuthenticationController.php
@@ -52,7 +52,7 @@ public function indexAction(Request $request)
             if ($isAuthenticated) {
                 $redirectResponse = $this->redirectResponse($this->getFactory()->getConfig()->getHomePath());
 
-                if ($formData[AuthenticationForm::FIELD_TRUST_DEVICE]) {
+                if ($formData[AuthenticationForm::FIELD_TRUST_DEVICE]?? false) {
                     $trustedDeviceCookie = Uuid::uuid1()->toString();
                     $this->getFacade()->trustDevice($trustedDeviceCookie);
                     $redirectResponse->headers->setCookie(

diff --git a/src/SprykerUFirst/Zed/SecondFactorAuth/Presentation/Authentication/index.twig b/src/SprykerUFirst/Zed/SecondFactorAuth/Presentation/Authentication/index.twig
@@ -4,13 +4,13 @@
 
 {% block content %}
 
-    <div>
+    <div class="second-factor-auth">
         {{ form_start(form) }}
 
             {% include '@SecurityGui/Partial/form-message.twig' %}
 
             <p>
-                {{ 'You are using second factor authentication. User your mobile application and enter the code into the field below.' | trans }}
+                {{ 'You are using second factor authentication. Use your mobile application and enter the code into the field below.' | trans }}
             </p>
 
             {{ form_errors(form) }}

diff --git a/src/SprykerUFirst/Zed/SecondFactorAuth/Presentation/Layout/form.twig b/src/SprykerUFirst/Zed/SecondFactorAuth/Presentation/Layout/form.twig
@@ -12,7 +12,7 @@
 {% block text_widget %}
     <div class="form-group">
         <div class="input-group">
-            <span class="input-group-addon"><i class="fa fa-terminal fa-inverse"></i></span>
+            <span class="input-group-addon"><i class="fa fa-terminal"></i></span>
             {{ block('form_widget_simple') }}
         </div>
     </div>

diff --git a/src/SprykerUFirst/Zed/SecondFactorAuth/Presentation/Layout/layout-plain.twig b/src/SprykerUFirst/Zed/SecondFactorAuth/Presentation/Layout/layout-plain.twig
diff --git a/src/SprykerUFirst/Zed/SecondFactorAuth/Presentation/Registration/index.twig b/src/SprykerUFirst/Zed/SecondFactorAuth/Presentation/Registration/index.twig
@@ -1,3 +1,6 @@
+{% form_theme form '@SecondFactorAuth/Layout/form.twig' %}
+
+
 {% if status != 'registered' and is_required %}
     {% include '@SecondFactorAuth/Registration/partials/required.twig' %}
 {% else %}

diff --git a/src/SprykerUFirst/Zed/SecondFactorAuth/Presentation/Registration/partials/form.twig b/src/SprykerUFirst/Zed/SecondFactorAuth/Presentation/Registration/partials/form.twig
@@ -32,7 +32,7 @@
    {% endif %}
 
     <div class="second-factor-device-list">
-        <b>{{ 'Install one of these applications for 2FA: ' | trans }}</b><a target="_blank" href="https://authy.com/">Authy</a> (preferred) | <a target="_blank" href="https://support.google.com/accounts/answer/1066447">Google Authenticator</a>
+        <b>{{ 'Install one of these applications for 2FA:' | trans }}</b> <a target="_blank" href="https://authy.com/">Authy</a> (preferred) | <a target="_blank" href="https://support.google.com/accounts/answer/1066447">Google Authenticator</a>
     </div>
 
     <div class="row">
@@ -41,7 +41,7 @@
                 <img src={{ qr_code_url }}>
             </p>
             <p>
-            <div>Alternatively you can enter the code manually: <b>{{ secret }}</b></div>
+            <div>{{ 'Alternatively you can enter the code manually:' | trans }} <b>{{ secret }}</b></div>
             </p>
 
         </div>
@@ -50,7 +50,7 @@
             <div class="form-group">
                 <button class="btn btn-success btn-block btn-outline btn" type="submit">
                     {%  if status == 'registered' %}
-                        {{ 'Unegister' | trans }}
+                        {{ 'Unregister' | trans }}
                     {% else %}
                         {{ 'Register' | trans }}
                     {%  endif %}
@@ -79,7 +79,7 @@
     <div class="form-group">
         <button class="btn btn-success btn-block btn-outline btn" type="submit">
             {%  if status == 'registered' %}
-                {{ 'Unegister' | trans }}
+                {{ 'Unregister' | trans }}
             {% else %}
                 {{ 'Register' | trans }}
             {%  endif %}

diff --git a/src/SprykerUFirst/Zed/SecondFactorAuth/Presentation/Registration/partials/required.twig b/src/SprykerUFirst/Zed/SecondFactorAuth/Presentation/Registration/partials/required.twig
@@ -1,4 +1,4 @@
-{% extends '@SecondFactorAuth/Layout/layout-plain.twig' %}
+{% extends '@Gui/Layout/layout.twig' %}
 
 {% set widget_title = 'Two Factor Authentication' %}
 
@@ -22,4 +22,4 @@
 
     {% endembed %}
 
-{% endblock %}
+{% endblock %}