Skip to content

Use query builder for wiki user email checks #1282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
addshore wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use query builder for wiki user email checks #1282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions app/Services/WikiUserEmailChecker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public function findEmail(string $email): array {
$userTables = $this->getAllMediaWikiUserTables($pdo);

foreach ($userTables as $dbName => $userTable) {
if ($this->emailExists($pdo, $dbName, $userTable, $email)) {
if ($this->emailExists($dbName, $userTable, $email)) {
$foundIn[] = "{$dbName}.{$userTable}";
}
}
Expand All @@ -42,19 +42,11 @@ private function getAllMediaWikiUserTables(PDO $pdo): array {
return $tablesByDb;
}

private function emailExists(PDO $pdo, string $dbName, string $table, string $email): bool {
$stmt = $pdo->prepare("
SELECT 1
FROM {$dbName}.{$table}

-- converting from tinyblob data type, see https://github.com/wbstack/api/blob/main/database/mw/new/mw1.43-wbs2.sql#L1006
WHERE LOWER(CONVERT(user_email USING utf8mb4)) = LOWER(:email)

LIMIT 1
");

$stmt->execute(['email' => $email]);

return (bool) $stmt->fetch();
private function emailExists(string $dbName, string $table, string $email): bool {
return $this->db->connection('mw')
->table("{$dbName}.{$table}")
// Convert from tinyblob; see https://github.com/wbstack/api/blob/main/database/mw/new/mw1.43-wbs2.sql#L1006.
->whereRaw('LOWER(CONVERT(user_email USING utf8mb4)) = LOWER(?)', [$email])
->exists();
}
}
Loading