Skip to content

Commit 44901bc

Browse files
authored
Merge pull request #129 from kenjis/fix-auth_identities-table
fix: add missing unique key to `auth_identities`
2 parents c155324 + c1f2a61 commit 44901bc

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/Database/Migrations/2020-12-28-223112_create_auth_tables.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public function up(): void
4545
'updated_at' => ['type' => 'datetime', 'null' => true],
4646
]);
4747
$this->forge->addPrimaryKey('id');
48+
$this->forge->addUniqueKey(['type', 'secret']);
4849
$this->forge->addKey('user_id');
4950
$this->forge->addForeignKey('user_id', 'users', 'id', '', 'CASCADE');
5051
$this->forge->createTable('auth_identities', true);
@@ -66,7 +67,7 @@ public function up(): void
6667
$this->forge->createTable('auth_logins', true);
6768

6869
/*
69-
* Auth Tokens (remember-me) Table
70+
* Auth Remember Tokens (remember-me) Table
7071
* @see https://paragonie.com/blog/2015/04/secure-authentication-php-with-long-term-persistence
7172
*/
7273
$this->forge->addField([

tests/Authentication/HasAccessTokensTest.php

+9-2
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,17 @@ public function testAccessTokens()
4646
$this->assertSame([], $this->user->accessTokens());
4747

4848
// Give the user a couple of access tokens
49-
$token1 = fake(UserIdentityModel::class, ['user_id' => $this->user->id, 'type' => 'access_token']);
50-
$token2 = fake(UserIdentityModel::class, ['user_id' => $this->user->id, 'type' => 'access_token']);
49+
$token1 = fake(
50+
UserIdentityModel::class,
51+
['user_id' => $this->user->id, 'type' => 'access_token', 'secret' => 'secretToken1']
52+
);
53+
$token2 = fake(
54+
UserIdentityModel::class,
55+
['user_id' => $this->user->id, 'type' => 'access_token', 'secret' => 'secretToken2']
56+
);
5157

5258
$tokens = $this->user->accessTokens();
59+
5360
$this->assertCount(2, $tokens);
5461
$this->assertSame($token1->id, $tokens[0]->id);
5562
$this->assertSame($token2->id, $tokens[1]->id);

0 commit comments

Comments
 (0)