wip passkeys

Author: aguingand

demo/app/Providers/DemoSharpServiceProvider.php

@@ -28,7 +28,7 @@ protected function configureSharp(SharpConfigBuilder $config): void
             ->setAuthCustomGuard('web')
             ->enable2faCustom(Demo2faNotificationHandler::class)
             ->enableLoginRateLimiting(maxAttempts: 3)
-            ->enablePasskeys()
+            ->when(config('demo.enable_passkeys'))->enablePasskeys()
             ->setLoginAttributes('email', 'password')
             ->setUserDisplayAttribute('name')
             ->setUserAvatarAttribute(fn () => auth()->user()->avatar?->thumbnail(200))

demo/app/Sharp/Profile/ProfileSingleShow.php

@@ -5,7 +5,7 @@
 use App\Sharp\Profile\Commands\Activate2faCommand;
 use App\Sharp\Profile\Commands\ChangePasswordCommand;
 use App\Sharp\Profile\Commands\Deactivate2faCommand;
-use Code16\Sharp\Auth\Passkeys\PasskeyEntity;
+use Code16\Sharp\Auth\Passkeys\Entity\PasskeyEntity;
 use Code16\Sharp\Show\Fields\SharpShowEntityListField;
 use Code16\Sharp\Show\Fields\SharpShowPictureField;
 use Code16\Sharp\Show\Fields\SharpShowTextField;
@@ -28,9 +28,9 @@ protected function buildShowFields(FieldsContainer $showFields): void
             ->addField(
                 SharpShowPictureField::make('avatar'),
             )
-            ->addField(
+            ->when(config('demo.enable_passkeys'), fn () => $showFields->addField(
                 SharpShowEntityListField::make(PasskeyEntity::class)
-            );
+            ));
     }
 
     protected function buildShowLayout(ShowLayout $showLayout): void
@@ -41,7 +41,7 @@ protected function buildShowLayout(ShowLayout $showLayout): void
                     ->addColumn(6, fn (ShowLayoutColumn $column) => $column->withField('email'))
                     ->addColumn(6, fn (ShowLayoutColumn $column) => $column->withField('avatar'));
             })
-            ->addEntityListSection(PasskeyEntity::class);
+            ->when(config('demo.enable_passkeys'))->addEntityListSection(PasskeyEntity::class);
     }
 
     public function buildShowConfig(): void

demo/config/demo.php

@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'enable_passkeys' => env('DEMO_ENABLE_PASSKEYS', false),
+];

resources/js/entity-list/components/EntityList.vue

@@ -777,7 +777,7 @@
                                                                                     <div class="size-2.5 bg-primary rounded-full"></div>
                                                                                 </template>
                                                                                 <template v-else>
-                                                                                    <Badge class="px-1.5 justify-center min-w-5.5">
+                                                                                    <Badge class="px-1.5 justify-center min-w-5.5 whitespace-nowrap">
                                                                                         {{ item[field.key] }}
                                                                                     </Badge>
                                                                                 </template>

src/Auth/Passkeys/PasskeyEntity.php …c/Auth/Passkeys/Entity/PasskeyEntity.phpsrc/Auth/Passkeys/PasskeyEntity.php renamed to src/Auth/Passkeys/Entity/PasskeyEntity.php src/Auth/Passkeys/PasskeyEntity.php renamed to src/Auth/Passkeys/Entity/PasskeyEntity.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Code16\Sharp\Auth\Passkeys;
+namespace Code16\Sharp\Auth\Passkeys\Entity;
 
 use Code16\Sharp\Utils\Entities\SharpEntity;
 

src/Auth/Passkeys/PasskeyList.php src/Auth/Passkeys/Entity/PasskeyList.phpsrc/Auth/Passkeys/PasskeyList.php renamed to src/Auth/Passkeys/Entity/PasskeyList.php

@@ -1,15 +1,16 @@
 <?php
 
-namespace Code16\Sharp\Auth\Passkeys;
+namespace Code16\Sharp\Auth\Passkeys\Entity;
 
 use Code16\Sharp\Auth\Passkeys\Commands\UpdatePasskeyNameCommand;
 use Code16\Sharp\EntityList\Commands\EntityCommand;
+use Code16\Sharp\EntityList\Fields\EntityListBadgeField;
 use Code16\Sharp\EntityList\Fields\EntityListField;
 use Code16\Sharp\EntityList\Fields\EntityListFieldsContainer;
-use Code16\Sharp\EntityList\Filters\HiddenFilter;
 use Code16\Sharp\EntityList\SharpEntityList;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Database\Eloquent\Model;
 use Spatie\LaravelPasskeys\Models\Concerns\HasPasskeys;
 
 class PasskeyList extends SharpEntityList
@@ -21,6 +22,10 @@ public function buildList(EntityListFieldsContainer $fields): void
                 EntityListField::make('name')
                     ->setLabel('Name')
             )
+            ->addField(
+                EntityListBadgeField::make('usage')
+                    ->setLabel('Usage')
+            )
             ->addField(
                 EntityListField::make('created_at')
                     ->setLabel('Creation date')
@@ -63,32 +68,26 @@ public function getInstanceCommands(): ?array
         ];
     }
 
-    protected function getFilters(): ?array
-    {
-        return [
-            HiddenFilter::make('user_id'),
-        ];
-    }
-
     public function delete(mixed $id): void
     {
         $this->currentUser()->passKeys()->findOrFail($id)->delete();
     }
 
     public function getListData(): array|Arrayable
     {
-        return $this->transform(
-            $this->currentUser()->passkeys
-        );
+        return $this
+            ->setCustomTransformer('usage', function ($value, Model $passkey) {
+                return $passkey->getKey() == request()->cookie('sharp_last_used_passkey')
+                    ? 'Used in this browser'
+                    : null;
+            })
+            ->transform(
+                $this->currentUser()->passkeys
+            );
     }
 
     protected function currentUser(): Authenticatable&HasPasskeys
     {
-        // disabling for now (security concerns)
-        // if($this->queryParams->filterFor('user_id')) {
-        //     return Config::getAuthenticatableModel()::findOrFail($this->queryParams->filterFor('user_id'));
-        // }
-
         /** @var Authenticatable&HasPasskeys $user */
         $user = auth()->user();
 

src/Auth/Passkeys/PasskeyEventSubscriber.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Code16\Sharp\Auth\Passkeys;
+
+use Illuminate\Events\Dispatcher;
+use Illuminate\Support\Facades\Cookie;
+use Spatie\LaravelPasskeys\Events\PasskeyUsedToAuthenticateEvent;
+
+class PasskeyEventSubscriber
+{
+    public function subscribe(Dispatcher $events): void
+    {
+        $events->listen(PasskeyUsedToAuthenticateEvent::class, function (PasskeyUsedToAuthenticateEvent $event) {
+            Cookie::queue('sharp_last_used_passkey', $event->passkey->id, 576000);
+        });
+    }
+}

src/Config/SharpConfigBuilder.php

@@ -5,7 +5,7 @@
 use Closure;
 use Code16\Sharp\Auth\Impersonate\SharpDefaultEloquentImpersonationHandler;
 use Code16\Sharp\Auth\Impersonate\SharpImpersonationHandler;
-use Code16\Sharp\Auth\Passkeys\PasskeyEntity;
+use Code16\Sharp\Auth\Passkeys\Entity\PasskeyEntity;
 use Code16\Sharp\Auth\TwoFactor\Sharp2faHandler;
 use Code16\Sharp\Exceptions\SharpInvalidConfigException;
 use Code16\Sharp\Exceptions\SharpInvalidEntityKeyException;

src/SharpInternalServiceProvider.php

@@ -3,6 +3,7 @@
 namespace Code16\Sharp;
 
 use Code16\Sharp\Auth\Impersonate\SharpImpersonationHandler;
+use Code16\Sharp\Auth\Passkeys\PasskeyEventSubscriber;
 use Code16\Sharp\Auth\SharpAuthorizationManager;
 use Code16\Sharp\Auth\TwoFactor\Engines\GoogleTotpEngine;
 use Code16\Sharp\Auth\TwoFactor\Engines\Sharp2faTotpEngine;
@@ -96,6 +97,8 @@ public function boot()
         }
 
         $this->configureOctane();
+
+        Event::subscribe(PasskeyEventSubscriber::class);
     }
 
     public function register()