From 73551c83c45b591464e8588a9f6a94ba3e9238f6 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 24 Jun 2022 14:28:45 -0300 Subject: fix #7077 file support --- .../src/pages/home/BackupFinishedScreen.tsx | 2 +- .../src/pages/home/ContinentSelectionScreen.tsx | 4 +- .../src/pages/home/RecoveryFinishedScreen.tsx | 45 ++++++++++++++-------- .../src/pages/home/SecretEditorScreen.tsx | 2 +- .../pages/home/authMethod/AuthMethodEmailSetup.tsx | 2 +- 5 files changed, 34 insertions(+), 21 deletions(-) diff --git a/packages/anastasis-webui/src/pages/home/BackupFinishedScreen.tsx b/packages/anastasis-webui/src/pages/home/BackupFinishedScreen.tsx index f774d3890..d69a0af38 100644 --- a/packages/anastasis-webui/src/pages/home/BackupFinishedScreen.tsx +++ b/packages/anastasis-webui/src/pages/home/BackupFinishedScreen.tsx @@ -49,7 +49,7 @@ export function BackupFinishedScreen(): VNode { version {sd.policy_version} {sd.policy_expiration.t_s !== "never" ? ` expires at: ${format( - new Date(sd.policy_expiration.t_s), + new Date(sd.policy_expiration.t_s * 1000), "dd-MM-yyyy", )}` : " without expiration date"} diff --git a/packages/anastasis-webui/src/pages/home/ContinentSelectionScreen.tsx b/packages/anastasis-webui/src/pages/home/ContinentSelectionScreen.tsx index 534f9136d..fc9c0f097 100644 --- a/packages/anastasis-webui/src/pages/home/ContinentSelectionScreen.tsx +++ b/packages/anastasis-webui/src/pages/home/ContinentSelectionScreen.tsx @@ -135,7 +135,7 @@ export function ContinentSelectionScreen(): VNode { Choose the country that issued most of your long-term legal documents or personal identifiers.

-
-
+ */} diff --git a/packages/anastasis-webui/src/pages/home/RecoveryFinishedScreen.tsx b/packages/anastasis-webui/src/pages/home/RecoveryFinishedScreen.tsx index fae53d8dc..c8615da14 100644 --- a/packages/anastasis-webui/src/pages/home/RecoveryFinishedScreen.tsx +++ b/packages/anastasis-webui/src/pages/home/RecoveryFinishedScreen.tsx @@ -56,9 +56,11 @@ export function RecoveryFinishedScreen(): VNode { ); } const secret = bytesToString(decodeCrock(encodedSecret.value)); - const contentURI = `data:${encodedSecret.mime},${secret}`; - // const fileName = encodedSecret['filename'] - // data:plain/text;base64,asdasd + const plainText = + encodedSecret.value.length < 1000 && encodedSecret.mime === "text/plain"; + const contentURI = !plainText + ? secret + : `data:${encodedSecret.mime},${secret}`; return (

Your secret was recovered

@@ -68,25 +70,36 @@ export function RecoveryFinishedScreen(): VNode {

)}
- + ) : undefined} + + - {!copied ? "Copy" : "Copied"} - -
- Save as + Download content
-
- -
+ {plainText ? ( +
+ +
+ ) : undefined}
); } diff --git a/packages/anastasis-webui/src/pages/home/SecretEditorScreen.tsx b/packages/anastasis-webui/src/pages/home/SecretEditorScreen.tsx index 329a96d74..93a27837c 100644 --- a/packages/anastasis-webui/src/pages/home/SecretEditorScreen.tsx +++ b/packages/anastasis-webui/src/pages/home/SecretEditorScreen.tsx @@ -52,7 +52,7 @@ export function SecretEditorScreen(): VNode { const secretNext = async (): Promise => { const secret = secretFile ? { - value: encodeCrock(stringToBytes(secretValue)), + value: encodeCrock(stringToBytes(secretFile.content)), filename: secretFile.name, mime: secretFile.type, } diff --git a/packages/anastasis-webui/src/pages/home/authMethod/AuthMethodEmailSetup.tsx b/packages/anastasis-webui/src/pages/home/authMethod/AuthMethodEmailSetup.tsx index a11d855aa..b3af0f080 100644 --- a/packages/anastasis-webui/src/pages/home/authMethod/AuthMethodEmailSetup.tsx +++ b/packages/anastasis-webui/src/pages/home/authMethod/AuthMethodEmailSetup.tsx @@ -21,7 +21,7 @@ import { AnastasisClientFrame } from "../index.js"; import { AuthMethodSetupProps } from "./index.js"; const EMAIL_PATTERN = - /^(([^<>()[]\\.,;:\s@"]+(\.[^<>()[]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; + /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; export function AuthMethodEmailSetup({ cancel, -- cgit v1.2.3