@memberstack/dom 1.9.40 → 1.9.44

package/lib/methods/requests/index.mjs

@@ -43,7 +43,7 @@ import axios from "axios";
 
 // src/constants/endpoints.ts
 var endpoints = {
-  API: "https://client.memberstack.com"
+  API: "https://dev-client.memberstack.com"
 };
 
 // src/utils/cookies.ts
@@ -114,6 +114,30 @@ var getMemberToken = () => {
   }
   return Cookie.get(memberAuthTokenName);
 };
+var getSessionId = () => {
+  if (typeof window === "undefined")
+    return null;
+  const sessionId = window.localStorage.getItem("ms_session_id");
+  if (!sessionId || sessionId.length > 26) {
+    window.localStorage.removeItem("ms_session_id");
+    return null;
+  }
+  return sessionId;
+};
+var setSessionId = (sessionId) => {
+  if (typeof window !== "undefined") {
+    window.localStorage.setItem("ms_session_id", sessionId);
+  } else {
+    console.warn("setSessionId: window is not defined");
+  }
+};
+var removeSessionId = () => {
+  if (typeof window !== "undefined") {
+    window.localStorage.removeItem("ms_session_id");
+  } else {
+    console.warn("removeSessionId: window is not defined");
+  }
+};
 
 // src/methods/requests/requests.ts
 var createRequestHandler = ({
@@ -128,6 +152,7 @@ var createRequestHandler = ({
       try {
         const { url } = data;
         const memberToken = getMemberToken();
+        const sessionToken = getSessionId();
         const authHeader = [
           (_b = (_a = data.headers) == null ? void 0 : _a["Authorization"]) == null ? void 0 : _b.replace("Bearer ", ""),
           memberToken,
@@ -138,9 +163,13 @@ var createRequestHandler = ({
           method: data.method,
           data: data.data,
           url: formattedUrl,
-          headers: __spreadValues(__spreadProps(__spreadValues(__spreadValues(__spreadValues({}, authHeader && { authorization: `Bearer ${authHeader}` }), publicKey && { ["X-API-Key" /* API_KEY */]: publicKey }), appId && { ["X-APP-ID" /* APP_ID */]: appId }), {
+          headers: __spreadProps(__spreadValues(__spreadValues(__spreadProps(__spreadValues(__spreadValues(__spreadValues({}, authHeader && { authorization: `Bearer ${authHeader}` }), publicKey && { ["X-API-Key" /* API_KEY */]: publicKey }), appId && { ["X-APP-ID" /* APP_ID */]: appId }), {
             ["X-User-Agent" /* USER_AGENT */]: "@memberstack/client@1.2.0"
-          }), data.contentType && { "Content-Type": data.contentType }),
+          }), data.contentType && { "Content-Type": data.contentType }), sessionToken && {
+            ["X-Session-ID" /* SESSION_ID */]: sessionToken
+          }), {
+            "referring-path": window.location.pathname
+          }),
           withCredentials: true
         });
         if ((_c = res == null ? void 0 : res.headers) == null ? void 0 : _c["ms-mid"]) {
@@ -161,6 +190,59 @@ var createRequestHandler = ({
           throw e;
         throw ((_g = (_f = e.response) == null ? void 0 : _f.data) == null ? void 0 : _g.error) || ((_h = e.response) == null ? void 0 : _h.data);
       }
+    }),
+    sendRequestWithFetch: (data, options) => __async(void 0, null, function* () {
+      var _a, _b;
+      try {
+        const { url, method, data: bodyData, headers, contentType } = data;
+        const memberToken = getMemberToken();
+        const authHeader = [
+          (_a = headers == null ? void 0 : headers["Authorization"]) == null ? void 0 : _a.replace("Bearer ", ""),
+          memberToken,
+          options == null ? void 0 : options.token
+        ].find((x) => x);
+        const formattedUrl = `${customEndpoint || endpoints.API}${url}`;
+        const fetchHeaders = __spreadProps(__spreadValues(__spreadValues(__spreadValues({}, authHeader && { Authorization: `Bearer ${authHeader}` }), publicKey && { ["X-API-Key" /* API_KEY */]: publicKey }), appId && { ["X-APP-ID" /* APP_ID */]: appId }), {
+          ["X-User-Agent" /* USER_AGENT */]: "@memberstack/client@1.2.0",
+          "Content-Type": "application/json",
+          Referer: window.location.href
+        });
+        const response = yield fetch(formattedUrl, {
+          method,
+          headers: fetchHeaders,
+          body: bodyData ? JSON.stringify(bodyData) : void 0,
+          credentials: "include",
+          keepalive: true
+          // Keeps the connection open for further requests
+        });
+        const contentTypeHeader = response.headers.get("content-type");
+        let result;
+        if (contentTypeHeader == null ? void 0 : contentTypeHeader.includes("application/json")) {
+          result = yield response.json();
+        } else if (contentTypeHeader == null ? void 0 : contentTypeHeader.includes("text")) {
+          result = yield response.text();
+        } else if (response.status === 204) {
+          result = null;
+        } else {
+          result = yield response.text();
+        }
+        if (response.headers.get("ms-mid")) {
+          token = response.headers.get("ms-mid");
+        }
+        if (!response.ok) {
+          if (((_b = result == null ? void 0 : result.error) == null ? void 0 : _b.name) === "JsonWebTokenError") {
+            throw {
+              code: "client/invalid-token",
+              message: "An invalid token has been provided. Please make sure the token is valid."
+            };
+          }
+          throw (result == null ? void 0 : result.error) || result;
+        }
+        return result;
+      } catch (e) {
+        console.error("Error in sendRequestWithFetch:", e);
+        throw e;
+      }
     })
   };
 };
@@ -207,6 +289,7 @@ var updatePersistedMember = (member) => {
 var unsetPersistedMember = () => {
   localStorage == null ? void 0 : localStorage.removeItem("_ms-mem");
   removeMemberToken();
+  removeSessionId();
   observable.notify(null);
 };
 
@@ -266,6 +349,64 @@ var openSignInWindow = (url, name) => __async(void 0, null, function* () {
     promiseReject = reject;
   });
 });
+function getBrowser() {
+  const userAgent = navigator.userAgent;
+  if (/Edg/i.test(userAgent))
+    return "EDGE";
+  if (/Trident/i.test(userAgent) || /MSIE/i.test(userAgent))
+    return "INTERNET_EXPLORER";
+  if (/Safari/i.test(userAgent) && !/Chrome/i.test(userAgent))
+    return "SAFARI";
+  if (/Firefox/i.test(userAgent))
+    return "FIREFOX";
+  if (/Chrome/i.test(userAgent) && !/Edg/i.test(userAgent))
+    return "CHROME";
+  if (/OPR/i.test(userAgent) || /Opera/i.test(userAgent))
+    return "OPERA";
+  return "OTHER";
+}
+function getOS() {
+  const userAgent = navigator.userAgent;
+  if (/Windows/i.test(userAgent))
+    return "WINDOWS";
+  if (/Macintosh|Mac OS X/i.test(userAgent))
+    return "MACOS";
+  if (/Android/i.test(userAgent))
+    return "ANDROID";
+  if (/iPhone|iPad|iPod/i.test(userAgent))
+    return "IOS";
+  if (/Linux/i.test(userAgent))
+    return "LINUX";
+  return "OTHER";
+}
+function getScreenSize() {
+  const width = window.innerWidth;
+  if (width <= 768)
+    return "PHONE";
+  if (width <= 1024)
+    return "TABLET";
+  return "DESKTOP";
+}
+function getUTMParams() {
+  const params = new URLSearchParams(window.location.search);
+  const utmParams = {};
+  const utmKeys = ["utm_source", "utm_medium", "utm_campaign", "utm_term", "utm_content"];
+  utmKeys.forEach((key) => {
+    if (params.has(key)) {
+      utmParams[key] = params.get(key);
+    }
+  });
+  return utmParams;
+}
+function getConversionData() {
+  return {
+    browser: getBrowser(),
+    os: getOS(),
+    screenSize: getScreenSize(),
+    sessionId: getSessionId(),
+    utmParams: getUTMParams()
+  };
+}
 var API_ENDPOINT;
 var initRequest = ({
   publicKey,
@@ -274,7 +415,7 @@ var initRequest = ({
   domain
   //sessionDurationDays
 }) => {
-  const { sendRequest } = createRequestHandler({
+  const { sendRequest, sendRequestWithFetch } = createRequestHandler({
     publicKey,
     token,
     customEndpoint: domain,
@@ -282,6 +423,26 @@ var initRequest = ({
   });
   API_ENDPOINT = domain;
   return {
+    _Event(params) {
+      return __async(this, null, function* () {
+        const payload = __spreadValues(__spreadValues({}, params.data), getConversionData());
+        return sendRequestWithFetch({
+          method: "POST" /* POST */,
+          url: `/event`,
+          data: payload
+        });
+      });
+    },
+    deleteMember() {
+      return __async(this, null, function* () {
+        const data = yield sendRequest({
+          method: "DELETE" /* DELETE */,
+          url: `/member`
+        });
+        unsetPersistedMember();
+        return data;
+      });
+    },
     postIsTyping(params) {
       return __async(this, null, function* () {
         return sendRequest({
@@ -452,6 +613,7 @@ var initRequest = ({
       return __async(this, null, function* () {
         const customFields = encodeURIComponent(params.customFields ? JSON.stringify(params.customFields) : "{}");
         const plans = encodeURIComponent(params.plans ? JSON.stringify(params.plans) : "[]");
+        const conversionData = getConversionData();
         const queryParams = new URLSearchParams(__spreadProps(__spreadValues({
           provider: params.provider,
           customFields,
@@ -460,7 +622,12 @@ var initRequest = ({
         }, publicKey && {
           publicKey
         }), {
-          origin: window.location.hostname
+          url: window.location.pathname,
+          origin: window.location.hostname,
+          sessionId: conversionData.sessionId,
+          browser: conversionData.browser,
+          os: conversionData.os,
+          screenSize: conversionData.screenSize
         }));
         return openSignInWindow(`${domain}/auth-provider/signup?${queryParams}`, "signup");
       });
@@ -507,15 +674,29 @@ var initRequest = ({
     },
     getAppAndMember(params) {
       return __async(this, null, function* () {
-        const queryParams = new URLSearchParams({
-          // @ts-ignore
-          includeSSOText: window == null ? void 0 : window.ssoUI,
-          trackPageView: params == null ? void 0 : params.trackPageView
-        });
-        return sendRequest({
-          method: "GET" /* GET */,
-          url: `/app-member?${queryParams}`
+        var _a2, _b;
+        const data = yield sendRequest({
+          method: "POST" /* POST */,
+          url: `/app-member`,
+          data: {
+            email: params.email,
+            password: params.password,
+            data: {
+              // @ts-ignore
+              includeSSOText: window == null ? void 0 : window.ssoUI,
+              trackPageView: params == null ? void 0 : params.trackPageView,
+              sessionData: __spreadValues({}, getConversionData())
+            }
+          }
         });
+        try {
+          const backendSessionId = (_b = (_a2 = data.data) == null ? void 0 : _a2.sessionData) == null ? void 0 : _b.sessionId;
+          const storedSessionId = getSessionId();
+          if (storedSessionId !== backendSessionId)
+            setSessionId(backendSessionId);
+        } catch (e) {
+        }
+        return data;
       });
     },
     getApp() {
@@ -700,7 +881,10 @@ var initRequest = ({
             //window.location requires dom
             success_url,
             cancel_url,
-            origin_url: window.location.href
+            origin_url: window.location.href,
+            conversionData: __spreadValues({
+              url: window.location.pathname
+            }, getConversionData())
           },
           headers: addHeaders(options)
         });
@@ -791,7 +975,7 @@ var initRequest = ({
     },
     signupMemberPasswordless(params, options) {
       return __async(this, null, function* () {
-        var _a2, _b;
+        var _a2, _b, _c;
         const data = yield sendRequest({
           method: "POST" /* POST */,
           url: `/auth/signup?isPasswordless=true`,
@@ -803,13 +987,16 @@ var initRequest = ({
           }, params.plans && { plans: params.plans }), {
             //internal use only
             origin_domain: window.location.origin,
+            conversionData: __spreadValues(__spreadProps(__spreadValues({}, (_a2 = params == null ? void 0 : params.conversionData) != null ? _a2 : {}), {
+              url: window.location.pathname
+            }), getConversionData()),
             options
-          }), ((_a2 = window.Rewardful) == null ? void 0 : _a2.referral) && {
+          }), ((_b = window.Rewardful) == null ? void 0 : _b.referral) && {
             rewardfulData: {
               // @ts-ignore
               referral: window.Rewardful.referral,
               // @ts-ignore
-              coupon: (_b = window.Rewardful.coupon) == null ? void 0 : _b.id
+              coupon: (_c = window.Rewardful.coupon) == null ? void 0 : _c.id
             }
           })
         });
@@ -821,7 +1008,7 @@ var initRequest = ({
     },
     signupMemberEmailPassword(params, options) {
       return __async(this, null, function* () {
-        var _a2, _b;
+        var _a2, _b, _c;
         const data = yield sendRequest({
           method: "POST" /* POST */,
           url: `/auth/signup`,
@@ -835,13 +1022,16 @@ var initRequest = ({
           }, params.plans && { plans: params.plans }), {
             //internal use only
             origin_domain: window.location.origin,
+            conversionData: __spreadValues(__spreadProps(__spreadValues({}, (_a2 = params == null ? void 0 : params.conversionData) != null ? _a2 : {}), {
+              url: window.location.pathname
+            }), getConversionData()),
             options
-          }), ((_a2 = window.Rewardful) == null ? void 0 : _a2.referral) && {
+          }), ((_b = window.Rewardful) == null ? void 0 : _b.referral) && {
             rewardfulData: {
               // @ts-ignore
               referral: window.Rewardful.referral,
               // @ts-ignore
-              coupon: (_b = window.Rewardful.coupon) == null ? void 0 : _b.id
+              coupon: (_c = window.Rewardful.coupon) == null ? void 0 : _c.id
             }
           })
         });
@@ -956,6 +1146,98 @@ var initRequest = ({
         unsetPersistedMember();
         return data;
       });
+    },
+    // Data Tables Methods
+    getDataTables(options) {
+      return __async(this, null, function* () {
+        return sendRequest({
+          method: "GET" /* GET */,
+          url: `/data-tables`,
+          headers: addHeaders(options)
+        });
+      });
+    },
+    getDataTable(params, options) {
+      return __async(this, null, function* () {
+        return sendRequest({
+          method: "GET" /* GET */,
+          url: `/data-tables/${params.tableKey}`,
+          headers: addHeaders(options)
+        });
+      });
+    },
+    getDataRecords(params, options) {
+      return __async(this, null, function* () {
+        const queryParams = new URLSearchParams(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues(__spreadValues({
+          tableKey: params.tableKey
+        }, params.memberId && { memberId: params.memberId }), params.createdAfter && { createdAfter: params.createdAfter }), params.createdBefore && { createdBefore: params.createdBefore }), params.sortBy && { sortBy: params.sortBy }), params.sortDirection && { sortDirection: params.sortDirection }), params.limit && { limit: params.limit.toString() }), params.after && { after: params.after }));
+        Object.keys(params).forEach((key) => {
+          if (!["tableKey", "memberId", "createdAfter", "createdBefore", "sortBy", "sortDirection", "limit", "after"].includes(key)) {
+            queryParams.append(key, params[key]);
+          }
+        });
+        return sendRequest({
+          method: "GET" /* GET */,
+          url: `/data-records?${queryParams}`,
+          headers: addHeaders(options)
+        });
+      });
+    },
+    createDataRecord(params, options) {
+      return __async(this, null, function* () {
+        return sendRequest({
+          method: "POST" /* POST */,
+          url: `/data-records`,
+          data: __spreadValues({
+            tableKey: params.tableKey,
+            data: params.data
+          }, params.memberId && { memberId: params.memberId }),
+          headers: addHeaders(options)
+        });
+      });
+    },
+    getDataRecord(params, options) {
+      return __async(this, null, function* () {
+        return sendRequest({
+          method: "GET" /* GET */,
+          url: `/data-records/${params.recordId}`,
+          headers: addHeaders(options)
+        });
+      });
+    },
+    updateDataRecord(params, options) {
+      return __async(this, null, function* () {
+        return sendRequest({
+          method: "PUT" /* PUT */,
+          url: `/data-records/${params.recordId}`,
+          data: {
+            data: params.data
+          },
+          headers: addHeaders(options)
+        });
+      });
+    },
+    deleteDataRecord(params, options) {
+      return __async(this, null, function* () {
+        return sendRequest({
+          method: "DELETE" /* DELETE */,
+          url: `/data-records/${params.recordId}`,
+          headers: addHeaders(options)
+        });
+      });
+    },
+    queryDataRecords(params, options) {
+      return __async(this, null, function* () {
+        return sendRequest({
+          method: "POST" /* POST */,
+          url: `/data-records/query`,
+          data: {
+            table: params.table,
+            query: params.query
+          },
+          headers: addHeaders(options)
+        });
+      });
     }
   };
 };

package/lib/methods/requests/requests.d.mts

@@ -2,6 +2,7 @@ declare enum HttpMethod {
     POST = "POST",
     GET = "GET",
     PATCH = "PATCH",
+    PUT = "PUT",
     DELETE = "DELETE"
 }
 declare enum HttpHeaders {
@@ -9,7 +10,8 @@ declare enum HttpHeaders {
     API_KEY = "X-API-Key",
     APP_ID = "X-APP-ID",
     API_VERSION = "X-API-Version",
-    USER_AGENT = "X-User-Agent"
+    USER_AGENT = "X-User-Agent",
+    SESSION_ID = "X-Session-ID"
 }
 declare const createRequestHandler: ({ publicKey, appId, token, customEndpoint, }: {
     publicKey: any;
@@ -26,6 +28,15 @@ declare const createRequestHandler: ({ publicKey, appId, token, customEndpoint,
     }, options?: {
         token?: string;
     }) => Promise<any>;
+    sendRequestWithFetch: (data: {
+        method: HttpMethod;
+        url: string;
+        data?: object;
+        headers?: object;
+        contentType?: string;
+    }, options?: {
+        token?: string;
+    }) => Promise<any>;
 };
 
 export { HttpHeaders, HttpMethod, createRequestHandler };

package/lib/methods/requests/requests.d.ts

@@ -2,6 +2,7 @@ declare enum HttpMethod {
     POST = "POST",
     GET = "GET",
     PATCH = "PATCH",
+    PUT = "PUT",
     DELETE = "DELETE"
 }
 declare enum HttpHeaders {
@@ -9,7 +10,8 @@ declare enum HttpHeaders {
     API_KEY = "X-API-Key",
     APP_ID = "X-APP-ID",
     API_VERSION = "X-API-Version",
-    USER_AGENT = "X-User-Agent"
+    USER_AGENT = "X-User-Agent",
+    SESSION_ID = "X-Session-ID"
 }
 declare const createRequestHandler: ({ publicKey, appId, token, customEndpoint, }: {
     publicKey: any;
@@ -26,6 +28,15 @@ declare const createRequestHandler: ({ publicKey, appId, token, customEndpoint,
     }, options?: {
         token?: string;
     }) => Promise<any>;
+    sendRequestWithFetch: (data: {
+        method: HttpMethod;
+        url: string;
+        data?: object;
+        headers?: object;
+        contentType?: string;
+    }, options?: {
+        token?: string;
+    }) => Promise<any>;
 };
 
 export { HttpHeaders, HttpMethod, createRequestHandler };