factorisation

lib/AccountManager/App/Controller.pm

@@ -199,4 +199,26 @@ sub loc {
     return $self->stash('l10n')->maketext(@_);
 }
 
+sub mock_contacts {
+    my $self = shift;
+    my $sp = shift;
+
+    my $config    = $self->app()->config();
+    my $entityid = $sp->entityid();
+
+    my $contacts =
+        $config->{$entityid}->{contacts} ||
+        $config->{service}->{contacts};
+
+    if ($contacts) {
+        if ($contacts =~ /^\+(.+)/) {
+            # complement original contacts
+            $sp->contacts($sp->contacts(), $self->string_to_list($1));
+        } else {
+            # replace original contacts
+            $sp->contacts($self->string_to_list($contacts));
+        }
+    }
+}
+
 1;

lib/AccountManager/App/Step2.pm

@@ -24,18 +24,7 @@ sub run {
     return if !$sp;
 
     # override metadata contacts if needed
-    my $contacts =
-        $config->{$entityid}->{contacts} ||
-        $config->{service}->{contacts};
-    if ($contacts) {
-        if ($contacts =~ /^\+(.+)/) {
-            # complement original contacts
-            $sp->contacts($sp->contacts(), split(/, */, $1));
-        } else {
-            # replace original contacts
-            $sp->contacts(split(/, */, $contacts));
-        }
-    }
+    $self->mock_contacts($sp);
 
     $self->stash(sp => $sp);
     $self->stash(entityid => $entityid);

lib/AccountManager/App/Step3.pm

@@ -36,18 +36,7 @@ sub run {
     return if !$sp;
 
     # override metadata contacts if needed
-    my $contacts =
-        $config->{$entityid}->{contacts} ||
-        $config->{service}->{contacts};
-    if ($contacts) {
-        if ($contacts =~ /^\+(.+)/) {
-            # complement original contacts
-            $sp->contacts($sp->contacts(), split(/, */, $1));
-        } else {
-            # replace original contacts
-            $sp->contacts(split(/, */, $contacts));
-        }
-    }
+    $self->mock_contacts($sp);
 
     ## Check that email is a known contact for this SP
     return $self->abort(