diff --git a/.run/BoredGame.run.xml b/.run/BoredGame.run.xml new file mode 100644 index 0000000..c9f4f5c --- /dev/null +++ b/.run/BoredGame.run.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/lib/components/CopyCodeBlock.svelte b/src/lib/components/CopyCodeBlock.svelte new file mode 100644 index 0000000..4c7cd04 --- /dev/null +++ b/src/lib/components/CopyCodeBlock.svelte @@ -0,0 +1,37 @@ + + +{#if codeContent} +
+ + + {codeContent} + + + +
+{/if} + + \ No newline at end of file diff --git a/src/lib/components/search/random/index.svelte b/src/lib/components/search/random/index.svelte index 3e6e644..e75c88c 100644 --- a/src/lib/components/search/random/index.svelte +++ b/src/lib/components/search/random/index.svelte @@ -3,8 +3,8 @@ import { Button } from '$components/ui/button' import { boredState } from '$lib/stores/boredState' import { gameStore } from '$lib/stores/gameSearchStore' import type { SearchSchema } from '$lib/zodValidation' +import type { SuperValidated } from 'sveltekit-superforms' import { superForm } from 'sveltekit-superforms/client' -import type { SuperValidated } from 'sveltekit-superforms/index' export let data: SuperValidated const { enhance } = superForm(data, { diff --git a/src/lib/server/api/services/totp.service.ts b/src/lib/server/api/services/totp.service.ts index f5f1ca6..80480c0 100644 --- a/src/lib/server/api/services/totp.service.ts +++ b/src/lib/server/api/services/totp.service.ts @@ -47,6 +47,6 @@ export class TotpService { if (!credential) { throw new Error('TOTP credential not found') } - return await verifyTOTP(decodeHex(credential.secret_data), 30, 6, code) + return verifyTOTP(decodeHex(credential.secret_data), 30, 6, code) } } diff --git a/src/routes/(app)/(protected)/settings/security/mfa/totp/+page.server.ts b/src/routes/(app)/(protected)/settings/security/mfa/totp/+page.server.ts index a551027..5f86a0c 100644 --- a/src/routes/(app)/(protected)/settings/security/mfa/totp/+page.server.ts +++ b/src/routes/(app)/(protected)/settings/security/mfa/totp/+page.server.ts @@ -70,7 +70,7 @@ export const load: PageServerLoad = async (event) => { const totpUri = createTOTPKeyURI(issuer, accountName, decodedHexSecret, intervalInSeconds, digits) addTwoFactorForm.data = { - current_password: '', + password: '', two_factor_code: '', } return { @@ -109,7 +109,7 @@ export const actions: Actions = { if (verifyPasswordError) { console.log(verifyPasswordError) - return setError(addTwoFactorForm, 'current_password', 'Your password is incorrect') + return setError(addTwoFactorForm, 'password', 'Your password is incorrect') } if (addTwoFactorForm.data.two_factor_code === '') { @@ -151,7 +151,7 @@ export const actions: Actions = { if (verifyPasswordError) { console.log(verifyPasswordError) - return setError(removeTwoFactorForm, 'current_password', 'Your password is incorrect') + return setError(removeTwoFactorForm, 'password', 'Your password is incorrect') } const { error: deleteTotpError } = await locals.api.mfa.totp.$delete().then(locals.parseApiResponse) diff --git a/src/routes/(app)/(protected)/settings/security/mfa/totp/+page.svelte b/src/routes/(app)/(protected)/settings/security/mfa/totp/+page.svelte index 47672d4..43b3e4a 100644 --- a/src/routes/(app)/(protected)/settings/security/mfa/totp/+page.svelte +++ b/src/routes/(app)/(protected)/settings/security/mfa/totp/+page.svelte @@ -1,4 +1,5 @@