Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 8
feat/various style improvements and backwards compatible didit migration#883
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.
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
Merged
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
67ec348
fix: button layout
coodos a28adb8
chore: bump version
coodos 658d402
style: consistent heights
coodos a77fc16
fix: styling
coodos 13bd367
feat: make didit migration backwards compatible
coodos 3f6e8c4
feat: lockfile maintenance
coodos 297a473
chore: remove trash
coodos d115015
chore: format
coodos b833ec2
fix: build
coodos File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "eid-wallet", | ||
| "version": "0.5.0", | ||
| "version": "0.6.0", | ||
| "description": "", | ||
| "type": "module", | ||
| "scripts": { | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 94 additions & 9 deletions
103 infrastructure/eid-wallet/src/lib/global/controllers/key.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -16,6 +16,12 @@ type PersistedContext = { | ||
| lastUsed: string; | ||
| }; | ||
| type HardwareFallbackEvent = { | ||
| keyId: string; | ||
| context: KeyServiceContext; | ||
| originalError: unknown; | ||
| }; | ||
| const CONTEXTS_KEY = "keyService.contexts"; | ||
| const READY_KEY = "keyService.ready"; | ||
| @@ -24,6 +30,9 @@ export class KeyService { | ||
| #managerCache = new Map<string, KeyManager>(); | ||
| #contexts = new Map<string, PersistedContext>(); | ||
| #ready = false; | ||
| #onHardwareFallback: | ||
| | ((event: HardwareFallbackEvent) => Promise<void> | void) | ||
| | null = null; | ||
| constructor(store: Store) { | ||
| this.#store = store; | ||
| @@ -176,16 +185,70 @@ export class KeyService { | ||
| ); | ||
| } | ||
| console.log("=".repeat(70)); | ||
| const signature = await manager.signPayload(keyId, payload); | ||
| console.log( | ||
| `✅ [KeyService] Signature created: ${signature.substring(0, 50)}...`, | ||
| ); | ||
| console.log(`Signature length: ${signature.length} chars`); | ||
| console.log("=".repeat(70)); | ||
| const cacheKey = this.#getCacheKey(keyId, context); | ||
| try { | ||
| console.log("=".repeat(70)); | ||
| const signature = await manager.signPayload(keyId, payload); | ||
| console.log( | ||
| `✅ [KeyService] Signature created: ${signature.substring(0, 50)}...`, | ||
| ); | ||
| console.log(`Signature length: ${signature.length} chars`); | ||
| console.log("=".repeat(70)); | ||
| await this.#touchContext(this.#getCacheKey(keyId, context), manager); | ||
| return signature; | ||
| await this.#touchContext(cacheKey, manager); | ||
| return signature; | ||
| } catch (signError) { | ||
| if (managerType !== "hardware") { | ||
| throw signError; | ||
| } | ||
| console.warn( | ||
| "[KeyService] Hardware signing failed; falling back to software key", | ||
| { | ||
| keyId, | ||
| context, | ||
| error: | ||
| signError instanceof Error | ||
| ? signError.message | ||
| : String(signError), | ||
| }, | ||
| ); | ||
| const softwareManager = await KeyManagerFactory.getKeyManager({ | ||
| keyId, | ||
| useHardware: false, | ||
| preVerificationMode: false, | ||
| }); | ||
| const softwareKeyExists = await softwareManager.exists(keyId); | ||
| if (!softwareKeyExists) { | ||
| await softwareManager.generate(keyId); | ||
| } | ||
| const fallbackSignature = await softwareManager.signPayload( | ||
| keyId, | ||
| payload, | ||
| ); | ||
| this.#managerCache.set(cacheKey, softwareManager); | ||
| await this.#persistContext( | ||
| cacheKey, | ||
| softwareManager, | ||
| keyId, | ||
| context, | ||
| ); | ||
| await this.#runHardwareFallbackCallback({ | ||
| keyId, | ||
| context, | ||
| originalError: signError, | ||
| }); | ||
| console.log( | ||
| `✅ [KeyService] Fallback signature created: ${fallbackSignature.substring(0, 50)}...`, | ||
| ); | ||
| console.log("=".repeat(70)); | ||
| return fallbackSignature; | ||
| } | ||
coodos marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| } | ||
| async verifySignature( | ||
| @@ -266,4 +329,26 @@ export class KeyService { | ||
| await this.#store.delete(READY_KEY); | ||
| this.#ready = false; | ||
| } | ||
| setHardwareFallbackHandler( | ||
| handler: | ||
| | ((event: HardwareFallbackEvent) => Promise<void> | void) | ||
| | null, | ||
| ): void { | ||
| this.#onHardwareFallback = handler; | ||
| } | ||
| async #runHardwareFallbackCallback( | ||
| event: HardwareFallbackEvent, | ||
| ): Promise<void> { | ||
| if (!this.#onHardwareFallback) return; | ||
| try { | ||
| await this.#onHardwareFallback(event); | ||
| } catch (callbackError) { | ||
| console.error( | ||
| "[KeyService] Hardware fallback callback failed:", | ||
| callbackError, | ||
| ); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55 infrastructure/eid-wallet/src/lib/ui/BottomSheet/BottomSheet.svelte
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| <script lang="ts"> | ||
| import { cn } from "$lib/utils"; | ||
| import type { Snippet } from "svelte"; | ||
| import type { HTMLAttributes } from "svelte/elements"; | ||
| interface BottomSheetProps extends HTMLAttributes<HTMLDivElement> { | ||
| isOpen?: boolean; | ||
| dismissible?: boolean; | ||
| children?: Snippet; | ||
| onOpenChange?: (value: boolean) => void; | ||
| } | ||
| let { | ||
| isOpen = $bindable(false), | ||
| dismissible = true, | ||
| children = undefined, | ||
| onOpenChange, | ||
| ...restProps | ||
| }: BottomSheetProps = $props(); | ||
| let lastReportedOpen = isOpen; | ||
| function handleClose() { | ||
| if (!dismissible) return; | ||
| isOpen = false; | ||
| onOpenChange?.(false); | ||
| } | ||
| $effect(() => { | ||
| if (isOpen !== lastReportedOpen) { | ||
| lastReportedOpen = isOpen; | ||
| onOpenChange?.(isOpen); | ||
| } | ||
coodos marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| }); | ||
| </script> | ||
| {#if isOpen} | ||
| <div | ||
| class="fixed inset-0 z-40 bg-black/40" | ||
| aria-hidden="true" | ||
| onclick={handleClose} | ||
| ></div> | ||
| <div | ||
| {...restProps} | ||
| role="dialog" | ||
| aria-modal="true" | ||
| class={cn( | ||
| "fixed inset-x-0 bottom-0 z-50 bg-white rounded-t-3xl shadow-xl flex flex-col gap-4 max-h-[88svh] overflow-y-auto", | ||
| restProps.class, | ||
| )} | ||
| style={`padding: 1.5rem 1.5rem max(1.5rem, env(safe-area-inset-bottom)); ${restProps.style ?? ""}`} | ||
| > | ||
| {@render children?.()} | ||
| </div> | ||
| {/if} | ||
23 changes: 9 additions & 14 deletions
23 infrastructure/eid-wallet/src/lib/ui/CameraPermissionDialog/CameraPermissionDialog.svelte
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 6 additions & 3 deletions
9 infrastructure/eid-wallet/src/routes/(app)/ePassport/+page.svelte
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.