@memberstack/dom 1.9.1 → 1.9.2

package/lib/index.d.ts

@@ -53,7 +53,7 @@ declare const _default: {
         }, options?: {
             onCompleted?: (x: any) => any;
             onError?: (x: any) => any;
-        }) => Promise<HTMLIFrameElement>;
+        }) => Promise<unknown>;
     };
 };
 export default _default;

package/lib/methods/dom/methods.d.ts

@@ -16,5 +16,6 @@ export declare const load: (props: {
 export declare const showMessage: (msg: any, isError: any) => void;
 export declare const showLoader: (element?: any) => void;
 export declare const hideLoader: (element?: any) => void;
-export declare const openModal: (props: OpenModalParams & DOMConfig) => Promise<HTMLIFrameElement>;
+export declare const handleRedirect: (redirect: any, redirectOverride: any) => any;
+export declare const openModal: (props: OpenModalParams & DOMConfig) => Promise<unknown>;
 export declare const hideModal: () => void;

package/lib/methods/dom/methods.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -46,30 +35,16 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hideModal = exports.openModal = exports.hideLoader = exports.showLoader = exports.showMessage = exports.load = void 0;
+exports.hideModal = exports.openModal = exports.handleRedirect = exports.hideLoader = exports.showLoader = exports.showMessage = exports.load = void 0;
 var window_1 = require("../../constants/window");
 var endpoint_1 = require("../../constants/endpoint");
-var cookies_1 = require("../../utils/cookies");
-var persistence_1 = require("../../auth/persistence");
 var logger_1 = require("../../utils/logger");
-var cookies_2 = require("../../utils/cookies");
+//const Modal = () => import("../../../../prebuilt-uis/public/build/main-dom.js")
+var main_dom_js_1 = __importDefault(require("./main-dom.js"));
 var isBrowser = typeof window !== "undefined";
 var isInitialized = function () {
     if (!isBrowser)
@@ -130,16 +105,6 @@ var TYPE_PARAMS = {
     FORGOT_PASSWORD: "sendResetEmail",
     PROFILE: "profile",
 };
-var createLink = function (query) {
-    var _a = query.planId, planId = _a === void 0 ? "" : _a, _b = query.appId, appId = _b === void 0 ? "" : _b, _c = query.page, page = _c === void 0 ? "" : _c, _d = query.priceId, priceId = _d === void 0 ? "" : _d, _e = query.pk, pk = _e === void 0 ? "" : _e, _f = query.hideNav, hideNav = _f === void 0 ? "" : _f, _g = query.token, token = _g === void 0 ? "" : _g;
-    var queryParams = Object.keys({ priceId: priceId, pk: pk, hideNav: hideNav, token: token })
-        .map(function (key) { return query[key] && encodeURIComponent(key) + "=" + encodeURIComponent(query[key]); })
-        .filter(function (x) { return x; })
-        .join("&");
-    console.log("CREATE LINK", token);
-    var baseUrl = endpoint_1.endpoints.hostedUI + "/" + (appId || "") + (page ? "/" + page : "") + (planId ? (page === "signup" ? "/" + planId : "?planId=" + planId) : "");
-    return "" + baseUrl + (baseUrl.includes("?planId") ? "&" : "?") + queryParams;
-};
 var showMessage = function (msg, isError) {
     var cssEl = document.createElement("style");
     var css = ".ms-error-message { position: fixed; left: 5%; right: 5%; bottom: 3%; z-index: 10000000; display: block; margin-right: auto; margin-left: auto; padding-top: 1em; padding-right: 10px; padding-bottom: 1em; border-radius: 3px; background-color: #fd3a57; box-shadow: 0 0 0 2px #fff; color: #fff; font-size: 1.1em; line-height: 1.8em; font-weight: 700; text-align: center; }";
@@ -184,73 +149,38 @@ var hideLoader = function (element) {
     (_a = document.querySelector("[data-ms-loader]")) === null || _a === void 0 ? void 0 : _a.remove();
 };
 exports.hideLoader = hideLoader;
+var handleRedirect = function (redirect, redirectOverride) {
+    if (redirectOverride)
+        return window.location.href = redirectOverride;
+    if (redirect && (window.location.pathname !== redirect))
+        return window.location.href = redirect;
+};
+exports.handleRedirect = handleRedirect;
 var openModal = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-    var appId, page, token, link, div, iframe, iframestyles;
-    var _a, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            case 0:
-                (0, logger_1.log)("call openModal()");
-                (0, exports.showLoader)();
-                return [4 /*yield*/, getAppId(props.publicKey)];
-            case 1:
-                appId = _c.sent();
-                page = TYPE_PARAMS[props.type];
-                if (props.type === "PROFILE") {
-                    token = (0, cookies_2.getMemberCookie)();
-                }
-                link = createLink(__assign({ pk: props.publicKey, planId: (_a = props.params) === null || _a === void 0 ? void 0 : _a.planId, priceId: (_b = props.params) === null || _b === void 0 ? void 0 : _b.priceId, appId: appId, page: page }, (token ? { token: token } : {})));
-                div = document.createElement("div");
-                div.setAttribute("data-ms-iframe", "true");
-                div.style["position"] = "fixed";
-                div.style["top"] = "0";
-                div.style["left"] = "0";
-                div.style["zIndex"] = "10000000";
-                iframe = document.createElement("iframe");
-                iframestyles = {
-                    height: "100vh",
-                    width: "100vw",
-                    position: "absolute",
-                    top: 0,
-                    bottom: 0,
-                    border: "none",
-                    zIndex: "2000000",
-                };
-                Object.entries(iframestyles).map(function (_a) {
-                    var _b = __read(_a, 2), attr = _b[0], value = _b[1];
-                    iframe.style[attr] = value;
-                });
-                iframe.setAttribute("src", link);
-                iframe.addEventListener("load", function () {
-                    (0, exports.hideLoader)();
-                });
-                div.append(iframe);
-                document.body.appendChild(div);
-                window.addEventListener("message", function (e) {
-                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-                    if (e.data.type === "CLOSE") {
-                        return (0, exports.hideModal)();
-                    }
-                    if ((_b = (_a = e.data) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.member) {
-                        (0, persistence_1.setPersistedMember)((_c = e.data) === null || _c === void 0 ? void 0 : _c.data.member, props.persistence);
-                    }
-                    if (props.useCookie && ((_f = (_e = (_d = e.data) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.tokens) === null || _f === void 0 ? void 0 : _f.accessToken)) {
-                        (0, cookies_1.setMemberCookie)(e.data.data.tokens.accessToken);
-                    }
-                    // added to prevent non memberstack messages being sent from window
-                    if (e.origin === endpoint_1.endpoints.hostedUI && ((_g = e.data) === null || _g === void 0 ? void 0 : _g.data)) {
-                        (_j = (_h = props.options) === null || _h === void 0 ? void 0 : _h.onCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, (_k = e.data) === null || _k === void 0 ? void 0 : _k.data);
-                    }
-                });
-                return [2 /*return*/, iframe];
-        }
+    var params, resolveModal, modalPromise;
+    return __generator(this, function (_a) {
+        (0, logger_1.log)("call openModal()");
+        params = props.params || {};
+        modalPromise = new Promise(function (resolve) {
+            resolveModal = resolve;
+        });
+        //const { default: component } = await Modal()
+        new main_dom_js_1.default({
+            target: document.body,
+            props: {
+                display: props.type.toLowerCase(),
+                params: params,
+                onSuccess: resolveModal,
+            }
+        });
+        return [2 /*return*/, modalPromise];
     });
 }); };
 exports.openModal = openModal;
 var hideModal = function () {
     var _a;
     (0, logger_1.log)("call hideModal()");
-    (_a = document.querySelector("[data-ms-iframe]")) === null || _a === void 0 ? void 0 : _a.remove();
+    (_a = document.querySelector("#msOverlay")) === null || _a === void 0 ? void 0 : _a.remove();
     (0, exports.hideLoader)();
 };
 exports.hideModal = hideModal;

package/lib/methods/index.d.ts

@@ -68,7 +68,7 @@ declare const _default: {
         }, options?: {
             onCompleted?: (x: any) => any;
             onError?: (x: any) => any;
-        }) => Promise<HTMLIFrameElement>;
+        }) => Promise<unknown>;
     };
 };
 export default _default;

package/lib/methods/index.js

@@ -72,6 +72,9 @@ function init(props) {
     }
     var client = (0, proxy_1.default)((0, client_1.initClient)(__assign(__assign({}, props), { onMemberToken: function (token) { return (0, interceptor_1.handleMemberToken)({ persistence: props.persistence, token: token }); } })), props);
     var methods = DOMMethods(props);
-    return Object.assign(client, methods);
+    var dom = Object.assign(client, methods);
+    //@ts-ignore
+    window.$memberstackDom = dom;
+    return dom;
 }
 exports.default = { init: function (props) { return init(props); } };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberstack/dom",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "main": "./lib/index.js",
   "files": [
     "lib/**/*"
@@ -8,11 +8,11 @@
   "author": "Lydia Hallie",
   "license": "MIT",
   "dependencies": {
-    "@memberstack/client": "^1.8.0",
+    "@memberstack/client": "^1.9.2",
     "js-cookie": "^3.0.1"
   },
   "scripts": {
-    "prepublishOnly": "npx tsc",
+    "prepublishOnly": "yarn workspace prebuilt-uis build && npx tsc",
     "watch": "tsc-watch",
     "watch:dev": "tsc-watch --onSuccess 'yarn replace:vars:local'",
     "clean": "rm -rf node_modules",
@@ -21,4 +21,4 @@
     "deploy:next": "npx np --tag next --no-tests --any-branch",
     "build:local": "npx tsc"
   }
-}
+}

package/lib/constants/request.d.ts

@@ -1,10 +0,0 @@
-export declare enum HttpMethod {
-    POST = "POST",
-    GET = "GET"
-}
-export declare enum HttpHeaders {
-    AUTHORIZATION = "Authorization",
-    API_KEY = "X-API-Key",
-    API_VERSION = "X-API-Version",
-    USER_AGENT = "X-User-Agent"
-}

package/lib/constants/request.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpHeaders = exports.HttpMethod = void 0;
-var HttpMethod;
-(function (HttpMethod) {
-    HttpMethod["POST"] = "POST";
-    HttpMethod["GET"] = "GET";
-})(HttpMethod = exports.HttpMethod || (exports.HttpMethod = {}));
-var HttpHeaders;
-(function (HttpHeaders) {
-    HttpHeaders["AUTHORIZATION"] = "Authorization";
-    HttpHeaders["API_KEY"] = "X-API-Key";
-    HttpHeaders["API_VERSION"] = "X-API-Version";
-    HttpHeaders["USER_AGENT"] = "X-User-Agent";
-})(HttpHeaders = exports.HttpHeaders || (exports.HttpHeaders = {}));

package/lib/methods/client/index.d.ts

@@ -1,85 +0,0 @@
-import * as Params from "../../types/params";
-import * as Payloads from "../../types/payloads";
-export interface MemberstackOptions {
-    token?: BearerToken;
-}
-export interface ClientConfig {
-    publicKey: string;
-    token?: string;
-    apiVersion?: "2021-01-07" | "2022-01-01";
-    onMemberToken?: (x?: string) => any;
-    debug?: boolean;
-    customEndpoint?: string;
-}
-declare type BearerToken = string;
-export declare const init: ({ publicKey, token, apiVersion, onMemberToken, debug, customEndpoint, }: ClientConfig) => {
-    getApp(): Promise<Payloads.AppPayload>;
-    getAuthProviders(): Promise<Payloads.AppPayload>;
-    loginMemberEmailPassword(params: Params.LoginMemberEmailPasswordParams): Promise<Payloads.LoginMemberEmailPasswordPayload>;
-    loginMemberAuthProvider(params: Params.LoginMemberAuthProviderParams): Promise<Payloads.LoginMemberAuthProviderPayload>;
-    getPlan(params: Params.GetPlanParams): Promise<Payloads.GetPlanPayload>;
-    getPlans(params?: Params.GetPlansParams): Promise<Payloads.GetPlansPayload>;
-    getRestrictedUrlGroups(): Promise<Payloads.GetRestrictedUrlGroupsPayload>;
-    getCurrentMember(options?: MemberstackOptions): Promise<Payloads.GetCurrentMemberPayload>;
-    getMemberCards(options?: MemberstackOptions): Promise<Payloads.GetMemberCardsPayload>;
-    getMemberInvoices(params?: Params.GetMemberInvoicesParams, options?: MemberstackOptions): Promise<Payloads.GetMemberInvoicesPayload>;
-    getMemberReceipts(params?: Params.GetMemberReceiptsParams, options?: MemberstackOptions): Promise<Payloads.GetMemberReceiptsPayload>;
-    getAuthenticationClientSecret(params: Params.GetAuthenticationClientSecretParams, options?: MemberstackOptions): Promise<Payloads.GetAuthenticationClientSecretPayload>;
-    getTotalCheckoutAmount(params: Params.GetTotalCheckoutAmountParams, options?: MemberstackOptions): Promise<Payloads.GetTotalCheckoutAmountPayload>;
-    purchasePlans(params: Params.PurchasePlansParams, options?: MemberstackOptions): Promise<Payloads.PurchasePlansPayload>;
-    cancelPlan(params: Params.CancelPlanParams, options?: MemberstackOptions): Promise<Payloads.CancelPlanPayload>;
-    updateMember(params: Params.UpdateMemberParams, options?: MemberstackOptions): Promise<Payloads.UpdateMemberPayload>;
-    updateMemberAuth(params: Params.UpdateMemberAuthParams, options?: MemberstackOptions): Promise<Payloads.UpdateMemberAuthPayload>;
-    addCard(params: Params.AddMemberCardParams, options?: MemberstackOptions): Promise<Payloads.AddMemberCardPayload>;
-    updateDefaultCard(params: Params.UpdateDefaultCardParams, options?: MemberstackOptions): Promise<Payloads.UpdateDefaultCardPayload>;
-    updatePlanPayment(params: Params.UpdatePlanPaymentParams, options?: MemberstackOptions): Promise<Payloads.UpdatePlanPaymentPayload>;
-    signupMemberEmailPassword(params: Params.SignupMemberEmailPasswordParams): Promise<Payloads.SignupMemberEmailPasswordPayload>;
-    signupMemberAuthProvider(params: Params.SignupMemberAuthProviderParams): Promise<Payloads.SignupMemberAuthProviderPayload>;
-    sendMemberResetPasswordEmail(params: Params.SendMemberResetPasswordEmailParams): Promise<Payloads.SendMemberResetPasswordEmailPayload>;
-    resetMemberPassword(params: Params.ResetMemberPasswordParams): Promise<Payloads.ResetMemberPasswordPayload>;
-    logout(options?: MemberstackOptions): Promise<Payloads.LogoutMemberPayload>;
-    replacePlan(params: Params.ReplacePlanParams, options?: MemberstackOptions): Promise<Payloads.ReplacePlanPayload>;
-    verifyToken({ token }: {
-        token: string;
-    }): Promise<Pick<import("jose").JWTPayload, "iat" | "exp"> & {
-        id: string;
-        type: "member";
-    }>;
-};
-export declare const Methods: {
-    init: ({ publicKey, token, apiVersion, onMemberToken, debug, customEndpoint, }: ClientConfig) => {
-        getApp(): Promise<Payloads.AppPayload>;
-        getAuthProviders(): Promise<Payloads.AppPayload>;
-        loginMemberEmailPassword(params: Params.LoginMemberEmailPasswordParams): Promise<Payloads.LoginMemberEmailPasswordPayload>;
-        loginMemberAuthProvider(params: Params.LoginMemberAuthProviderParams): Promise<Payloads.LoginMemberAuthProviderPayload>;
-        getPlan(params: Params.GetPlanParams): Promise<Payloads.GetPlanPayload>;
-        getPlans(params?: Params.GetPlansParams): Promise<Payloads.GetPlansPayload>;
-        getRestrictedUrlGroups(): Promise<Payloads.GetRestrictedUrlGroupsPayload>;
-        getCurrentMember(options?: MemberstackOptions): Promise<Payloads.GetCurrentMemberPayload>;
-        getMemberCards(options?: MemberstackOptions): Promise<Payloads.GetMemberCardsPayload>;
-        getMemberInvoices(params?: Params.GetMemberInvoicesParams, options?: MemberstackOptions): Promise<Payloads.GetMemberInvoicesPayload>;
-        getMemberReceipts(params?: Params.GetMemberReceiptsParams, options?: MemberstackOptions): Promise<Payloads.GetMemberReceiptsPayload>;
-        getAuthenticationClientSecret(params: Params.GetAuthenticationClientSecretParams, options?: MemberstackOptions): Promise<Payloads.GetAuthenticationClientSecretPayload>;
-        getTotalCheckoutAmount(params: Params.GetTotalCheckoutAmountParams, options?: MemberstackOptions): Promise<Payloads.GetTotalCheckoutAmountPayload>;
-        purchasePlans(params: Params.PurchasePlansParams, options?: MemberstackOptions): Promise<Payloads.PurchasePlansPayload>;
-        cancelPlan(params: Params.CancelPlanParams, options?: MemberstackOptions): Promise<Payloads.CancelPlanPayload>;
-        updateMember(params: Params.UpdateMemberParams, options?: MemberstackOptions): Promise<Payloads.UpdateMemberPayload>;
-        updateMemberAuth(params: Params.UpdateMemberAuthParams, options?: MemberstackOptions): Promise<Payloads.UpdateMemberAuthPayload>;
-        addCard(params: Params.AddMemberCardParams, options?: MemberstackOptions): Promise<Payloads.AddMemberCardPayload>;
-        updateDefaultCard(params: Params.UpdateDefaultCardParams, options?: MemberstackOptions): Promise<Payloads.UpdateDefaultCardPayload>;
-        updatePlanPayment(params: Params.UpdatePlanPaymentParams, options?: MemberstackOptions): Promise<Payloads.UpdatePlanPaymentPayload>;
-        signupMemberEmailPassword(params: Params.SignupMemberEmailPasswordParams): Promise<Payloads.SignupMemberEmailPasswordPayload>;
-        signupMemberAuthProvider(params: Params.SignupMemberAuthProviderParams): Promise<Payloads.SignupMemberAuthProviderPayload>;
-        sendMemberResetPasswordEmail(params: Params.SendMemberResetPasswordEmailParams): Promise<Payloads.SendMemberResetPasswordEmailPayload>;
-        resetMemberPassword(params: Params.ResetMemberPasswordParams): Promise<Payloads.ResetMemberPasswordPayload>;
-        logout(options?: MemberstackOptions): Promise<Payloads.LogoutMemberPayload>;
-        replacePlan(params: Params.ReplacePlanParams, options?: MemberstackOptions): Promise<Payloads.ReplacePlanPayload>;
-        verifyToken({ token }: {
-            token: string;
-        }): Promise<Pick<import("jose").JWTPayload, "iat" | "exp"> & {
-            id: string;
-            type: "member";
-        }>;
-    };
-};
-export {};