Merge pull request #676 from nextcloud/backport/671/stable19

[stable19] Delete duplicates of the same push token hash

lib/Controller/PushController.php

@@ -189,6 +189,9 @@ protected function savePushToken(IUser $user, IToken $token, string $deviceIdent
 		$result->closeCursor();
 
 		if (!$row) {
+			// In case the auth token is new, delete potentially old entries for the same device (push token) by this user
+			$this->deletePushTokenByHash($user, $pushTokenHash);
+
 			return $this->insertPushToken($user, $token, $deviceIdentifier, $devicePublicKey, $pushTokenHash, $proxyServer, $appType);
 		}
 
@@ -261,4 +264,18 @@ protected function deletePushToken(IUser $user, IToken $token): bool {
 
 		return $query->execute() !== 0;
 	}
+
+	/**
+	 * @param IUser $user
+	 * @param string $pushTokenHash
+	 * @return bool If the entry was deleted
+	 */
+	protected function deletePushTokenByHash(IUser $user, string $pushTokenHash): bool {
+		$query = $this->db->getQueryBuilder();
+		$query->delete('notifications_pushtokens')
+			->where($query->expr()->eq('uid', $query->createNamedParameter($user->getUID())))
+			->andWhere($query->expr()->eq('pushtokenhash', $query->createNamedParameter($pushTokenHash)));
+
+		return $query->execute() !== 0;
+	}
 }