Skip to content

Send and receive SMS messages using your Android phone programmatically via a simple HTTP API

Fix the auth API for firebase

Acho Arnold Ewin1b9f372aa2ef
diff --git a/web/app/composables/useApi.ts b/web/app/composables/useApi.ts
index 591d6e46..f6600520 100644
--- a/web/app/composables/useApi.ts
+++ b/web/app/composables/useApi.ts
@@ -22,13 +22,14 @@ function createApiFetch(): $Fetch {
"X-Client-Version": publicConfig.clientVersion || "dev",
},
onRequest({ options }) {
- const headers = (options.headers ||= {}) as Record<string, string>;
+ const headers = new Headers(options.headers);
if (authToken) {
- headers.Authorization = `Bearer ${authToken}`;
+ headers.set("Authorization", `Bearer ${authToken}`);
}
if (apiKey) {
- headers["x-api-key"] = apiKey;
+ headers.set("x-api-key", apiKey);
}
+ options.headers = headers;
},
});
}
diff --git a/web/app/layouts/default.vue b/web/app/layouts/default.vue
index 2f1d0699..09a053cb 100644
--- a/web/app/layouts/default.vue
+++ b/web/app/layouts/default.vue
@@ -66,10 +66,10 @@ function startPoller() {
<template>
<v-app>
- <v-divider v-if="appStore.isLocal" class="py-1 bg-warning" />
+ <v-divider v-if="appStore.isLocal" class="py-2 bg-warning" />
<v-navigation-drawer v-if="lgAndUp && hasDrawer" :width="400" permanent>
<template #prepend>
- <v-divider v-if="appStore.isLocal" class="py-1 bg-warning" />
+ <v-divider v-if="appStore.isLocal" class="py-2 bg-warning" />
<MessageThreadHeader />
<div class="overflow-y-auto v-navigation-drawer__message-thread">
<MessageThread />
diff --git a/web/app/middleware/auth.ts b/web/app/middleware/auth.ts
index 0cd5930f..6689b8cd 100644
--- a/web/app/middleware/auth.ts
+++ b/web/app/middleware/auth.ts
@@ -1,7 +1,8 @@
import { useAuthStore } from "../stores/auth";
-export default defineNuxtRouteMiddleware((to: { path: string }) => {
+export default defineNuxtRouteMiddleware(async (to: { path: string }) => {
const authStore = useAuthStore();
+ await authStore.waitForAuthReady();
if (authStore.authUser === null) {
return navigateTo({ path: "/login", query: { to: to.path } });
}
diff --git a/web/app/middleware/guest.ts b/web/app/middleware/guest.ts
index 969e67db..bb77bd39 100644
--- a/web/app/middleware/guest.ts
+++ b/web/app/middleware/guest.ts
@@ -1,5 +1,6 @@
-export default defineNuxtRouteMiddleware(() => {
+export default defineNuxtRouteMiddleware(async () => {
const authStore = useAuthStore();
+ await authStore.waitForAuthReady();
if (authStore.authUser !== null) {
return navigateTo("/threads");
}
diff --git a/web/app/plugins/firebase.client.ts b/web/app/plugins/firebase.client.ts
index 04cdd8f0..cafbdd41 100644
--- a/web/app/plugins/firebase.client.ts
+++ b/web/app/plugins/firebase.client.ts
@@ -12,6 +12,8 @@ export default defineNuxtPlugin(() => {
console.warn(
"[firebase] No FIREBASE_API_KEY configured. Auth will not work.",
);
+ // Resolve auth readiness so route middleware doesn't hang forever.
+ useAuthStore().onAuthStateChanged(null);
return;
}
diff --git a/web/app/stores/auth.ts b/web/app/stores/auth.ts
index 805445fc..161324ee 100644
--- a/web/app/stores/auth.ts
+++ b/web/app/stores/auth.ts
@@ -14,10 +14,27 @@ export const useAuthStore = defineStore("auth", () => {
const user = ref<User | null>(null);
const { apiFetch } = useApi();
+ let resolveReady: (() => void) | null = null;
+ const authReady = new Promise<void>((resolve) => {
+ resolveReady = resolve;
+ });
+
+ function markAuthReady() {
+ authStateChanged.value = true;
+ if (resolveReady) {
+ resolveReady();
+ resolveReady = null;
+ }
+ }
+
+ function waitForAuthReady(): Promise<void> {
+ return authReady;
+ }
+
async function setAuthUserAction(newUser: AuthUser | null | undefined) {
const userChanged = newUser?.id !== authUser.value?.id;
authUser.value = newUser ?? null;
- authStateChanged.value = true;
+ markAuthReady();
if (userChanged && newUser !== null) {
await Promise.all([loadUser(), loadPhones()]);
@@ -28,14 +45,14 @@ export const useAuthStore = defineStore("auth", () => {
if (firebaseUser == null) {
authUser.value = null;
user.value = null;
- authStateChanged.value = true;
+ markAuthReady();
setApiKey("");
return;
}
setAuthHeader(await firebaseUser.getIdToken());
const { uid, email, displayName } = firebaseUser;
authUser.value = { id: uid, email, displayName };
- authStateChanged.value = true;
+ markAuthReady();
}
async function onIdTokenChanged(firebaseUser: any) {
@@ -107,6 +124,7 @@ export const useAuthStore = defineStore("auth", () => {
authStateChanged,
authUser,
user,
+ waitForAuthReady,
setAuthUserAction,
onAuthStateChanged,
onIdTokenChanged,