rzerres/element-call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hopefully actually fix password bug

Browse Source
This commit is contained in:
David Baker
2023-09-20 17:05:10 +01:00
parent 4f43402299
commit ed0059c898
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/e2ee/sharedKeyManagement.ts
View File

@@ -35,7 +35,7 @@ const useInternalRoomSharedKey = (
return [e2eeEnabled ? roomSharedKey : null, setRoomSharedKey]; return [e2eeEnabled ? roomSharedKey : null, setRoomSharedKey];
}; };
const useKeyFromUrl = (roomId: string) => { const useKeyFromUrl = (roomId: string): string | null => {
const urlParams = useUrlParams(); const urlParams = useUrlParams();
const [e2eeSharedKey, setE2EESharedKey] = useInternalRoomSharedKey(roomId); const [e2eeSharedKey, setE2EESharedKey] = useInternalRoomSharedKey(roomId);
@@ -46,13 +46,18 @@ const useKeyFromUrl = (roomId: string) => {
setE2EESharedKey(urlParams.password); setE2EESharedKey(urlParams.password);
}, [urlParams, e2eeSharedKey, setE2EESharedKey]); }, [urlParams, e2eeSharedKey, setE2EESharedKey]);
return urlParams.password ?? null;
}; };
export const useRoomSharedKey = (roomId: string): string | null => { export const useRoomSharedKey = (roomId: string): string | null => {
// make sure we've extracted the key from the URL first // make sure we've extracted the key from the URL first
useKeyFromUrl(roomId); // (and we still need to take the value it returns because
// the effect won't run in time for it to save to localstorage in
// time for us to read it out again).
const passwordFormUrl = useKeyFromUrl(roomId);
return useInternalRoomSharedKey(roomId)[0]; return useInternalRoomSharedKey(roomId)[0] ?? passwordFormUrl;
}; };
export const useManageRoomSharedKey = (roomId: string): string | null => { export const useManageRoomSharedKey = (roomId: string): string | null => {