smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-05-03 10:00:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: Minor refactoring for consistency (#2425)

Browse source
This commit is contained in:
Lipis 2020-11-29 18:32:51 +02:00 • committed by GitHub
parent 204c8370a0
commit b21fd49412
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 76 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/data/firebase.ts
View file

@ -83,7 +83,7 @@ export const isSavedToFirebase = (
portal: Portal,
elements: readonly ExcalidrawElement[],
): boolean => {
if (portal.socket && portal.roomID && portal.roomKey) {
if (portal.socket && portal.roomId && portal.roomKey) {
const sceneVersion = getSceneVersion(elements);
return firebaseSceneVersionCache.get(portal.socket) === sceneVersion;
}
@ -96,11 +96,11 @@ export const saveToFirebase = async (
portal: Portal,
elements: readonly ExcalidrawElement[],
) => {
const { roomID, roomKey, socket } = portal;
const { roomId, roomKey, socket } = portal;
if (
// if no room exists, consider the room saved because there's nothing we can
// do at this point
!roomID ||
!roomId ||
!roomKey ||
!socket ||
isSavedToFirebase(portal, elements)
@ -121,7 +121,7 @@ export const saveToFirebase = async (
} as FirebaseStoredScene;
const db = firebase.firestore();
const docRef = db.collection("scenes").doc(roomID);
const docRef = db.collection("scenes").doc(roomId);
const didUpdate = await db.runTransaction(async (transaction) => {
const doc = await transaction.get(docRef);
if (!doc.exists) {
@ -146,13 +146,13 @@ export const saveToFirebase = async (
};
export const loadFromFirebase = async (
roomID: string,
roomId: string,
roomKey: string,
): Promise<readonly ExcalidrawElement[] | null> => {
const firebase = await getFirebase();
const db = firebase.firestore();
const docRef = db.collection("scenes").doc(roomID);
const docRef = db.collection("scenes").doc(roomId);
const doc = await docRef.get();
if (!doc.exists) {
return null;

6
src/data/index.ts
View file

@ -153,7 +153,7 @@ export const decryptAESGEM = async (
const decrypted = await window.crypto.subtle.decrypt(
{
name: "AES-GCM",
iv: iv,
iv,
},
importedKey,
data,
@ -195,7 +195,7 @@ export const exportToBackend = async (
const encrypted = await window.crypto.subtle.encrypt(
{
name: "AES-GCM",
iv: iv,
iv,
},
key,
encoded,
@ -248,7 +248,7 @@ const importFromBackend = async (
const decrypted = await window.crypto.subtle.decrypt(
{
name: "AES-GCM",
iv: iv,
iv,
},
key,
buffer,