From 916d1302a455d13e347ef00729cfe01a20b55eb1 Mon Sep 17 00:00:00 2001
From: PhilReact <philliplangmartinez@gmail.com>
Date: Sun, 1 Dec 2024 21:09:12 +0200
Subject: [PATCH] fix group embed decryption

---
 src/atoms/global.ts                       |  5 +++++
 src/components/Embeds/AttachmentEmbed.tsx |  3 ++-
 src/components/Embeds/Embed.tsx           | 13 ++++++++-----
 src/components/Group/Group.tsx            |  5 ++++-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/atoms/global.ts b/src/atoms/global.ts
index 388ba3c..846753b 100644
--- a/src/atoms/global.ts
+++ b/src/atoms/global.ts
@@ -124,3 +124,8 @@ export const blobKeySelector = selectorFamily({
     return blobs[key] || null; // Return the value for the key or null if not found
   },
 });
+
+export const selectedGroupIdAtom = atom({
+  key: 'selectedGroupIdAtom', 
+  default: null, 
+});
\ No newline at end of file
diff --git a/src/components/Embeds/AttachmentEmbed.tsx b/src/components/Embeds/AttachmentEmbed.tsx
index 06ac4a9..1ca14f0 100644
--- a/src/components/Embeds/AttachmentEmbed.tsx
+++ b/src/components/Embeds/AttachmentEmbed.tsx
@@ -40,6 +40,7 @@ export const AttachmentCard = ({
     isLoadingParent,
     errorMsg,
     encryptionType,
+    selectedGroupId
   }) => {
 
     const [isOpen, setIsOpen] = useState(true);
@@ -86,7 +87,7 @@ export const AttachmentCard = ({
              
                 {
                   data64: data,
-                groupId: 683,
+                groupId: selectedGroupId,
                 }
               
             );
diff --git a/src/components/Embeds/Embed.tsx b/src/components/Embeds/Embed.tsx
index b5d4c82..36ef89d 100644
--- a/src/components/Embeds/Embed.tsx
+++ b/src/components/Embeds/Embed.tsx
@@ -8,8 +8,8 @@ import { extractComponents } from "../Chat/MessageDisplay";
 import { executeEvent } from "../../utils/events";
 
 import { base64ToBlobUrl } from "../../utils/fileReading";
-import { useRecoilValue, useSetRecoilState } from "recoil";
-import { blobControllerAtom, blobKeySelector, resourceKeySelector } from "../../atoms/global";
+import { useRecoilState, useRecoilValue, useSetRecoilState } from "recoil";
+import { blobControllerAtom, blobKeySelector, resourceKeySelector, selectedGroupIdAtom } from "../../atoms/global";
 import { parseQortalLink } from "./embed-utils";
 import { PollCard } from "./PollEmbed";
 import { ImageCard } from "./ImageEmbed";
@@ -59,7 +59,7 @@ export const Embed = ({ embedLink }) => {
   const [imageUrl, setImageUrl] = useState("");
   const [parsedData, setParsedData] = useState(null);
   const setBlobs = useSetRecoilState(blobControllerAtom);
-
+  const [selectedGroupId] = useRecoilState(selectedGroupIdAtom)
   const resourceData = useMemo(()=> {
     const parsedDataOnTheFly = parseQortalLink(embedLink);
     if(parsedDataOnTheFly?.service && parsedDataOnTheFly?.name && parsedDataOnTheFly?.identifier){
@@ -148,22 +148,24 @@ export const Embed = ({ embedLink }) => {
                   );
                 }
                  if(encryptionType === 'group'){
+
                   decryptedData = await window.sendMessage(
                     "DECRYPT_QORTAL_GROUP_DATA",
                    
                       {
                         data64: data,
-                      groupId: 683,
+                      groupId: selectedGroupId,
                       }
                     
                   );
+
                  }
               } catch (error) {
                 throw new Error('Unable to decrypt')
               }
               
               if (!decryptedData || decryptedData?.error) throw new Error("Could not decrypt data");
-               imageFinalUrl = base64ToBlobUrl(decryptedData)
+               imageFinalUrl = base64ToBlobUrl(decryptedData, parsedData?.mimeType ? decodeURIComponent(parsedData?.mimeType) : undefined)
                setBlobs((prev=> {
                 return {
                   ...prev,
@@ -357,6 +359,7 @@ export const Embed = ({ embedLink }) => {
           isLoadingParent={isLoading}
           errorMsg={errorMsg}
           encryptionType={encryptionType}
+          selectedGroupId={selectedGroupId}
         />
       )}
       <CustomizedSnackbars
diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx
index 7eaa53c..29e192f 100644
--- a/src/components/Group/Group.tsx
+++ b/src/components/Group/Group.tsx
@@ -97,6 +97,8 @@ import { HubsIcon } from "../../assets/Icons/HubsIcon";
 import { MessagingIcon } from "../../assets/Icons/MessagingIcon";
 import { formatEmailDate } from "./QMailMessages";
 import { AdminSpace } from "../Chat/AdminSpace";
+import { useSetRecoilState } from "recoil";
+import { selectedGroupIdAtom } from "../../atoms/global";
 
 // let touchStartY = 0;
 // let disablePullToRefresh = false;
@@ -476,7 +478,7 @@ export const Group = ({
   const [appsModeDev, setAppsModeDev] = useState('home')
   const [isOpenSideViewDirects, setIsOpenSideViewDirects] = useState(false)
   const [isOpenSideViewGroups, setIsOpenSideViewGroups] = useState(false)
-
+  const setSelectedGroupId = useSetRecoilState(selectedGroupIdAtom)
   const toggleSideViewDirects = ()=> {
     if(isOpenSideViewGroups){
       setIsOpenSideViewGroups(false)
@@ -502,6 +504,7 @@ export const Group = ({
 
   useEffect(() => {
     selectedGroupRef.current = selectedGroup;
+    setSelectedGroupId(selectedGroup?.groupId)
   }, [selectedGroup]);
 
   useEffect(() => {