From c54b89485ec761caf8344a252eb631777f4a1b66 Mon Sep 17 00:00:00 2001
From: Maxime Besson <maxime.besson@worteks.com>
Date: Mon, 10 Oct 2022 16:17:09 +0200
Subject: [PATCH] Tidy 2FA code

---
 .../Lemonldap/NG/Portal/2F/Engines/Default.pm | 31 +++++++++----------
 .../lib/Lemonldap/NG/Portal/2F/Mail2F.pm      | 13 ++++----
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Engines/Default.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Engines/Default.pm
index 379ff8d79..0a3892482 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Engines/Default.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Engines/Default.pm
@@ -380,7 +380,7 @@ sub run {
 
     # More than 1 2F has been found, display choice
     $self->logger->debug("Prepare 2F choice");
-    my $tpl = $self->p->sendHtml(
+    my $res = $self->p->sendHtml(
         $req,
         '2fchoice',
         params => {
@@ -403,7 +403,7 @@ sub run {
             ],
         }
     );
-    $req->response($tpl);
+    $req->response($res);
     return PE_SENDRESPONSE;
 }
 
@@ -480,28 +480,27 @@ sub _redirect {
 }
 
 sub _displayRegister {
-    my ( $self, $req, $tpl ) = @_;
+    my ( $self, $req, $prefix ) = @_;
 
     # After verifying rule:
-    #  - display template if $tpl
+    #  - display template if $prefix
     #  - else display choice template
-    if ($tpl) {
+    if ($prefix) {
         my ($m) =
-          grep { $_->{m}->prefix eq $tpl } @{ $self->sfRModules };
+          grep { $_->{m}->prefix eq $prefix } @{ $self->sfRModules };
         return $self->p->sendError( $req, 'Inexistent register module', 400 )
           unless $m;
         return $self->p->sendError( $req, 'Registration not authorized', 403 )
           unless $m->{r}->( $req, $req->userData );
-        my $prefix = $m->{m}->prefix;
         return $self->p->sendHtml(
             $req,
             $m->{m}->template,
             params => {
-                MAIN_LOGO => $self->conf->{portalMainLogo},
-                PREFIX    => $prefix,
+                MAIN_LOGO        => $self->conf->{portalMainLogo},
+                PREFIX           => $prefix,
                 "PREFIX_$prefix" => 1,
-                LANGS     => $self->conf->{showLanguages},
-                MSG       => $self->canUpdateSfa($req) || $m->{m}->welcome,
+                LANGS            => $self->conf->{showLanguages},
+                MSG   => $self->canUpdateSfa($req) || $m->{m}->welcome,
                 ALERT => ( $self->canUpdateSfa($req) ? 'warning' : 'positive' ),
             }
         );
@@ -599,20 +598,20 @@ sub _displayRegister {
 
 # Check rule and display
 sub register {
-    my ( $self, $req, $tpl, @args ) = @_;
+    my ( $self, $req, $prefix, @args ) = @_;
 
     # After verifying rule:
-    #   - call register run method if $tpl
+    #   - call register run method if $prefix
     #   - else give JSON list of available registers for this user
-    if ($tpl) {
+    if ($prefix) {
         my ($m) =
-          grep { $_->{m}->prefix eq $tpl } @{ $self->sfRModules };
+          grep { $_->{m}->prefix eq $prefix } @{ $self->sfRModules };
         unless ($m) {
             return $self->p->sendError( $req,
                 'Inexistent register module', 400 );
         }
         unless ( $m->{r}->( $req, $req->userData ) ) {
-            $self->userLogger->error("$tpl 2F registration refused");
+            $self->userLogger->error("$prefix 2F registration refused");
             return $self->p->sendError( $req, 'Registration refused', 403 );
         }
         return $m->{m}->run( $req, @args );
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Mail2F.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Mail2F.pm
index 89ea5b67e..40ad8b24b 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Mail2F.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Mail2F.pm
@@ -56,11 +56,10 @@ has code_activation => (
     lazy    => 1,
     default => sub {
 
-        $_[0]->{conf}->{ mail2fCodeRegex } || '\d{6}';
+        $_[0]->{conf}->{mail2fCodeRegex} || '\d{6}';
     }
 );
 
-
 sub init {
     my ($self) = @_;
 
@@ -86,13 +85,12 @@ sub run {
     }
 
     # Delegate code generation to SUPER
-    return $self->SUPER::run($req, $token);
+    return $self->SUPER::run( $req, $token );
 }
 
 sub sendCode {
     my ( $self, $req, $sessionInfo, $code ) = @_;
 
-
     my $dest = $sessionInfo->{ $self->sessionKey };
 
     # Build mail content
@@ -141,9 +139,10 @@ sub sendCode {
 }
 
 sub verify_external {
-        my ($self, $req, $session, $usercode) = @_;
-        $self->logger->error("Error in Mail2F: verify_external is not supposed to be invoked");
-        return PE_ERROR;
+    my ( $self, $req, $session, $usercode ) = @_;
+    $self->logger->error(
+        "Error in Mail2F: verify_external is not supposed to be invoked");
+    return PE_ERROR;
 }
 
 1;