bookish-press 0.10.0 → 0.11.1

package/dist/components/editor/Permissions.svelte

@@ -15,7 +15,13 @@ async function addEditor() {
 		const { createUser } = await import("../../models/CRUD");
 		const uid = await createUser(email);
 		if (uid === null) newEditorError = "couldn't add editor";
-		else change([...uids, uid]);
+		else {
+			// The server only reveals the emails of people who already
+			// share a saved book, and this one isn't saved yet. We know
+			// the email anyway, so show it now.
+			emails.update((known) => new Map(known).set(uid, email));
+			change([...uids, uid]);
+		}
 	} finally {
 		loading = undefined;
 	}

package/dist/components/page/Publish.svelte

@@ -6,7 +6,7 @@ import Format from "../chapter/Format.svelte";
 import Note from "../editor/Note.svelte";
 import Instructions from "./Instructions.svelte";
 import Link from "../Link.svelte";
-import { PUBLIC_CONTEXT } from "$env/static/public";
+import { PUBLIC_CONTEXT } from "$app/env/public";
 import Button from "../app/Button.svelte";
 import Feedback from "../app/Feedback.svelte";
 let auth = getUser();

package/dist/models/CRUD.js

@@ -1,4 +1,4 @@
-import { db, functions } from './Firebase';
+import { auth, db, functions } from './Firebase';
 import { collection, getDocs, getDoc, setDoc, doc, addDoc, query, where, deleteDoc, onSnapshot, } from 'firebase/firestore';
 import { httpsCallable } from 'firebase/functions';
 import Edition from './book/Edition';
@@ -78,6 +78,11 @@ export function listenToChapters(bookID, editionID, react) {
 export async function getUserEmails(uids) {
     if (!functions)
         throw Error("Can't publish, no connection to Firebase functions.");
+    // The function only answers signed-in users, and a page load can get here
+    // before Firebase has restored the sign-in, so wait for it.
+    await auth?.authStateReady();
+    if (!auth?.currentUser)
+        return null;
     const getUserEmails = httpsCallable(functions, 'getUserEmailsGen2');
     const result = await getUserEmails({
         uids,

package/dist/models/Firebase.js

@@ -3,8 +3,7 @@ import { connectAuthEmulator, getAuth } from 'firebase/auth';
 import { connectFirestoreEmulator, getFirestore } from 'firebase/firestore';
 import { connectFunctionsEmulator, getFunctions } from 'firebase/functions';
 import { connectStorageEmulator, getStorage } from 'firebase/storage';
-import { PUBLIC_READER, PUBLIC_CONTEXT, PUBLIC_FIREBASE_API_KEY, PUBLIC_FIREBASE_AUTH_DOMAIN, PUBLIC_FIREBASE_PROJECT_ID, PUBLIC_FIREBASE_STORAGE_BUCKET, PUBLIC_FIREBASE_MESSAGING_SENDER_ID, PUBLIC_FIREBASE_APP_ID, } from '$env/static/public';
-import { env } from '$env/dynamic/public';
+import { PUBLIC_READER, PUBLIC_CONTEXT, PUBLIC_FIREBASE_API_KEY, PUBLIC_FIREBASE_AUTH_DOMAIN, PUBLIC_FIREBASE_PROJECT_ID, PUBLIC_FIREBASE_STORAGE_BUCKET, PUBLIC_FIREBASE_MESSAGING_SENDER_ID, PUBLIC_FIREBASE_APP_ID, PUBLIC_EMULATOR_AUTH, PUBLIC_EMULATOR_FIRESTORE, PUBLIC_EMULATOR_STORAGE, PUBLIC_EMULATOR_FUNCTIONS, } from '$app/env/public';
 const isReader = PUBLIC_READER === 'true';
 // Some feedback about context
 if (!isReader && PUBLIC_CONTEXT !== 'prod')
@@ -25,26 +24,16 @@ export const auth = isReader ? undefined : getAuth(app);
 export const db = isReader ? undefined : getFirestore();
 export const storage = isReader ? undefined : getStorage(app);
 export const functions = isReader ? undefined : getFunctions(app);
-/** Emulator ports default to the firebase.json values but can be overridden
- *  by env vars so test runs (see firebase.test.json) can use dedicated ports
- *  that don't collide with other running emulator suites. Dynamic env isn't
- *  available in every context (e.g. unit tests), hence the guard. */
-function emulatorPort(name, fallback) {
-    try {
-        return (env?.[name] ??
-            fallback);
-    }
-    catch {
-        return fallback;
-    }
-}
+// Emulator ports default to the firebase.json values, but test runs override
+// them (see firebase.test.json) so they don't collide with other emulator
+// suites running on this machine.
 if (!isReader && PUBLIC_CONTEXT === 'local') {
     if (db)
-        connectFirestoreEmulator(db, 'localhost', parseInt(emulatorPort('PUBLIC_EMULATOR_FIRESTORE', '8080')));
+        connectFirestoreEmulator(db, 'localhost', parseInt(PUBLIC_EMULATOR_FIRESTORE ?? '8080'));
     if (auth)
-        connectAuthEmulator(auth, `http://localhost:${emulatorPort('PUBLIC_EMULATOR_AUTH', '9099')}`);
+        connectAuthEmulator(auth, `http://localhost:${PUBLIC_EMULATOR_AUTH ?? '9099'}`);
     if (storage)
-        connectStorageEmulator(storage, 'localhost', parseInt(emulatorPort('PUBLIC_EMULATOR_STORAGE', '9199')));
+        connectStorageEmulator(storage, 'localhost', parseInt(PUBLIC_EMULATOR_STORAGE ?? '9199'));
     if (functions)
-        connectFunctionsEmulator(functions, 'localhost', parseInt(emulatorPort('PUBLIC_EMULATOR_FUNCTIONS', '5001')));
+        connectFunctionsEmulator(functions, 'localhost', parseInt(PUBLIC_EMULATOR_FUNCTIONS ?? '5001'));
 }

package/dist/models/FirebaseAvailable.js

@@ -1,4 +1,4 @@
-import { PUBLIC_READER } from '$env/static/public';
+import { PUBLIC_READER } from '$app/env/public';
 /**
  * Whether this build talks to Firebase. A bound book (bookish-reader) never
  * does, and the Firebase SDK is most of its JavaScript, so it must never load

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "bookish-press",
     "private": false,
-    "version": "0.10.0",
+    "version": "0.11.1",
     "type": "module",
     "description": "A platform for reading and writing readable, accessible, beautiful online books.",
     "license": "MIT",