login TFA exception: also print username and use raise

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/PVE/APIClient/LWP.pm b/PVE/APIClient/LWP.pm
index 492f64d84f5017886b5625f7a7e08abd7de47206..c0e30ff6de756a61a2d2a76bfec72015c3409518 100755 (executable)
--- a/PVE/APIClient/LWP.pm
+++ b/PVE/APIClient/LWP.pm
@@ -102,12 +102,13 @@ sub login {
     $uri->path('/api2/json/access/ticket');
 
     my $ua = $self->{useragent};
     $uri->path('/api2/json/access/ticket');
 
     my $ua = $self->{useragent};

+    my $username = $self->{username} // 'unknown',

 
     delete $self->{last_unknown_fingerprint};
 
     my $exec_login = sub {
        return $ua->post($uri, {
 
     delete $self->{last_unknown_fingerprint};
 
     my $exec_login = sub {
        return $ua->post($uri, {

-           username => $self->{username} || 'unknown',
+           username => $username,

            password => $self->{password} || ''});
     };
 
            password => $self->{password} || ''});
     };
 


@@ -131,7 +132,7 @@ sub login {
 
     # TODO: make it possible to use tfa
     if ($data->{ticket} =~ m/^PVE:tfa!/) {
 
     # TODO: make it possible to use tfa
     if ($data->{ticket} =~ m/^PVE:tfa!/) {

-       die "TFA in API is not yet implemented! Try disabling TFA for the user.\n";
+       raise("Two Factor Auth is not yet implemented! Try disabling TFA for the user '$username'.\n");

     }
 
     $self->update_ticket($data->{ticket});
     }
 
     $self->update_ticket($data->{ticket});