Merge pull request #4695 from nextcloud/reset-verify-state

reset verification state if max tries are reached

1 files changed, 15 insertions, 0 deletions

diff --git a/settings/BackgroundJobs/VerifyUserData.php b/settings/BackgroundJobs/VerifyUserData.php
index 4a32398f6c4..8c02ae1727c 100644
--- a/settings/BackgroundJobs/VerifyUserData.php
+++ b/settings/BackgroundJobs/VerifyUserData.php
@@ -96,6 +96,8 @@ class VerifyUserData extends Job {
 			$jobList->remove($this, $this->argument);
 			if ($this->retainJob) {
 				$this->reAddJob($jobList, $this->argument);
+			} else {
+				$this->resetVerificationState();
 			}
 		}
 
@@ -270,4 +272,17 @@ class VerifyUserData extends Job {
 		return ((time() - $lastRun) > $this->interval);
 	}
 
+
+	/**
+	 * reset verification state after max tries are reached
+	 */
+	protected function resetVerificationState() {
+		$user = $this->userManager->get($this->argument['uid']);
+		if ($user !== null) {
+			$accountData = $this->accountManager->getUser($user);
+			$accountData[$this->argument['type']]['verified'] = AccountManager::NOT_VERIFIED;
+			$this->accountManager->updateUser($user, $accountData);
+		}
+	}
+
 }