fix (firebase) : client side initialisation of auth & database

Chackoz · Feb 2, 2025 · 79b622f · 79b622f
1 parent 8aa4bd7
commit 79b622f
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 5 deletions.
diff --git a/app/services/auth.ts b/app/services/auth.ts
@@ -6,6 +6,10 @@ export class AuthService {
   static async logout(): Promise<void> {
     try {
       const auth = firebaseService.auth;
+      if (!auth) {
+        console.error('Database not found');
+        return;
+      }
       await signOut(auth);
     } catch (error) {
       console.error('Error signing out:', error);

diff --git a/app/services/chat.ts b/app/services/chat.ts
@@ -10,7 +10,12 @@ export class ChatService {
     content: string,
   ): Promise<string> {
     const database = firebaseService.database;
+    if (!database) {
+      console.error('Database not found');
+      return "";
+    }
     const messagesRef = ref(database, 'messages');
+
     const newMessageRef = push(messagesRef);
 
     const message: ChatMessage = {

diff --git a/app/services/firebase.ts b/app/services/firebase.ts
@@ -44,13 +44,11 @@ class FirebaseService {
     return FirebaseService.instance;
   }
 
-  get database(): Database {
-    if (!this._database) throw new Error('Database not initialized');
+  get database(): Database|undefined {
     return this._database;
   }
 
-  get auth(): Auth {
-    if (!this._auth) throw new Error('Auth not initialized');
+  get auth(): Auth|undefined {
     return this._auth;
   }
 }

diff --git a/app/services/node.ts b/app/services/node.ts
@@ -9,8 +9,13 @@ export class NodeService {
       console.log('Client ID is missing');
       return;
     };
+
 
     const database = firebaseService.database;
+    if (!database) {
+      console.error('Database not found');
+      return;
+    }
     const presenceRef = ref(database, `presence/${clientId}`);
 
     try {
@@ -30,6 +35,10 @@ export class NodeService {
     metadata: Partial<NetworkNode['metadata']>,
   ): Promise<void> {
     const database = firebaseService.database;
+    if (!database) {
+      console.error('Database not found');
+      return;
+    }
     const nodeRef = ref(database, `presence/${nodeId}`);
 
     try {

diff --git a/app/services/task.ts b/app/services/task.ts
@@ -11,6 +11,16 @@ export class TaskService {
   ): Promise<string> {
     const database = firebaseService.database;
     const auth = firebaseService.auth;
+    if (!database) {
+      console.error('Database not found');
+      return "";
+    }
+    if (!auth) {
+      console.error('Database not found');
+      return "";
+    }
+
+
     const tasksRef = ref(database, 'tasks');
     const newTaskRef = push(tasksRef);
     const userId = auth.currentUser?.uid;
@@ -49,8 +59,11 @@ export class TaskService {
     error?: string
   ): Promise<void> {
     const database = firebaseService.database;
+    if (!database) {
+      console.error('Database not found');
+      return;
+    }
     const taskRef = ref(database, `tasks/${taskId}`);
-
     const updates: Partial<Task> = {
       status,
       updatedAt: new Date().toISOString(),
@@ -77,6 +90,10 @@ export class TaskService {
     workerId: string
   ): Promise<void> {
     const database = firebaseService.database;
+    if (!database) {
+      console.error('Database not found');
+      return;
+    }
     const taskRef = ref(database, `tasks/${taskId}`);
 
     try {
@@ -94,6 +111,10 @@ export class TaskService {
 
   static async getTasksByUserId(userId: string): Promise<Task[]> {
     const database = firebaseService.database;
+    if (!database) {
+      console.error('Database not found');
+      return [];
+    }
     const tasksRef = ref(database, 'tasks');
 
     try {
@@ -122,6 +143,10 @@ export class TaskService {
 
   static async getTaskById(taskId: string): Promise<Task | null> {
     const database = firebaseService.database;
+    if (!database) {
+      console.error('Database not found');
+      return null;
+    }
     const taskRef = ref(database, `tasks/${taskId}`);
 
     try {
@@ -141,6 +166,10 @@ export class TaskService {
 
   static async getPendingTasks(): Promise<Task[]> {
     const database = firebaseService.database;
+    if (!database) {
+      console.error('Database not found');
+      return [];
+    }
     const tasksRef = ref(database, 'tasks');
 
     try {
@@ -169,6 +198,10 @@ export class TaskService {
 
   static async deleteTask(taskId: string): Promise<void> {
     const database = firebaseService.database;
+    if (!database) {
+      console.error('Database not found');
+      return;
+    }
     const taskRef = ref(database, `tasks/${taskId}`);
 
     try {