implement reconnecting

hardbulls · Mar 28, 2024 · 62b0aad · 62b0aad
1 parent cc6ac6a
commit 62b0aad
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/background.ts b/src/background.ts
@@ -9,7 +9,7 @@ import { MessageType } from "./chrome/MessageType";
     const options = { ...DEFAULT_OPTIONS_STATE, ...(await Local.getOptions()) };
     let remoteState = options.remote;
     let enableRemote = popupState.enableRemote;
-    let isRemoteEnabled = false;
+    let shouldReconnect = true;
 
     chrome.runtime.onMessage.addListener(function (message, _, sendResponse) {
         if (message.type === MessageType.FETCH) {
@@ -37,6 +37,11 @@ import { MessageType } from "./chrome/MessageType";
         if (changes.options) {
             if (changes.options.newValue !== undefined) {
                 if (changes.options?.newValue.remote !== undefined) {
+                    const newRemoteState = changes.options.newValue.remote;
+                    if (newRemoteState.username !== remoteState.username || newRemoteState.password !== remoteState.password) {
+                        shouldReconnect = true;
+                    }
+
                     remoteState = changes.options.newValue.remote;
 
                     toggleFirebaseUpdated();
@@ -59,17 +64,17 @@ import { MessageType } from "./chrome/MessageType";
                 firebaseUpdater = new FirebaseUpdater();
             }
 
-            if (isRemoteEnabled) {
+            if (!shouldReconnect) {
                 return;
             }
 
             if (remoteState.username && remoteState.password && remoteState.firebaseConfig) {
                 await firebaseUpdater.enable(remoteState.username, remoteState.password, remoteState.firebaseConfig);
-                isRemoteEnabled = true;
+                shouldReconnect = false;
             }
         } else {
             await firebaseUpdater?.disable();
-            isRemoteEnabled = false;
+            shouldReconnect = true;
         }
     }
 

diff --git a/src/remote/firebase.ts b/src/remote/firebase.ts
@@ -42,11 +42,9 @@ export class FirebaseUpdater {
     }
 
     private listen(user: User) {
-        if (!this.scoreboardRef) {
-            const db = getDatabase();
+        const db = getDatabase();
 
-            this.scoreboardRef = ref(db, `${DATABASE_NAME}/${user.uid}`);
-        }
+        this.scoreboardRef = ref(db, `${DATABASE_NAME}/${user.uid}`);
 
         this.disable();
 

diff --git a/src/web/index.ts b/src/web/index.ts
@@ -42,7 +42,7 @@ const firebaseConfig = FIREBASE_CONFIG as FirebaseConfig;
     async function handleLogin(username: string, password: string): Promise<undefined | Error> {
         try {
             const userCredential = await signInWithEmailAndPassword(auth, username, password);
-            const user = userCredential.user;
+            user = userCredential.user;
 
             LocalStorage.setDefaultCredentials(username, password);