diff --git a/.eslintrc.yml b/.eslintrc.yml index d3156688..8e72ef3e 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -1,6 +1,6 @@ parserOptions: sourceType: 'module' - ecmaVersion: 8 + ecmaVersion: 'latest' extends: 'eslint:recommended' env: browser: true @@ -25,3 +25,14 @@ rules: - allow: - warn - error + no-await-in-loop: + - error + no-promise-executor-return: + - error + require-atomic-updates: + - error + max-nested-callbacks: + - error + - 3 + prefer-promise-reject-errors: + - error diff --git a/app/Http/Controllers/Admin/PasskeysController.php b/app/Http/Controllers/Admin/PasskeysController.php new file mode 100644 index 00000000..61388175 --- /dev/null +++ b/app/Http/Controllers/Admin/PasskeysController.php @@ -0,0 +1,93 @@ +user(); + $passkeys = $user->passkey; + + return view('admin.passkeys.index', compact('passkeys')); + } + + public function save(Request $request): JsonResponse + { + $validator = Validator::make($request->all(), [ + 'id' => 'required|string|unique:App\Models\Passkey,passkey_id', + 'public_key' => 'required|file', + 'transports' => 'required|json', + 'challenge' => 'required|string', + ]); + + if ($validator->fails()) { + return response()->json([ + 'success' => false, + 'message' => 'Passkey could not be saved (validation failed)', + ]); + } + + $validated = $validator->validated(); + + if ( + !session()->has('challenge') || + $validated['challenge'] !== session('challenge') + ) { + return response()->json([ + 'success' => false, + 'message' => 'Passkey could not be saved (challenge failed)', + ]); + } + + $passkey = new Passkey(); + $passkey->passkey_id = $validated['id']; + $passkey->passkey = $validated['public_key']->get(); + $passkey->transports = json_decode($validated['transports'], true, 512, JSON_THROW_ON_ERROR); + $passkey->user_id = auth()->user()->id; + $passkey->save(); + + return response()->json([ + 'success' => true, + 'message' => 'Passkey saved successfully', + ]); + } + + public function init(): JsonResponse + { + /** @var User $user */ + $user = auth()->user(); + $passkeys = $user->passkey()->get(); + + $existing = $passkeys->map(function (Passkey $passkey) { + return [ + 'id' => $passkey->passkey_id, + 'transports' => $passkey->transports, + 'type' => 'public-key', + ]; + })->all(); + + $challenge = Hash::make(random_bytes(32)); + session(['challenge' => $challenge]); + + return response()->json([ + 'challenge' => $challenge, + 'userId' => $user->name, + 'existing' => $existing, + ]); + } +} diff --git a/app/Models/Passkey.php b/app/Models/Passkey.php new file mode 100644 index 00000000..64461eca --- /dev/null +++ b/app/Models/Passkey.php @@ -0,0 +1,42 @@ + stream_get_contents($value), + set: static fn ($value) => pg_escape_bytea($value), + ); + } + + /** + * Save and access the transports appropriately. + */ + protected function transports(): Attribute + { + return Attribute::make( + get: static fn ($value) => json_decode($value, true, 512, JSON_THROW_ON_ERROR), + set: static fn ($value) => json_encode($value, JSON_THROW_ON_ERROR), + ); + } + + public function user(): BelongsTo + { + return $this->belongsTo(User::class); + } +} diff --git a/app/Models/User.php b/app/Models/User.php index bc57ee54..7bd0472f 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; +use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; @@ -24,4 +25,9 @@ class User extends Authenticatable 'password', 'remember_token', ]; + + public function passkey(): HasMany + { + return $this->hasMany(Passkey::class); + } } diff --git a/composer.json b/composer.json index f644792f..c41e6eff 100644 --- a/composer.json +++ b/composer.json @@ -9,6 +9,7 @@ "ext-dom": "*", "ext-intl": "*", "ext-json": "*", + "ext-pgsql": "*", "cviebrock/eloquent-sluggable": "^10.0", "guzzlehttp/guzzle": "^7.2", "indieauth/client": "^1.1", diff --git a/database/factories/PasskeyFactory.php b/database/factories/PasskeyFactory.php new file mode 100644 index 00000000..8e70e21d --- /dev/null +++ b/database/factories/PasskeyFactory.php @@ -0,0 +1,34 @@ + + */ +class PasskeyFactory extends Factory +{ + /** + * The name of the factory's corresponding model. + * + * @var string + */ + protected $model = Passkey::class; + + /** + * Define the model's default state. + * + * @return array + */ + public function definition(): array + { + return [ + 'user_id' => $this->faker->numberBetween(1, 1000), + 'passkey_id' => $this->faker->uuid, + 'passkey' => $this->faker->sha256, + 'transports' => ['internal'], + ]; + } +} diff --git a/database/migrations/2023_08_27_113904_create_passkeys.php b/database/migrations/2023_08_27_113904_create_passkeys.php new file mode 100644 index 00000000..a2450d65 --- /dev/null +++ b/database/migrations/2023_08_27_113904_create_passkeys.php @@ -0,0 +1,33 @@ +id(); + $table->unsignedBigInteger('user_id'); + $table->string('passkey_id')->unique(); + $table->binary('passkey'); + $table->json('transports'); + $table->timestamps(); + + $table->foreign('user_id')->references('id')->on('users'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('passkeys'); + } +}; diff --git a/postcss.config.js b/postcss.config.js index b3f36747..f0ba5a6f 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,16 +1,16 @@ module.exports = { - plugins: { - 'postcss-import': {}, - 'autoprefixer': {}, - '@csstools/postcss-oklab-function': { - preserve: true - }, - 'postcss-nesting': {}, - 'postcss-combine-media-query': {}, - 'postcss-combine-duplicated-selectors': { - removeDuplicatedProperties: true, - removeDuplicatedValues: true - }, - 'cssnano': { preset: 'default' }, - } + plugins: { + 'postcss-import': {}, + 'autoprefixer': {}, + '@csstools/postcss-oklab-function': { + preserve: true + }, + 'postcss-nesting': {}, + 'postcss-combine-media-query': {}, + 'postcss-combine-duplicated-selectors': { + removeDuplicatedProperties: true, + removeDuplicatedValues: true + }, + 'cssnano': { preset: 'default' }, + } }; diff --git a/public/assets/app.js b/public/assets/app.js index e8471e65..f30dcde8 100644 --- a/public/assets/app.js +++ b/public/assets/app.js @@ -16,7 +16,17 @@ \*****************************/ /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) { -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _css_app_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../css/app.css */ \"./resources/css/app.css\");\n\n\n// import { Auth } from './auth.js';\n//\n// let auth = new Auth();\n\n// auth.createCredentials().then((credentials) => {\n// // eslint-disable-next-line no-console\n// console.log(credentials);\n// });//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiLi9yZXNvdXJjZXMvanMvYXBwLmpzIiwibWFwcGluZ3MiOiI7O0FBQXdCOztBQUV4QjtBQUNBO0FBQ0E7O0FBRUE7QUFDQTtBQUNBO0FBQ0EiLCJzb3VyY2VzIjpbIndlYnBhY2s6Ly9qYnVrLWZyb250ZW5kLy4vcmVzb3VyY2VzL2pzL2FwcC5qcz82ZDQwIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAnLi4vY3NzL2FwcC5jc3MnO1xuXG4vLyBpbXBvcnQgeyBBdXRoIH0gZnJvbSAnLi9hdXRoLmpzJztcbi8vXG4vLyBsZXQgYXV0aCA9IG5ldyBBdXRoKCk7XG5cbi8vIGF1dGguY3JlYXRlQ3JlZGVudGlhbHMoKS50aGVuKChjcmVkZW50aWFscykgPT4ge1xuLy8gICAvLyBlc2xpbnQtZGlzYWJsZS1uZXh0LWxpbmUgbm8tY29uc29sZVxuLy8gICBjb25zb2xlLmxvZyhjcmVkZW50aWFscyk7XG4vLyB9KTtcbiJdLCJuYW1lcyI6W10sInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///./resources/js/app.js\n"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _css_app_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../css/app.css */ \"./resources/css/app.css\");\n/* harmony import */ var _auth_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./auth.js */ \"./resources/js/auth.js\");\n\n\nlet auth = new _auth_js__WEBPACK_IMPORTED_MODULE_1__.Auth();\ndocument.querySelectorAll('.add-passkey').forEach(el => {\n el.addEventListener('click', () => {\n auth.register();\n });\n});//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiLi9yZXNvdXJjZXMvanMvYXBwLmpzIiwibWFwcGluZ3MiOiI7OztBQUF3QjtBQUVTO0FBRWpDLElBQUlDLElBQUksR0FBRyxJQUFJRCwwQ0FBSSxDQUFDLENBQUM7QUFFckJFLFFBQVEsQ0FBQ0MsZ0JBQWdCLENBQUMsY0FBYyxDQUFDLENBQUNDLE9BQU8sQ0FBRUMsRUFBRSxJQUFLO0VBQ3hEQSxFQUFFLENBQUNDLGdCQUFnQixDQUFDLE9BQU8sRUFBRSxNQUFNO0lBQ2pDTCxJQUFJLENBQUNNLFFBQVEsQ0FBQyxDQUFDO0VBQ2pCLENBQUMsQ0FBQztBQUNKLENBQUMsQ0FBQyIsInNvdXJjZXMiOlsid2VicGFjazovL2pidWstZnJvbnRlbmQvLi9yZXNvdXJjZXMvanMvYXBwLmpzPzZkNDAiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICcuLi9jc3MvYXBwLmNzcyc7XG5cbmltcG9ydCB7IEF1dGggfSBmcm9tICcuL2F1dGguanMnO1xuXG5sZXQgYXV0aCA9IG5ldyBBdXRoKCk7XG5cbmRvY3VtZW50LnF1ZXJ5U2VsZWN0b3JBbGwoJy5hZGQtcGFzc2tleScpLmZvckVhY2goKGVsKSA9PiB7XG4gIGVsLmFkZEV2ZW50TGlzdGVuZXIoJ2NsaWNrJywgKCkgPT4ge1xuICAgIGF1dGgucmVnaXN0ZXIoKTtcbiAgfSk7XG59KTtcbiJdLCJuYW1lcyI6WyJBdXRoIiwiYXV0aCIsImRvY3VtZW50IiwicXVlcnlTZWxlY3RvckFsbCIsImZvckVhY2giLCJlbCIsImFkZEV2ZW50TGlzdGVuZXIiLCJyZWdpc3RlciJdLCJzb3VyY2VSb290IjoiIn0=\n//# sourceURL=webpack-internal:///./resources/js/app.js\n"); + +/***/ }), + +/***/ "./resources/js/auth.js": +/*!******************************!*\ + !*** ./resources/js/auth.js ***! + \******************************/ +/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) { + +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export */ __webpack_require__.d(__webpack_exports__, {\n/* harmony export */ Auth: function() { return /* binding */ Auth; }\n/* harmony export */ });\nclass Auth {\n constructor() {}\n async register() {\n const {\n challenge,\n userId,\n existing\n } = await this.getRegisterData();\n const publicKeyCredentialCreationOptions = {\n challenge: new TextEncoder().encode(challenge),\n rp: {\n name: 'JB'\n },\n user: {\n id: new TextEncoder().encode(userId),\n name: 'jonny@jonnybarnes.uk',\n displayName: 'Jonny'\n },\n pubKeyCredParams: [{\n alg: -8,\n type: 'public-key'\n },\n // Ed25519\n {\n alg: -7,\n type: 'public-key'\n },\n // ES256\n {\n alg: -257,\n type: 'public-key'\n } // RS256\n ],\n\n excludeCredentials: existing,\n authenticatorSelection: {\n userVerification: 'preferred',\n residentKey: 'required'\n },\n timeout: 60000\n };\n const publicKeyCredential = await navigator.credentials.create({\n publicKey: publicKeyCredentialCreationOptions\n });\n if (!publicKeyCredential) {\n throw new Error('Error generating a passkey');\n }\n const {\n id // the key id a.k.a. kid\n } = publicKeyCredential;\n const publicKey = publicKeyCredential.response.getPublicKey();\n const transports = publicKeyCredential.response.getTransports();\n const response = publicKeyCredential.response;\n const clientJSONArrayBuffer = response.clientDataJSON;\n const clientJSON = JSON.parse(new TextDecoder().decode(clientJSONArrayBuffer));\n const clientChallenge = clientJSON.challenge;\n // base64 decode the challenge\n const clientChallengeDecoded = atob(clientChallenge);\n const saved = await this.savePasskey(id, publicKey, transports, clientChallengeDecoded);\n if (saved) {\n window.location.reload();\n } else {\n alert('There was an error saving the passkey');\n }\n }\n async getRegisterData() {\n const response = await fetch('/admin/passkeys/init');\n return await response.json();\n }\n async savePasskey(id, publicKey, transports, challenge) {\n const formData = new FormData();\n formData.append('id', id);\n formData.append('transports', JSON.stringify(transports));\n formData.append('challenge', challenge);\n\n // Convert the ArrayBuffer to a Uint8Array\n const publicKeyArray = new Uint8Array(publicKey);\n\n // Create a Blob from the Uint8Array\n const publicKeyBlob = new Blob([publicKeyArray], {\n type: 'application/octet-stream'\n });\n formData.append('public_key', publicKeyBlob);\n const response = await fetch('/admin/passkeys/save', {\n method: 'POST',\n body: formData,\n headers: {\n 'X-CSRF-TOKEN': document.querySelector('meta[name=\"csrf-token\"]').getAttribute('content')\n }\n });\n return response.ok;\n }\n}\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"./resources/js/auth.js","mappings":"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","sources":["webpack://jbuk-frontend/./resources/js/auth.js?8f4f"],"sourcesContent":["class Auth {\n  constructor() {}\n\n  async register() {\n    const { challenge, userId, existing } = await this.getRegisterData();\n\n    const publicKeyCredentialCreationOptions = {\n      challenge: new TextEncoder().encode(challenge),\n      rp: {\n        name: 'JB',\n      },\n      user: {\n        id: new TextEncoder().encode(userId),\n        name: 'jonny@jonnybarnes.uk',\n        displayName: 'Jonny',\n      },\n      pubKeyCredParams: [\n        {alg: -8, type: 'public-key'}, // Ed25519\n        {alg: -7, type: 'public-key'}, // ES256\n        {alg: -257, type: 'public-key'}, // RS256\n      ],\n      excludeCredentials: existing,\n      authenticatorSelection: {\n        userVerification: 'preferred',\n        residentKey: 'required',\n      },\n      timeout: 60000,\n    };\n\n    const publicKeyCredential = await navigator.credentials.create({\n      publicKey: publicKeyCredentialCreationOptions\n    });\n    if (!publicKeyCredential) {\n      throw new Error('Error generating a passkey');\n    }\n    const {\n      id // the key id a.k.a. kid\n    } = publicKeyCredential;\n    const publicKey = publicKeyCredential.response.getPublicKey();\n    const transports = publicKeyCredential.response.getTransports();\n    const response = publicKeyCredential.response;\n    const clientJSONArrayBuffer = response.clientDataJSON;\n    const clientJSON = JSON.parse(new TextDecoder().decode(clientJSONArrayBuffer));\n    const clientChallenge = clientJSON.challenge;\n    // base64 decode the challenge\n    const clientChallengeDecoded = atob(clientChallenge);\n\n    const saved = await this.savePasskey(id, publicKey, transports, clientChallengeDecoded);\n\n    if (saved) {\n      window.location.reload();\n    } else {\n      alert('There was an error saving the passkey');\n    }\n  }\n\n  async getRegisterData() {\n    const response = await fetch('/admin/passkeys/init');\n\n    return await response.json();\n  }\n\n  async savePasskey(id, publicKey, transports, challenge) {\n    const formData = new FormData();\n    formData.append('id', id);\n    formData.append('transports', JSON.stringify(transports));\n    formData.append('challenge', challenge);\n\n    // Convert the ArrayBuffer to a Uint8Array\n    const publicKeyArray = new Uint8Array(publicKey);\n\n    // Create a Blob from the Uint8Array\n    const publicKeyBlob = new Blob([publicKeyArray], { type: 'application/octet-stream' });\n\n    formData.append('public_key', publicKeyBlob);\n\n    const response = await fetch('/admin/passkeys/save', {\n      method: 'POST',\n      body: formData,\n      headers: {\n        'X-CSRF-TOKEN': document.querySelector('meta[name=\"csrf-token\"]').getAttribute('content'),\n      },\n    });\n\n    return response.ok;\n  }\n}\n\nexport { Auth };\n"],"names":["Auth","constructor","register","challenge","userId","existing","getRegisterData","publicKeyCredentialCreationOptions","TextEncoder","encode","rp","name","user","id","displayName","pubKeyCredParams","alg","type","excludeCredentials","authenticatorSelection","userVerification","residentKey","timeout","publicKeyCredential","navigator","credentials","create","publicKey","Error","response","getPublicKey","transports","getTransports","clientJSONArrayBuffer","clientDataJSON","clientJSON","JSON","parse","TextDecoder","decode","clientChallenge","clientChallengeDecoded","atob","saved","savePasskey","window","location","reload","alert","fetch","json","formData","FormData","append","stringify","publicKeyArray","Uint8Array","publicKeyBlob","Blob","method","body","headers","document","querySelector","getAttribute","ok"],"sourceRoot":""}\n//# sourceURL=webpack-internal:///./resources/js/auth.js\n"); /***/ }), diff --git a/public/assets/app.js.br b/public/assets/app.js.br index dc6eb881..ed35c5c4 100644 Binary files a/public/assets/app.js.br and b/public/assets/app.js.br differ diff --git a/resources/js/app.js b/resources/js/app.js index 69946e98..06c635a9 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -1,10 +1,11 @@ import '../css/app.css'; -// import { Auth } from './auth.js'; -// -// let auth = new Auth(); +import { Auth } from './auth.js'; -// auth.createCredentials().then((credentials) => { -// // eslint-disable-next-line no-console -// console.log(credentials); -// }); +let auth = new Auth(); + +document.querySelectorAll('.add-passkey').forEach((el) => { + el.addEventListener('click', () => { + auth.register(); + }); +}); diff --git a/resources/js/auth.js b/resources/js/auth.js index d181f62d..905db945 100644 --- a/resources/js/auth.js +++ b/resources/js/auth.js @@ -1,35 +1,88 @@ class Auth { constructor() {} - async createCredentials() { + async register() { + const { challenge, userId, existing } = await this.getRegisterData(); + const publicKeyCredentialCreationOptions = { - challenge: Uint8Array.from( - 'randomStringFromServer', - c => c.charCodeAt(0) - ), + challenge: new TextEncoder().encode(challenge), rp: { - id: 'jonnybarnes.localhost', name: 'JB', }, user: { - id: Uint8Array.from( - 'UZSL85T9AFC', - c => c.charCodeAt(0) - ), + id: new TextEncoder().encode(userId), name: 'jonny@jonnybarnes.uk', displayName: 'Jonny', }, - pubKeyCredParams: [{alg: -7, type: 'public-key'}], - // authenticatorSelection: { - // authenticatorAttachment: 'cross-platform', - // }, + pubKeyCredParams: [ + {alg: -8, type: 'public-key'}, // Ed25519 + {alg: -7, type: 'public-key'}, // ES256 + {alg: -257, type: 'public-key'}, // RS256 + ], + excludeCredentials: existing, + authenticatorSelection: { + userVerification: 'preferred', + residentKey: 'required', + }, timeout: 60000, - attestation: 'direct' }; - return await navigator.credentials.create({ + const publicKeyCredential = await navigator.credentials.create({ publicKey: publicKeyCredentialCreationOptions }); + if (!publicKeyCredential) { + throw new Error('Error generating a passkey'); + } + const { + id // the key id a.k.a. kid + } = publicKeyCredential; + const publicKey = publicKeyCredential.response.getPublicKey(); + const transports = publicKeyCredential.response.getTransports(); + const response = publicKeyCredential.response; + const clientJSONArrayBuffer = response.clientDataJSON; + const clientJSON = JSON.parse(new TextDecoder().decode(clientJSONArrayBuffer)); + const clientChallenge = clientJSON.challenge; + // base64 decode the challenge + const clientChallengeDecoded = atob(clientChallenge); + + const saved = await this.savePasskey(id, publicKey, transports, clientChallengeDecoded); + + if (saved) { + window.location.reload(); + } else { + alert('There was an error saving the passkey'); + } + } + + async getRegisterData() { + const response = await fetch('/admin/passkeys/init'); + + return await response.json(); + } + + async savePasskey(id, publicKey, transports, challenge) { + const formData = new FormData(); + formData.append('id', id); + formData.append('transports', JSON.stringify(transports)); + formData.append('challenge', challenge); + + // Convert the ArrayBuffer to a Uint8Array + const publicKeyArray = new Uint8Array(publicKey); + + // Create a Blob from the Uint8Array + const publicKeyBlob = new Blob([publicKeyArray], { type: 'application/octet-stream' }); + + formData.append('public_key', publicKeyBlob); + + const response = await fetch('/admin/passkeys/save', { + method: 'POST', + body: formData, + headers: { + 'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]').getAttribute('content'), + }, + }); + + return response.ok; } } diff --git a/resources/views/admin/passkeys/index.blade.php b/resources/views/admin/passkeys/index.blade.php new file mode 100644 index 00000000..09602162 --- /dev/null +++ b/resources/views/admin/passkeys/index.blade.php @@ -0,0 +1,18 @@ +@extends('master') + +@section('title')Passkeys « Admin CP « @stop + +@section('content') +

Passkeys

+ @if(count($passkeys) > 0) +

You have the following passkeys saved:

+ + @else +

You have no passkey saved.

+ @endif + +@stop diff --git a/resources/views/admin/welcome.blade.php b/resources/views/admin/welcome.blade.php index 3cce67d7..269ccdc5 100644 --- a/resources/views/admin/welcome.blade.php +++ b/resources/views/admin/welcome.blade.php @@ -54,6 +54,6 @@

Passkeys

- List passkeys here? + Manager your passkeys.

@stop diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php index 944627c9..24eb5665 100644 --- a/resources/views/master.blade.php +++ b/resources/views/master.blade.php @@ -2,6 +2,7 @@ + @yield('title'){{ config('app.name') }} @if (!empty(config('app.font_link'))) diff --git a/routes/web.php b/routes/web.php index e5ace4e1..18a17619 100644 --- a/routes/web.php +++ b/routes/web.php @@ -7,6 +7,7 @@ use App\Http\Controllers\Admin\ContactsController as AdminContactsController; use App\Http\Controllers\Admin\HomeController; use App\Http\Controllers\Admin\LikesController as AdminLikesController; use App\Http\Controllers\Admin\NotesController as AdminNotesController; +use App\Http\Controllers\Admin\PasskeysController; use App\Http\Controllers\Admin\PlacesController as AdminPlacesController; use App\Http\Controllers\Admin\SyndicationTargetsController; use App\Http\Controllers\ArticlesController; @@ -141,6 +142,13 @@ Route::group(['domain' => config('url.longurl')], function () { Route::get('/', [BioController::class, 'show'])->name('admin.bio.show'); Route::put('/', [BioController::class, 'update']); }); + + // Passkeys + Route::group(['prefix' => 'passkeys'], static function () { + Route::get('/', [PasskeysController::class, 'index']); + Route::post('save', [PasskeysController::class, 'save']); + Route::get('/init', [PasskeysController::class, 'init']); + }); }); // Blog pages using ArticlesController