edmaxlabs-core 2.7.1 → 2.7.3

package/dist/index.d.cts

@@ -45,10 +45,10 @@ interface DisplayInfo {
 declare class Credentials {
     uid: string;
     displayInfo: DisplayInfo;
-    logged: boolean;
+    data: Record<string, any>;
+    verified: boolean;
     createdAt: Timestamp;
     updatedAt: Timestamp;
-    lastLogged: Timestamp;
     private constructor();
     static fromMap(map: Record<string, any>): Credentials;
     toMap(): Record<string, any>;
@@ -85,12 +85,8 @@ declare class Authentication {
         password: string;
     }) => Promise<Credentials | null>;
     deleteUser: () => Promise<void>;
+    resetPassword: () => Promise<any>;
     signOut: () => Promise<void>;
-    resetPassword: () => Promise<string>;
-    rules: (path: string, context: Record<string, any>) => Promise<{
-        success: boolean;
-        allowed: any;
-    }>;
 }
 
 declare class DocumentSnapshot {

package/dist/index.d.ts

@@ -45,10 +45,10 @@ interface DisplayInfo {
 declare class Credentials {
     uid: string;
     displayInfo: DisplayInfo;
-    logged: boolean;
+    data: Record<string, any>;
+    verified: boolean;
     createdAt: Timestamp;
     updatedAt: Timestamp;
-    lastLogged: Timestamp;
     private constructor();
     static fromMap(map: Record<string, any>): Credentials;
     toMap(): Record<string, any>;
@@ -85,12 +85,8 @@ declare class Authentication {
         password: string;
     }) => Promise<Credentials | null>;
     deleteUser: () => Promise<void>;
+    resetPassword: () => Promise<any>;
     signOut: () => Promise<void>;
-    resetPassword: () => Promise<string>;
-    rules: (path: string, context: Record<string, any>) => Promise<{
-        success: boolean;
-        allowed: any;
-    }>;
 }
 
 declare class DocumentSnapshot {

package/dist/index.mjs

@@ -1,28 +1,26 @@
 // src/authentication/Credentials.ts
 var Credentials = class _Credentials {
-  constructor(uid, displayInfo, createdAt, updatedAt, lastLogged, logged) {
+  constructor(uid, displayInfo, data, verified, createdAt, updatedAt) {
     this.uid = uid;
     this.displayInfo = displayInfo;
+    this.data = data;
+    this.verified = verified;
     this.createdAt = createdAt;
     this.updatedAt = updatedAt;
-    this.lastLogged = lastLogged;
-    this.logged = logged === true;
   }
   static fromMap(map) {
-    const uid = map.id ?? map.uid ?? "";
-    const data = map.data ?? map;
-    const d_info = data.displayInfo;
+    const uid = map.id ?? map.uid ?? map._id ?? null;
+    const data = map.data ?? map.user ?? map;
+    const displayInfo = data.displayInfo;
     const createdAt = data.createdAt;
     const updatedAt = data.updatedAt;
-    const lastLogged = data.lastLogged;
-    const logged = data.logged;
     const result = new _Credentials(
       uid,
-      d_info,
+      displayInfo,
+      data.data,
+      data.verified,
       createdAt,
-      updatedAt,
-      lastLogged,
-      logged
+      updatedAt
     );
     return result;
   }
@@ -30,10 +28,10 @@ var Credentials = class _Credentials {
     return {
       uid: this.uid,
       displayInfo: this.displayInfo,
+      data: this.data,
+      verified: this.verified,
       createdAt: this.createdAt,
-      updatedAt: this.updatedAt,
-      lastLogged: this.lastLogged,
-      logged: this.logged
+      updatedAt: this.updatedAt
     };
   }
 };
@@ -118,32 +116,23 @@ var _Authentication = class _Authentication {
     }) => {
       this.eUser = void 0;
       this.saveCredentials(null);
-      const app = this.app?.getDatabase;
-      const data = await app?.collection("users").query.where({
-        key: "email",
-        op: "===",
-        value: email
-      }).get();
-      if (data.length > 0) {
-        throw new Error("Email Already In Use.");
-      }
-      const userRef = await app?.collection("users").add({
-        email,
-        password,
-        logged: true,
-        lastLogged: Date.now(),
-        displayInfo: {
-          firstname: email.split("@")[0],
-          lastname: "",
-          surname: "",
-          profile: "./logo.png",
+      const res = await new HttpsRequest({
+        method: "POST" /* POST */,
+        endpoint: `${this.app?.getBaseUrl()}/auth/create`,
+        headers: { "authorization": this.app?.getConfig().token ?? "", "x-project": this.app?.getConfig().project ?? "" },
+        body: {
           email,
-          phone: ""
+          password,
+          project: this.client?.getConfig().project
         }
-      });
-      if (!userRef?.id || userRef?.id === "") {
-        throw new Error("Something went wrong try Again.");
+      }).sendRequest();
+      if (!res.success) {
+        throw new Error("Something went wrong. Try Again.");
       }
+      if (res.success === false) {
+        throw new Error(res.error ?? "Authentication Failed");
+      }
+      const userRef = res.result;
       this.eUser = Credentials.fromMap(userRef);
       this.saveCredentials(this.eUser);
       return Credentials.fromMap(userRef.toMap());
@@ -152,28 +141,23 @@ var _Authentication = class _Authentication {
       email,
       password
     }) => {
-      const app = this.app?.getDatabase;
-      const data = await app?.collection("users").query.where({
-        key: "email",
-        op: "===",
-        value: email
-      }).where({
-        key: "password",
-        op: "===",
-        value: password
-      }).get();
-      console.log("Auth Data:", data);
-      if (data === void 0) {
-        throw new Error("Auth Failed.");
+      const res = await new HttpsRequest({
+        method: "POST" /* POST */,
+        endpoint: `${this.app?.getBaseUrl()}/auth/login`,
+        headers: { "authorization": this.app?.getConfig().token ?? "", "x-project": this.app?.getConfig().project ?? "" },
+        body: {
+          email,
+          password,
+          project: this.client?.getConfig().project
+        }
+      }).sendRequest();
+      if (!res.success) {
+        throw new Error("Something went wrong. Try Again.");
       }
-      if (data?.length === 0) {
-        throw new Error("User Not Found.");
+      if (res.success === false) {
+        throw new Error(res.error ?? "Authentication Failed");
       }
-      const _data = data[0];
-      await app?.collection("users").doc(_data.id).update({
-        logged: true,
-        lastLogged: Date.now()
-      });
+      const _data = res.result;
       this.eUser = Credentials.fromMap(_data);
       this.saveCredentials(this.eUser);
       return Credentials.fromMap(_data);
@@ -182,62 +166,54 @@ var _Authentication = class _Authentication {
       if (!this.eUser) {
         throw new Error("No User Signed in");
       }
-      const app = this.app?.getDatabase;
-      const userRef = await app?.collection("users").doc(this.eUser.uid).delete();
-      if (userRef) {
-        throw new Error("Something went wrong try Again.");
+      const res = await new HttpsRequest({
+        method: "POST" /* POST */,
+        endpoint: `${this.app?.getBaseUrl()}/auth/delete`,
+        headers: { "authorization": this.app?.getConfig().token ?? "", "x-project": this.app?.getConfig().project ?? "" },
+        body: {
+          uid: this.eUser.uid,
+          project: this.client?.getConfig().project
+        }
+      }).sendRequest();
+      if (!res.status) {
+        throw new Error("Something went wrong. Try Again.");
+      }
+      if (res.status === false) {
+        throw new Error(res.error ?? "Authentication Failed");
       }
       this.eUser = void 0;
       this.saveCredentials(null);
     };
-    this.signOut = async () => {
-      const app = this.app?.getDatabase;
-      const luid = this.currentUser();
-      this.eUser = void 0;
-      this.saveCredentials(null);
-      if (luid)
-        await app?.collection("users").doc(luid?.uid).update({
-          logged: false,
-          lastLogged: Date.now()
-        });
-      return;
-    };
     this.resetPassword = async () => {
       const app = this.app?.getDatabase;
       const luid = this.currentUser();
-      const payload = {
-        uid: luid?.uid,
-        ttl: 3
-        //minutes
-      };
-      const id = await app?.collection("_auth_tokens").add(payload);
-      if (id) {
-        return `https://auth.edmaxlabs.com/reset/${id}`;
-      }
-      throw new Error("Failed to request reset tokens. Try Again");
-    };
-    this.rules = async (path, context) => {
       const res = await new HttpsRequest({
         method: "POST" /* POST */,
-        endpoint: this.client.getBaseUrl() + "/auth/rules/verify",
-        headers: {
-          authorization: this.client.getConfig().token,
-          project: this.client.getConfig().project
-        },
+        endpoint: `${this.app?.getBaseUrl()}/auth/reset`,
+        headers: { "authorization": this.app?.getConfig().token ?? "", "x-project": this.app?.getConfig().project ?? "" },
         body: {
-          path,
-          context
+          uid: luid,
+          project: this.client?.getConfig().project
         }
       }).sendRequest();
-      return res;
+      if (!res.status) {
+        throw new Error("Something went wrong. Try Again.");
+      }
+      if (res.status === false) {
+        throw new Error(res.error ?? "Authentication Failed");
+      }
+      const url = res.url;
+      return url;
+    };
+    this.signOut = async () => {
+      this.eUser = void 0;
+      this.saveCredentials(null);
+      return;
     };
     if (_Authentication.instance)
       return _Authentication.instance;
     this.client = EdmaxLabs.instance;
-    this.app = new EdmaxLabs({
-      token: "auth",
-      project: "698457c2f7448550b9e166c4"
-    });
+    this.app = EdmaxLabs.instance;
     _Authentication.instance = this;
     this.restoreSession();
   }
@@ -310,7 +286,7 @@ var _Authentication = class _Authentication {
         onSignOut?.();
         return;
       }
-      const userRef = this.app?.getDatabase.collection("users").doc(creds.uid);
+      const userRef = this.app?.getDatabase.collection("__users").doc(creds.uid);
       if (!userRef)
         return;
       userDocUnsubscribe = userRef.onSnapshot(