Skip to content

make sure the token code is not in use #11

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
ylebre wants to merge 4 commits into
base: main
Choose a base branch
from
Open

make sure the token code is not in use #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6e2033
make sure the token code is not in use
ylebre Dec 13, 2025
482361e
typofix
ylebre Dec 13, 2025
b151f3c
fix existing tokens call
ylebre Dec 13, 2025
56f7754
fix cleanup test
ylebre Dec 13, 2025
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
20 changes: 20 additions & 0 deletions lib/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,18 @@
class User {
private static function generateTokenCode() {
$digits = 6;

self::cleanupTokens();
$existingTokens = self::getExistingVerifyTokens();

$code = random_int(0,1000000);
$code = str_pad($code, $digits, '0', STR_PAD_LEFT);

while (in_array($code, $existingTokens)) { // make sure we have no collissions;
$code = random_int(0,1000000);
$code = str_pad($code, $digits, '0', STR_PAD_LEFT);
}

return $code;
}

Expand Down Expand Up @@ -331,4 +341,14 @@ public static function cleanupTokens() {
':now' => $now->getTimestamp()
]);
}

public static function getExistingVerifyTokens() {
Db::connect();
$query = Db::$pdo->prepare(
'SELECT code FROM verify'
);
$query->execute();
$existingTokens = $query->fetchAll();
return $existingTokens;
}
}
7 changes: 1 addition & 6 deletions tests/phpunit/UserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,16 +333,11 @@ public function testCleanup() {
"hello" => "world",
"expires" => time() - 10
]);
$token2 = User::saveVerifyToken("verify", [
"hello" => "world",
"expires" => time() - 10
]);
$query = Db::$pdo->prepare('SELECT count(*) AS count FROM verify');
$query->execute();
$result = $query->fetchAll();
$beforeCleanup = $result[0]['count'];
$this->assertEquals(2, $beforeCleanup);

$this->assertEquals(1, $beforeCleanup);
User::cleanupTokens();
$query = Db::$pdo->prepare('SELECT count(*) AS count FROM verify');
$query->execute();
Expand Down
Loading