RT# 32233 Mask ssn and stateid in selfservice

2 files changed, 5 insertions, 8 deletions

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index ae0fa614c..a30dde568 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -630,9 +630,7 @@ sub customer_info_short {
     for (@cust_main_editable_fields) {
       $return{$_} = $cust_main->get($_);
     }
-
-    $return{ss} = $cust_main->masked('ss') if $p->{mask_ss};
-    $return{stateid} = $cust_main->masked('stateid') if $p->{mask_stateid};
+    $return{$_} = $cust_main->masked($_) for qw/ss stateid/;
 
     #maybe a little more expensive, but it should be cached by now
     for (@location_editable_fields) {
diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
index 161231555..6cf264c08 100755
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -276,11 +276,8 @@ sub change_bill {
   }
 
   return $payment_info if ( $payment_info->{'error'} );
-  my $customer_info = customer_info(
-      mask_ss      => 1,
-      mask_stateid => 1,
-      session_id   => $session_id,
-  );
+  my $customer_info =
+    customer_info( 'session_id' => $session_id );
   return {
     %$payment_info,
     %$customer_info,
@@ -1328,3 +1325,5 @@ sub include {
                     );
 
 }
+
+