@edgedev/firebase 1.9.16 → 1.9.18

package/edgeFirebase.ts

@@ -246,10 +246,6 @@ export const EdgeFirebase = class {
 
   private functions = null;
 
-  public createRecaptchaVerifier = (containerId, parameters = { size: 'invisible' }) => {
-    return new RecaptchaVerifier(containerId, parameters, this.auth);
-  }
-
   public runFunction = async (functionName: string, data: Record<string, unknown>) => {
     data.uid = this.user.uid;
     const callable = httpsCallable(this.functions, functionName);
@@ -422,6 +418,8 @@ export const EdgeFirebase = class {
 
   private setOnAuthStateChanged = (): void => {
     onAuthStateChanged(this.auth, (userAuth) => {
+      const oldDiv = document.getElementById("recaptcha-container");
+      if (oldDiv) oldDiv.remove();
       if (userAuth) {
         this.user.loggingIn = true;
         this.user.email = userAuth.email;
@@ -444,7 +442,10 @@ export const EdgeFirebase = class {
   };
 
   public logInWithPhone = async (confirmationResult: ConfirmationResult, phoneCode: string): Promise<void> => {
+    const oldDiv = document.getElementById("recaptcha-container");
+    if (oldDiv) oldDiv.remove();
     try {
+      console.log(confirmationResult)
       const result = await confirmationResult.confirm(phoneCode);
       if (!Object.prototype.hasOwnProperty.call(result, "user")) {
         this.user.logInError = true;
@@ -459,11 +460,13 @@ export const EdgeFirebase = class {
         this.user.logInError = true;
         this.user.logInErrorMessage = "User does not exist";
         this.logOut();
+        return;
       }
     } catch (error) {
       this.user.logInError = true;
       this.user.logInErrorMessage = error.message;
       this.logOut();
+      return;
     }
   };
 
@@ -533,6 +536,9 @@ export const EdgeFirebase = class {
   }
 
   public sendPhoneCode = async (phone: string): Promise<any> => {
+    const oldDiv = document.getElementById("recaptcha-container");
+    if (oldDiv) oldDiv.remove();
+
     const newDiv = document.createElement("div");
     newDiv.setAttribute("id", "recaptcha-container");
     document.body.appendChild(newDiv);
@@ -548,7 +554,10 @@ export const EdgeFirebase = class {
       const confirmationResult = await signInWithPhoneNumber(this.auth, phone, recaptchaVerifier);
       return confirmationResult 
     } catch (error) {
-      return error
+      this.user.logInError = true;
+      this.user.logInErrorMessage = error.message;
+      this.logOut();
+      return false;
     }
   }
 
@@ -600,7 +609,8 @@ export const EdgeFirebase = class {
         } else if (authProvider === "microsoft") {
          response = await this.registerUserWithMicrosoft(providerScopes);
         } else if (authProvider === "phone") {
-          // Try to sign in with the code
+          const oldDiv = document.getElementById("recaptcha-container");
+          if (oldDiv) oldDiv.remove();
           try {
             response = await userRegister.confirmationResult.confirm(userRegister.phoneCode);
           } catch (error) {
@@ -1381,28 +1391,52 @@ export const EdgeFirebase = class {
     collectionPath: string,
     docId: string
   ): Promise<actionResponse> => {
-    // console.log(collectionPath)
-    // console.log(docId)
     const canRead = await this.permissionCheck("read", collectionPath + '/' + docId);
     this.data[collectionPath + '/' + docId] = {};
     this.stopSnapshot(collectionPath + '/' + docId);
     this.unsubscibe[collectionPath + '/' + docId] = null;
     if (canRead) {
       const docRef = doc(this.db, collectionPath, docId);
-      const unsubscribe = onSnapshot(docRef, (doc) => {
-        if (doc.exists()) {
-          const item = doc.data();
-          item.docId = doc.id;
-          this.data[collectionPath + '/' + docId] = item;
-        } else {
-          this.data[collectionPath + '/' + docId] = {};
-        }
-      });
-      this.unsubscibe[collectionPath + '/' + docId] = unsubscribe;
-      return this.sendResponse({
-        success: true,
-        message: "line 1336",
-        meta: {}
+      
+      return new Promise<actionResponse>((resolve, reject) => {
+        let firstRun = true;
+        const unsubscribe = onSnapshot(docRef, (doc) => {
+          if (doc.exists()) {
+            const item = doc.data();
+            item.docId = doc.id;
+            this.data[collectionPath + '/' + docId] = item;
+
+            // Only resolve the Promise on first run of onSnapshot if document exists
+            if(firstRun) {
+              firstRun = false;
+              resolve(this.sendResponse({
+                success: true,
+                message: "startDocumentSnapshot " + collectionPath + '/' + docId,
+                meta: {}
+              }));
+            }
+          } else {
+            this.data[collectionPath + '/' + docId] = {};
+
+            // Resolve the Promise with failure response if no document exists
+            if(firstRun) {
+              firstRun = false;
+              resolve(this.sendResponse({
+                success: false,
+                message: `No document found in "${collectionPath}/${docId}"`,
+                meta: {}
+              }));
+            }
+          }
+        }, (error) => {
+          // Reject the Promise with the error response
+          reject(this.sendResponse({
+            success: false,
+            message: `Error fetching document from "${collectionPath}/${docId}": ${error.message}`,
+            meta: {}
+          }));
+        });
+        this.unsubscibe[collectionPath + '/' + docId] = unsubscribe;
       });
     } else {
       return this.sendResponse({
@@ -1413,6 +1447,7 @@ export const EdgeFirebase = class {
     }
   };
 
+
   public startSnapshot = async (
     collectionPath: string,
     queryList: FirestoreQuery[] = [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgedev/firebase",
-  "version": "1.9.16",
+  "version": "1.9.18",
   "description": "Vue 3 / Nuxt 3 Plugin or Nuxt 3 plugin for firebase authentication and firestore.",
   "main": "index.ts",
   "scripts": {