[smarcet] - #13520

* fix on ccla admin/refactoring

Author: smarcet

ICLA/_config.php

@@ -22,5 +22,5 @@
 		new SapphireTeamRepository,
 		SapphireTransactionManager::getInstance());
 
-	$team_manager->verifyInvitations($member_id, new TeamInvitationEmailSender(new SapphireTeamInvitationRepository));
+	$team_manager->verifyInvitations($member_id, new TeamInvitationEmailSender());
 });

ICLA/code/model/CCLATeamManager.php

@@ -118,20 +118,22 @@ public function sendInvitation(array $data, ITeamInvitationSender $invitation_se
 
 	public function verifyInvitations($member_id, ITeamInvitationSender $invitation_sender){
 
-		$member_repository     = $this->member_repository;
-		$invitation_repository = $this->invitation_repository;
+		return $this->tx_manager->transaction(function() use($member_id, $invitation_sender){
 
-		return $this->tx_manager->transaction(function() use($member_id, $invitation_repository, $member_repository, $invitation_sender){
+			$member = $this->member_repository->getById($member_id);
+			if(!$member) throw new NotFoundEntityException('Member',sprintf('id %s', $member_id));
 
-			$member = $member_repository->getById($member_id);
-			if(!$member) throw new NotFoundEntityException('Member',sprintf('id %s',$member_id));
-
-			foreach($invitation_repository->findByInviteEmail($member->Email) as $invitation){
+			foreach($this->invitation_repository->findByInviteEmail($member->Email) as $invitation){
 				$invitation->updateInvite($member);
-				$invitation_sender->sendInvitation($invitation);
+                // generate a token
+                $token = null;
+                do {
+                    $token = $invitation->generateConfirmationToken();
+                } while ($this->invitation_repository->existsConfirmationToken($token));
+                // re send invitation
+                $invitation_sender->sendInvitation($invitation, $token);
 			}
 		});
-
 	}
 
 	/**

ICLA/code/model/ITeamInvitation.php

@@ -49,5 +49,9 @@ public function doConfirmation($token);
 	 */
 	public function getMember();
 
+    /**
+     * @param ICLAMember $invite
+     * @return void
+     */
 	public function updateInvite(ICLAMember $invite);
 }