@edgedev/firebase 1.9.14 → 1.9.16

package/edgeFirebase.ts

@@ -46,7 +46,11 @@ import {
   OAuthProvider,
   browserPopupRedirectResolver,
   signInWithPopup,
+  signInWithPhoneNumber,
   updateEmail,
+  RecaptchaVerifier,
+  ConfirmationResult,
+  PhoneAuthProvider,
 } from "firebase/auth";
 
 import { getFunctions, httpsCallable, connectFunctionsEmulator } from "firebase/functions";
@@ -85,7 +89,7 @@ interface permissions {
 
 type action = "assign" | "read" | "write" | "delete";
 
-type authProviders = "email" | "microsoft" | "google" | "facebook" | "github" | "twitter" | "apple";
+type authProviders = "email" | "microsoft" | "google" | "facebook" | "github" | "twitter" | "apple" | "phone";
 
 interface role {
   collectionPath: "-" | string; // - is root
@@ -129,6 +133,8 @@ interface newUser {
 interface userRegister {
   uid?: string;
   email?: string;
+  phoneCode?: string;
+  confirmationResult?: ConfirmationResult;
   password?: string;
   meta: object;
   registrationCode: string;
@@ -209,6 +215,7 @@ export const EdgeFirebase = class {
     } else {
       this.auth = initializeAuth(this.app, { persistence });
     }
+
     if (this.firebaseConfig.emulatorAuth) {
       connectAuthEmulator(this.auth, `http://localhost:${this.firebaseConfig.emulatorAuth}`)
     }
@@ -239,6 +246,10 @@ 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);
@@ -432,6 +443,30 @@ export const EdgeFirebase = class {
     });
   };
 
+  public logInWithPhone = async (confirmationResult: ConfirmationResult, phoneCode: string): Promise<void> => {
+    try {
+      const result = await confirmationResult.confirm(phoneCode);
+      if (!Object.prototype.hasOwnProperty.call(result, "user")) {
+        this.user.logInError = true;
+        this.user.logInErrorMessage = JSON.stringify(result)
+        this.logOut();
+        return;
+      }
+      console.log(result.user.uid);
+      const userRef = doc(this.db, "users", result.user.uid);
+      const userSnap = await getDoc(userRef);
+      if (!userSnap.exists()) { 
+        this.user.logInError = true;
+        this.user.logInErrorMessage = "User does not exist";
+        this.logOut();
+      }
+    } catch (error) {
+      this.user.logInError = true;
+      this.user.logInErrorMessage = error.message;
+      this.logOut();
+    }
+  };
+
   public logInWithMicrosoft = async (providerScopes: string[] = []): Promise<void> => {
       const result = await this.signInWithMicrosoft(providerScopes);
       if (!Object.prototype.hasOwnProperty.call(result, "user")) {
@@ -441,7 +476,7 @@ export const EdgeFirebase = class {
         return;
       }
       console.log(result.user.uid);
-      const userRef = doc(this.db, "staged-users", result.user.uid);
+      const userRef = doc(this.db, "users", result.user.uid);
       const userSnap = await getDoc(userRef);
       if (!userSnap.exists()) { 
         this.user.logInError = true;
@@ -497,6 +532,28 @@ export const EdgeFirebase = class {
     }
   }
 
+  public sendPhoneCode = async (phone: string): Promise<any> => {
+    const newDiv = document.createElement("div");
+    newDiv.setAttribute("id", "recaptcha-container");
+    document.body.appendChild(newDiv);
+
+    const recaptchaVerifier = new RecaptchaVerifier("recaptcha-container", {
+      'size': 'invisible',
+      'callback': (response) => {
+        console.log(response)
+      }
+    }, this.auth);
+
+    try {
+      const confirmationResult = await signInWithPhoneNumber(this.auth, phone, recaptchaVerifier);
+      return confirmationResult 
+    } catch (error) {
+      return error
+    }
+  }
+
+
+
   public registerUser = async (
     userRegister: userRegister,
     authProvider: authProviders = "email",
@@ -542,6 +599,16 @@ export const EdgeFirebase = class {
           }
         } else if (authProvider === "microsoft") {
          response = await this.registerUserWithMicrosoft(providerScopes);
+        } else if (authProvider === "phone") {
+          // Try to sign in with the code
+          try {
+            response = await userRegister.confirmationResult.confirm(userRegister.phoneCode);
+          } catch (error) {
+            // Handle the case where the code is incorrect or expired
+            response = error;
+          }
+              
+        
         }
         if (!Object.prototype.hasOwnProperty.call(response, "user")) { 
           return this.sendResponse({
@@ -1009,6 +1076,7 @@ export const EdgeFirebase = class {
     })
   };
 
+
   public logIn = (credentials: Credentials): void => {
     this.logOut();
     signInWithEmailAndPassword(

package/package.json

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