Qortal/Qortal-Hub
1
0
Fork 0
mirror of https://github.com/Qortal/Qortal-Hub.git synced 2025-04-23 19:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix group embed decryption

Browse Source
This commit is contained in:
PhilReact 2024-12-01 21:09:12 +02:00
parent b422e274e8
commit 916d1302a4
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/atoms/global.ts
View File

@ -124,3 +124,8 @@ export const blobKeySelector = selectorFamily({
return blobs[key] || null; // Return the value for the key or null if not found return blobs[key] || null; // Return the value for the key or null if not found
}, },
}); });
export const selectedGroupIdAtom = atom({
key: 'selectedGroupIdAtom',
default: null,
});

3
src/components/Embeds/AttachmentEmbed.tsx
View File

@ -40,6 +40,7 @@ export const AttachmentCard = ({
isLoadingParent, isLoadingParent,
errorMsg, errorMsg,
encryptionType, encryptionType,
selectedGroupId
}) => { }) => {
const [isOpen, setIsOpen] = useState(true); const [isOpen, setIsOpen] = useState(true);
@ -86,7 +87,7 @@ export const AttachmentCard = ({
{ {
data64: data, data64: data,
groupId: 683, groupId: selectedGroupId,
} }
); );

13
src/components/Embeds/Embed.tsx
View File

@ -8,8 +8,8 @@ import { extractComponents } from "../Chat/MessageDisplay";
import { executeEvent } from "../../utils/events"; import { executeEvent } from "../../utils/events";
import { base64ToBlobUrl } from "../../utils/fileReading"; import { base64ToBlobUrl } from "../../utils/fileReading";
import { useRecoilValue, useSetRecoilState } from "recoil"; import { useRecoilState, useRecoilValue, useSetRecoilState } from "recoil";
import { blobControllerAtom, blobKeySelector, resourceKeySelector } from "../../atoms/global"; import { blobControllerAtom, blobKeySelector, resourceKeySelector, selectedGroupIdAtom } from "../../atoms/global";
import { parseQortalLink } from "./embed-utils"; import { parseQortalLink } from "./embed-utils";
import { PollCard } from "./PollEmbed"; import { PollCard } from "./PollEmbed";
import { ImageCard } from "./ImageEmbed"; import { ImageCard } from "./ImageEmbed";
@ -59,7 +59,7 @@ export const Embed = ({ embedLink }) => {
const [imageUrl, setImageUrl] = useState(""); const [imageUrl, setImageUrl] = useState("");
const [parsedData, setParsedData] = useState(null); const [parsedData, setParsedData] = useState(null);
const setBlobs = useSetRecoilState(blobControllerAtom); const setBlobs = useSetRecoilState(blobControllerAtom);
const [selectedGroupId] = useRecoilState(selectedGroupIdAtom)
const resourceData = useMemo(()=> { const resourceData = useMemo(()=> {
const parsedDataOnTheFly = parseQortalLink(embedLink); const parsedDataOnTheFly = parseQortalLink(embedLink);
if(parsedDataOnTheFly?.service && parsedDataOnTheFly?.name && parsedDataOnTheFly?.identifier){ if(parsedDataOnTheFly?.service && parsedDataOnTheFly?.name && parsedDataOnTheFly?.identifier){
@ -148,22 +148,24 @@ export const Embed = ({ embedLink }) => {
); );
} }
if(encryptionType === 'group'){ if(encryptionType === 'group'){
decryptedData = await window.sendMessage( decryptedData = await window.sendMessage(
"DECRYPT_QORTAL_GROUP_DATA", "DECRYPT_QORTAL_GROUP_DATA",
{ {
data64: data, data64: data,
groupId: 683, groupId: selectedGroupId,
} }
); );
} }
} catch (error) { } catch (error) {
throw new Error('Unable to decrypt') throw new Error('Unable to decrypt')
} }
if (!decryptedData || decryptedData?.error) throw new Error("Could not decrypt data"); 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=> { setBlobs((prev=> {
return { return {
...prev, ...prev,
@ -357,6 +359,7 @@ export const Embed = ({ embedLink }) => {
isLoadingParent={isLoading} isLoadingParent={isLoading}
errorMsg={errorMsg} errorMsg={errorMsg}
encryptionType={encryptionType} encryptionType={encryptionType}
selectedGroupId={selectedGroupId}
/> />
)} )}
<CustomizedSnackbars <CustomizedSnackbars

5
src/components/Group/Group.tsx
View File

@ -97,6 +97,8 @@ import { HubsIcon } from "../../assets/Icons/HubsIcon";
import { MessagingIcon } from "../../assets/Icons/MessagingIcon"; import { MessagingIcon } from "../../assets/Icons/MessagingIcon";
import { formatEmailDate } from "./QMailMessages"; import { formatEmailDate } from "./QMailMessages";
import { AdminSpace } from "../Chat/AdminSpace"; import { AdminSpace } from "../Chat/AdminSpace";
import { useSetRecoilState } from "recoil";
import { selectedGroupIdAtom } from "../../atoms/global";
// let touchStartY = 0; // let touchStartY = 0;
// let disablePullToRefresh = false; // let disablePullToRefresh = false;
@ -476,7 +478,7 @@ export const Group = ({
const [appsModeDev, setAppsModeDev] = useState('home') const [appsModeDev, setAppsModeDev] = useState('home')
const [isOpenSideViewDirects, setIsOpenSideViewDirects] = useState(false) const [isOpenSideViewDirects, setIsOpenSideViewDirects] = useState(false)
const [isOpenSideViewGroups, setIsOpenSideViewGroups] = useState(false) const [isOpenSideViewGroups, setIsOpenSideViewGroups] = useState(false)
const setSelectedGroupId = useSetRecoilState(selectedGroupIdAtom)
const toggleSideViewDirects = ()=> { const toggleSideViewDirects = ()=> {
if(isOpenSideViewGroups){ if(isOpenSideViewGroups){
setIsOpenSideViewGroups(false) setIsOpenSideViewGroups(false)
@ -502,6 +504,7 @@ export const Group = ({
useEffect(() => { useEffect(() => {
selectedGroupRef.current = selectedGroup; selectedGroupRef.current = selectedGroup;
setSelectedGroupId(selectedGroup?.groupId)
}, [selectedGroup]); }, [selectedGroup]);
useEffect(() => { useEffect(() => {