Merge pull request #1 from DarkGhostHunter/master

Ready for production.
DarkGhostHunter · Jul 3, 2020 · f32106e · f32106e
2 parents 84f7422 + 0f17d28
commit f32106e
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 10 deletions.
diff --git a/database/migrations/2020_04_02_000000_create_web_authn_credentials_table.php b/database/migrations/2020_04_02_000000_create_web_authn_credentials_table.php
@@ -20,8 +20,6 @@ public function up()
             // Change accordingly for your users table if you need to.
             $table->unsignedBigInteger('user_id');
 
-            $table->boolean('is_enabled')->default(true);
-
             $table->string('name')->nullable();
             $table->string('type', 16);
             $table->json('transports');
@@ -39,7 +37,7 @@ public function up()
             $table->timestamps();
             $table->softDeletes(WebAuthnCredential::DELETED_AT);
 
-            $table->primary(['id', 'is_enabled']);
+            $table->primary(['id', 'user_id']);
         });
     }
 

diff --git a/tests/Auth/EloquentWebAuthnProviderTest.php b/tests/Auth/EloquentWebAuthnProviderTest.php
@@ -49,7 +49,6 @@ public function test_retrieves_user_using_credential_id()
         DB::table('web_authn_credentials')->insert([
             'id'               => 'test_credential_id',
             'user_id'          => 1,
-            'is_enabled'       => true,
             'type'             => 'public_key',
             'transports'       => json_encode([]),
             'attestation_type' => 'none',

diff --git a/tests/Http/WebAuthnLoginTest.php b/tests/Http/WebAuthnLoginTest.php
@@ -100,7 +100,6 @@ public function test_receives_webauthn_options_by_credentials()
         DB::table('web_authn_credentials')->insert([
             'id'               => 'test_credential_id',
             'user_id'          => 1,
-            'is_enabled'       => true,
             'type'             => 'public_key',
             'transports'       => json_encode([]),
             'attestation_type' => 'none',
@@ -146,7 +145,6 @@ public function test_disabled_credential_doesnt_show()
         DB::table('web_authn_credentials')->insert([
             'id'               => 'test_credential_id',
             'user_id'          => 1,
-            'is_enabled'       => false,
             'type'             => 'public_key',
             'transports'       => json_encode([]),
             'attestation_type' => 'none',
@@ -199,7 +197,6 @@ public function test_user_authenticates_with_webauthn()
         DB::table('web_authn_credentials')->insert([
             'id'               => 'test_credential_id',
             'user_id'          => 1,
-            'is_enabled'       => true,
             'type'             => 'public_key',
             'transports'       => json_encode([]),
             'attestation_type' => 'none',

diff --git a/tests/WebAuthn/WebAuthnAssertionTest.php b/tests/WebAuthn/WebAuthnAssertionTest.php
@@ -59,7 +59,6 @@ protected function setUp() : void
             DB::table('web_authn_credentials')->insert([
                 'id'               => 'test_credential_foo',
                 'user_id'          => 1,
-                'is_enabled'       => true,
                 'type'             => 'public_key',
                 'transports'       => json_encode([]),
                 'attestation_type' => 'none',

diff --git a/tests/WebAuthn/WebAuthnAttestationTest.php b/tests/WebAuthn/WebAuthnAttestationTest.php
@@ -61,7 +61,6 @@ protected function setUp() : void
             DB::table('web_authn_credentials')->insert([
                 'id'         => 'test_credential_foo',
                 'user_id'               => 1,
-                'is_enabled'            => true,
                 'type'                  => 'public_key',
                 'transports'            => json_encode([]),
                 'attestation_type'      => 'none',

diff --git a/tests/WebAuthnAuthenticationTest.php b/tests/WebAuthnAuthenticationTest.php
@@ -48,7 +48,6 @@ protected function setUp() : void
             DB::table('web_authn_credentials')->insert([
                 'id'               => 'test_credential_foo',
                 'user_id'          => 1,
-                'is_enabled'       => true,
                 'type'             => 'public_key',
                 'transports'       => json_encode([]),
                 'attestation_type' => 'none',