From 8330bb420eb88da1a7fc8fc6223a1987be924bc2 Mon Sep 17 00:00:00 2001
From: Silas <me@silentsilas.com>
Date: Tue, 22 Feb 2022 03:05:29 -0500
Subject: [PATCH] properly display encrypted text

---
 assets/js/pages/JustPage.tsx |  6 ++++
 assets/js/pages/YouPage.tsx  | 58 ++++++++++++++++++++++++++----------
 2 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/assets/js/pages/JustPage.tsx b/assets/js/pages/JustPage.tsx
index ca9eacb..9decfc7 100644
--- a/assets/js/pages/JustPage.tsx
+++ b/assets/js/pages/JustPage.tsx
@@ -88,6 +88,9 @@ const JustPage = (props: JustPageProps) => {
     form.append("file_content", blobData, fileName);
     form.append("filename", fileName);
     form.append("filetype", fileType);
+    HexMix.arrayBufferToString(encrypted, (result: string) => {
+      sessionStorage.setItem("encoded_file", result);
+    });
   };
 
   const textFormData = async (form: FormData, aesKey: AESKey) => {
@@ -102,6 +105,9 @@ const JustPage = (props: JustPageProps) => {
     );
     const blobData = new Blob([encrypted]);
     form.append("text_content", blobData, "secret_message.txt");
+    HexMix.arrayBufferToString(encrypted, (result: string) => {
+      sessionStorage.setItem("encoded_message", result);
+    });
   };
 
   const createKey = async (): Promise<AESKey> => {
diff --git a/assets/js/pages/YouPage.tsx b/assets/js/pages/YouPage.tsx
index daa2a80..6f29a83 100644
--- a/assets/js/pages/YouPage.tsx
+++ b/assets/js/pages/YouPage.tsx
@@ -1,8 +1,29 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 
-import { ProgressIndicator, Header2, Button, IconArrow, InputButtonWithIcon, Label, Input, CenteredContainer, SpaceBetweenContainer, Spacer, TextAlignWrapper, GlobalStyle } from "@intended/intended-ui";
+import {
+  ProgressIndicator,
+  Header2,
+  Button,
+  IconArrow,
+  InputButtonWithIcon,
+  Label,
+  Input,
+  CenteredContainer,
+  SpaceBetweenContainer,
+  Spacer,
+  TextAlignWrapper,
+  GlobalStyle,
+} from "@intended/intended-ui";
 
 const YouPage = () => {
+  const [url, setUrl] = useState("#");
+  const [encoded, setEncoded] = useState("");
+
+  useEffect(() => {
+    setUrl(calculateUrl());
+    setEncoded(calculateEncoded());
+  }, []);
+
   const calculateUrl = () => {
     const linkId = sessionStorage.getItem("link_id");
     const keyHex = sessionStorage.getItem("key_hex");
@@ -11,15 +32,19 @@ const YouPage = () => {
     return `${window.location.origin}/just/for/you/${linkId}#${keyHex}.${ivHex}`;
   };
 
-  const [url, _setUrl] = useState(calculateUrl());
+  const calculateEncoded = () => {
+    const encodedFile = sessionStorage.getItem("encoded_file");
+    const encodedMessage = sessionStorage.getItem("encoded_message");
+    return `${encodedMessage}${encodedFile}`;
+  };
 
   const copyUrl = async () => {
-    try { 
+    try {
       navigator.clipboard.writeText(url);
     } catch (err: any) {
       alert("Could not copy url to clipboard.");
     }
-  }
+  };
 
   return (
     <React.StrictMode>
@@ -47,20 +72,23 @@ const YouPage = () => {
               looking eh?:
             </Label>
           </TextAlignWrapper>
-          <Input
-            variant="disabled-light"
-            id="encodedSecret"
-            value={url}
-          />
+          <Input variant="disabled-light" id="encodedSecret" value={encoded} />
           <Spacer space="3rem" />
           <SpaceBetweenContainer>
-            <Button variant="secondary" onClick={() => window.location.href = "/just/for"}>
+            <Button
+              variant="secondary"
+              onClick={() => (window.location.href = "/just/for")}
+            >
               <IconArrow arrowDirection="left" />
             </Button>
-            <Button onClick={() => {
-              sessionStorage.clear();
-              window.location.href = "/just";
-            }}>Create Another Secret</Button>
+            <Button
+              onClick={() => {
+                sessionStorage.clear();
+                window.location.href = "/just";
+              }}
+            >
+              Create Another Secret
+            </Button>
           </SpaceBetweenContainer>
         </CenteredContainer>
       </CenteredContainer>