contact self-service pw changes, RT#37023

4 files changed, 161 insertions, 48 deletions

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 420ed0688..824ff67cb 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -50,7 +50,9 @@ use FS::cust_contact;
 use FS::cust_location;
 use FS::cust_payby;
 
-use FS::ClientAPI::MyAccount::quotation; # just for code organization
+# for code organization
+use FS::ClientAPI::MyAccount::contact;
+use FS::ClientAPI::MyAccount::quotation;
 
 $DEBUG = 0;
 $me = '[FS::ClientAPI::MyAccount]';
@@ -243,6 +245,8 @@ sub login {
     return { error => 'Incorrect contact password.' }
       unless $contact->authenticate_password($p->{'password'});
 
+    $session->{'contactnum'} = $contact->contactnum;
+
     my @cust_contact = grep $_->selfservice_access, $contact->cust_contact;
     if ( scalar(@cust_contact) == 1 ) {
       $session->{'custnum'} = $cust_contact[0]->custnum;
@@ -3002,53 +3006,6 @@ sub myaccount_passwd {
 
 }
 
-#  sub contact_passwd {
-#    my $p = shift;
-#    my($context, $session, $custnum) = _custoragent_session_custnum($p);
-#    return { 'error' => $session } if $context eq 'error';
-#  
-#    return { 'error' => 'Not logged in as a contact.' }
-#      unless $session->{'contactnum'};
-#  
-#    return { 'error' => "New passwords don't match." }
-#      if $p->{'new_password'} ne $p->{'new_password2'};
-#  
-#    return { 'error' => 'Enter new password' }
-#      unless length($p->{'new_password'});
-#  
-#    #my $search = { 'custnum' => $custnum };
-#    #$search->{'agentnum'} = $session->{'agentnum'} if $context eq 'agent';
-#    $custnum =~ /^(\d+)$/ or die "illegal custnum";
-#    my $search = " AND selfservice_access IS NOT NULL ".
-#                 " AND selfservice_access = 'Y' ".
-#                 " AND ( disabled IS NULL OR disabled = '' )".
-#                 " AND custnum IS NOT NULL AND custnum = $1";
-#    $search .= " AND agentnum = ". $session->{'agentnum'} if $context eq 'agent';
-#  
-#    my $contact = qsearchs( {
-#      'table'     => 'contact',
-#      'addl_from' => 'LEFT JOIN cust_main USING ( custnum ) ',
-#      'hashref'   => { 'contactnum' => $session->{'contactnum'}, },
-#      'extra_sql' => $search, #important
-#    } )
-#      or return { 'error' => "Email not found" }; #?  how did we get logged in?
-#                                                  # deleted since then?
-#  
-#    my $error = '';
-#  
-#    # use these svc_acct length restrictions??
-#    my $conf = new FS::Conf;
-#    $error = 'Password too short.'
-#      if length($p->{'new_password'}) < ($conf->config('passwordmin') || 6);
-#    $error = 'Password too long.'
-#      if length($p->{'new_password'}) > ($conf->config('passwordmax') || 8);
-#  
-#    $error ||= $contact->change_password($p->{'new_password'});
-#  
-#    return { 'error' => $error, };
-#  
-#  }
-
 sub reset_passwd {
   my $p = shift;
 
diff --git a/FS/FS/ClientAPI/MyAccount/contact.pm b/FS/FS/ClientAPI/MyAccount/contact.pm
new file mode 100644
index 000000000..72226e2dc
--- /dev/null
+++ b/FS/FS/ClientAPI/MyAccount/contact.pm
@@ -0,0 +1,148 @@
+package FS::ClientAPI::MyAccount::contact;
+
+use strict;
+use FS::Record qw( qsearchs );
+use FS::cust_main;
+use FS::cust_contact;
+use FS::contact;
+
+sub _custoragent_session_custnum {
+  FS::ClientAPI::MyAccount::_custoragent_session_custnum(@_);
+}
+
+sub contact_passwd {
+  my $p = shift;
+  my($context, $session, $custnum) = _custoragent_session_custnum($p);
+  return { 'error' => $session } if $context eq 'error';
+
+  return { 'error' => 'Not logged in as a contact.' }
+    unless $session->{'contactnum'};
+
+  return { 'error' => 'Enter new password' }
+    unless length($p->{'new_password'});
+
+  my $contact = _contact( $session->{'contactnum'}, $custnum )
+    or return { 'error' => "Email not found" };
+
+  my $error = '';
+
+  # use these svc_acct length restrictions??
+  my $conf = new FS::Conf;
+  $error = 'Password too short.'
+    if length($p->{'new_password'}) < ($conf->config('passwordmin') || 6);
+  $error = 'Password too long.'
+    if length($p->{'new_password'}) > ($conf->config('passwordmax') || 8);
+
+  $error ||= $contact->change_password($p->{'new_password'});
+
+  return { 'error' => $error };
+
+}
+
+sub _contact {
+  my( $contactnum, $custnum ) = @_;
+
+  #my $search = { 'custnum' => $custnum };
+  #$search->{'agentnum'} = $session->{'agentnum'} if $context eq 'agent';
+  $custnum =~ /^(\d+)$/ or die "illegal custnum";
+  my $search = " AND cust_contact.selfservice_access IS NOT NULL ".
+               " AND cust_contact.selfservice_access = 'Y' ".
+               " AND ( disabled IS NULL OR disabled = '' )".
+               " AND cust_contact.custnum IS NOT NULL AND cust_contact.custnum = $1";
+#  $search .= " AND agentnum = ". $session->{'agentnum'} if $context eq 'agent';
+
+  qsearchs( {
+    'table'     => 'contact',
+    #'addl_from' => 'LEFT JOIN cust_main USING ( custnum ) ',
+    'addl_from' => ' LEFT JOIN cust_contact USING ( contactnum ) '.
+                   ' LEFT JOIN cust_main ON ( cust_contact.custnum = cust_main.custnum ) ',
+    'hashref'   => { 'contactnum' => $contactnum, },
+    'extra_sql' => $search, #important
+  } );
+
+}
+
+sub list_contacts {
+  my $p = shift;
+
+  my($context, $session, $custnum) = _custoragent_session_custnum($p);
+  return { 'error' => $session } if $context eq 'error';
+
+  my $cust_main = qsearchs('cust_main', { custnum=>$custnum } );
+
+  my @contacts = ( map {
+    my $contact = $_->contact;
+    my @contact_email = $contact->contact_email;
+    { 'contactnum'         => $contact->contactnum,
+      'class'              => $_->contact_classname,
+      'first'              => $contact->first,
+      'last'               => $contact->get('last'),
+      'title'              => $contact->title,
+      'emailaddress'       => join(',', map $_->emailaddress, @contact_email),
+      #TODO: contact phone numbers
+      'comment'            => $_->comment,
+      'selfservice_access' => $_->selfservice_access,
+      'disabled'           => $contact->disabled,
+    };
+  } $cust_main->cust_contact );
+
+  return { 'error'    => '',
+           'contacts' => \@contacts,
+         };
+}
+
+sub edit_contact {
+  my $p = shift;
+
+  my($context, $session, $custnum) = _custoragent_session_custnum($p);
+  return { 'error' => $session } if $context eq 'error';
+
+  #shortcut: logged in as a contact?  that must be the one you want to edit
+  my $contactnum = $p->{contactnum} || $session->{'contactnum'};
+
+  my $contact = _contact( $contactnum, $custnum )
+    or return { 'error' => "Email not found" };
+
+  return { error => "Can't edit a multi-customer contact unless logged in as that contact" }
+    if $contactnum != $session->{'contactnum'}
+    && scalar( $contact->cust_contact ) > 1;
+
+  #my $cust_contact = qsearchs('cust_contact', { contactnum => $contactnum,
+  #                                              custnum    => $custnum,    } )
+  #  or die "guru meditation #4200";
+
+  #TODO: change more fields besides just these
+
+  foreach (qw( first last title emailaddress )) {
+    $contact->$_( $p->{$_} ) if length( $p->{$_} );
+  }
+
+  my $error = $contact->replace;
+
+  return { 'error' => $error, };
+
+}
+
+sub delete_contact {
+  my $p = shift;
+
+  my($context, $session, $custnum) = _custoragent_session_custnum($p);
+  return { 'error' => $session } if $context eq 'error';
+
+  my $cust_contact = qsearchs('cust_contact', { contactnum => $p->{contactnum},
+                                                custnum    => $custnum,       })
+    or return { 'error' => 'Unknown contactnum' };
+
+  my $contact = $cust_contact->contact;
+
+  my $error = $cust_contact->delete;
+  return { 'error' => $error } if $error;
+
+  unless ( $contact->cust_contact ) {
+    $contact->delete;
+  }
+
+  return { 'error' => '', };
+}
+
+1;
diff --git a/FS/FS/ClientAPI_XMLRPC.pm b/FS/FS/ClientAPI_XMLRPC.pm
index 04aee290b..8f02b0925 100644
--- a/FS/FS/ClientAPI_XMLRPC.pm
+++ b/FS/FS/ClientAPI_XMLRPC.pm
@@ -106,6 +106,12 @@ sub ss2clientapi {
   'switch_cust'               => 'MyAccount/switch_cust',
   'customer_info'             => 'MyAccount/customer_info',
   'customer_info_short'       => 'MyAccount/customer_info_short',
+
+  'contact_passwd'            => 'MyAccount/contact/contact_passwd',
+  'list_contacts'             => 'MyAccount/contact/list_contacts',
+  'edit_contact'              => 'MyAccount/contact/edit_contact',
+  'delete_contact'            => 'MyAccount/contact/delete_contact',
+
   'billing_history'           => 'MyAccount/billing_history',
   'edit_info'                 => 'MyAccount/edit_info',     #add to ss cgi!
   'invoice'                   => 'MyAccount/invoice',
diff --git a/FS/MANIFEST b/FS/MANIFEST
index 899270bf2..5b73b728c 100644
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -39,6 +39,8 @@ FS/ClientAPI/passwd.pm
 FS/ClientAPI/Agent.pm
 FS/ClientAPI/MasonComponent.pm
 FS/ClientAPI/MyAccount.pm
+FS/ClientAPI/MyAccount/contact.pm
+FS/ClientAPI/MyAccount/quotation.pm
 FS/ClientAPI/PrepaidPhone.pm
 FS/ClientAPI/Signup.pm
 FS/Conf.pm