forked from coracle/flotilla
9df8cee501
Adopts the rewritten welshman API: the removed @welshman/util helpers (Profile/List/Room/Handler/Encryptable) are now Reader/Builder classes in @welshman/domain, and @welshman/app dropped its global singletons for an App instance + app.use(Plugin) registry. - src/app/welshman.ts is now the app bootstrap + session-state module (one shared App instance, multi-account sessions/login, app-wide reactive views) rather than a compat shim re-exporting the old globals. - Rewrote ~100 callers to use app.use(Plugin) directly (thunks, profiles, relays, rooms, zaps, tags, wot, feeds, sync); thunk helpers are now thunk methods. - Added @welshman/domain dependency. - Resolved residual gaps (storage hydration via plugin.onItem/wrapManager/Plaintext, relay-list mutators, search-relay list, outbox #d filter). Best-effort: no toolchain/linking available, so this is not build- or type-checked. Remaining judgment calls are flagged with TODO(welshman-migration). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01BsMjvv7krpZeHK1Njeneru
106 lines
3.7 KiB
Svelte
106 lines
3.7 KiB
Svelte
<script lang="ts">
|
|
import {Client} from "@pomade/core"
|
|
import {getPubkey} from "@welshman/util"
|
|
import {session} from "@app/welshman"
|
|
// TODO(welshman-migration): `SessionPomade` was removed from @welshman/app; the
|
|
// new generic Session nests its descriptor under `.data` ({clientOptions, email}),
|
|
// whereas this code destructures `email`/`clientOptions` from the top level.
|
|
// Confirm whether flotilla's FlotillaSession still surfaces these at the top
|
|
// level (loginWithPomade stores them under `.data` via toSession) and adjust the
|
|
// destructuring accordingly. Local type kept loose to avoid a broken import.
|
|
type SessionPomade = {email: string; clientOptions: {secret: string; peers: any}}
|
|
import {preventDefault} from "@lib/html"
|
|
import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
|
|
import AltArrowRight from "@assets/icons/alt-arrow-right.svg?dataurl"
|
|
import Icon from "@lib/components/Icon.svelte"
|
|
import Button from "@lib/components/Button.svelte"
|
|
import Spinner from "@lib/components/Spinner.svelte"
|
|
import Modal from "@lib/components/Modal.svelte"
|
|
import ModalBody from "@lib/components/ModalBody.svelte"
|
|
import ModalHeader from "@lib/components/ModalHeader.svelte"
|
|
import ModalTitle from "@lib/components/ModalTitle.svelte"
|
|
import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
|
|
import ModalFooter from "@lib/components/ModalFooter.svelte"
|
|
import StringMultiInput from "@lib/components/StringMultiInput.svelte"
|
|
import KeyDownload from "@app/components/KeyDownload.svelte"
|
|
import {pushToast} from "@app/toast"
|
|
import {pushModal, clearModals} from "@app/modal"
|
|
|
|
type Props = {
|
|
peersByPrefix: Map<string, string>
|
|
}
|
|
|
|
const {peersByPrefix}: Props = $props()
|
|
|
|
const {
|
|
email,
|
|
clientOptions: {secret, peers},
|
|
} = $session as SessionPomade
|
|
|
|
const confirmRecovery = async () => {
|
|
const request = await Client.recoverWithChallenge(email, peersByPrefix, otps)
|
|
|
|
if (!request.ok) {
|
|
console.log(request.messages)
|
|
|
|
return pushToast({
|
|
theme: "error",
|
|
message: `Failed to recover: ${request.messages[0]?.res?.message.toLowerCase()}`,
|
|
})
|
|
}
|
|
|
|
const result = await Client.selectRecovery(request.clientSecret, getPubkey(secret), peers)
|
|
|
|
if (!result.ok) {
|
|
console.log(result.messages)
|
|
|
|
return pushToast({
|
|
theme: "error",
|
|
message: `Failed to recover: ${result.messages[0]?.res?.message.toLowerCase()}`,
|
|
})
|
|
}
|
|
|
|
pushModal(KeyDownload, {secret: result.userSecret, next: clearModals, submitText: "Done"})
|
|
}
|
|
|
|
const submit = async () => {
|
|
loading = true
|
|
|
|
try {
|
|
await confirmRecovery()
|
|
} finally {
|
|
loading = false
|
|
}
|
|
}
|
|
|
|
const back = () => history.back()
|
|
|
|
let loading = $state(false)
|
|
let otps = $state<string[]>([])
|
|
</script>
|
|
|
|
<Modal tag="form" onsubmit={preventDefault(submit)}>
|
|
<ModalBody>
|
|
<ModalHeader>
|
|
<ModalTitle>Recover your Key</ModalTitle>
|
|
<ModalSubtitle>Take control over your cryptographic identity</ModalSubtitle>
|
|
</ModalHeader>
|
|
<p>Your recovery codes have been sent!</p>
|
|
<p>
|
|
For security reasons, you may receive three or more emails with recovery codes in them. Please
|
|
paste <strong>all</strong> recovery codes into the text box below.
|
|
</p>
|
|
<StringMultiInput bind:value={otps} placeholder="Enter your recovery codes..." />
|
|
</ModalBody>
|
|
<ModalFooter>
|
|
<Button class="btn btn-link" onclick={back}>
|
|
<Icon icon={AltArrowLeft} />
|
|
Go back
|
|
</Button>
|
|
<Button type="submit" class="btn btn-primary" disabled={loading || otps.length < 2}>
|
|
<Spinner {loading}>Confirm recovery</Spinner>
|
|
<Icon icon={AltArrowRight} />
|
|
</Button>
|
|
</ModalFooter>
|
|
</Modal>
|