@memberstack/dom 1.6.0 → 1.9.0

package/lib/index.d.ts

@@ -31,7 +31,7 @@ declare const _default: {
         resetMemberPassword(params: import("@memberstack/client/lib/types/params").ResetMemberPasswordParams): Promise<import("@memberstack/client/lib/types/payloads").ResetMemberPasswordPayload>;
         logout(options?: import("@memberstack/client/lib/methods").MemberstackOptions): Promise<import("@memberstack/client/lib/types/payloads").LogoutMemberPayload>;
         replacePlan(params: import("@memberstack/client/lib/types/params").ReplacePlanParams, options?: import("@memberstack/client/lib/methods").MemberstackOptions): Promise<import("@memberstack/client/lib/types/payloads").ReplacePlanPayload>;
-        verifyToken({ token }: {
+        decodeToken({ token }: {
             token: string;
         }): Promise<Pick<import("jose").JWTPayload, "iat" | "exp"> & {
             id: string;
@@ -43,6 +43,7 @@ declare const _default: {
         onAuthChange: (cb: any) => {
             unsubscribe: () => boolean;
         };
+        getMemberCookie: () => string;
         _showLoader: (element?: any) => void;
         _hideLoader: (element?: any) => void;
         _showMessage: (msg: any, isError: any) => void;
@@ -52,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/client.d.ts

@@ -34,7 +34,7 @@ export declare const initClient: ({ useCookie, ...props }: ClientConfig) => {
     resetMemberPassword(params: import("@memberstack/client/lib/types/params").ResetMemberPasswordParams): Promise<import("@memberstack/client/lib/types/payloads").ResetMemberPasswordPayload>;
     logout(options?: import("@memberstack/client/lib/methods").MemberstackOptions): Promise<import("@memberstack/client/lib/types/payloads").LogoutMemberPayload>;
     replacePlan(params: import("@memberstack/client/lib/types/params").ReplacePlanParams, options?: import("@memberstack/client/lib/methods").MemberstackOptions): Promise<import("@memberstack/client/lib/types/payloads").ReplacePlanPayload>;
-    verifyToken({ token }: {
+    decodeToken({ token }: {
         token: string;
     }): Promise<Pick<import("jose").JWTPayload, "iat" | "exp"> & {
         id: string;

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,14 +1,22 @@
 "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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -46,30 +54,12 @@ 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;
-};
 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");
+var Modal = function () { return Promise.resolve().then(function () { return __importStar(require("../../../../prebuilt-uis/public/build/main-dom.js")); }); };
 var isBrowser = typeof window !== "undefined";
 var isInitialized = function () {
     if (!isBrowser)
@@ -184,62 +174,35 @@ 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) {
+    var params, resolveModal, modalPromise, component;
+    return __generator(this, function (_a) {
+        switch (_a.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)();
+                params = props.params || {};
+                modalPromise = new Promise(function (resolve) {
+                    resolveModal = resolve;
                 });
-                div.append(iframe);
-                document.body.appendChild(div);
-                window.addEventListener("message", function (e) {
-                    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-                    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);
+                return [4 /*yield*/, Modal()];
+            case 1:
+                component = (_a.sent()).default;
+                new component({
+                    target: document.body,
+                    props: {
+                        display: props.type.toLowerCase(),
+                        params: params,
+                        onSuccess: resolveModal,
                     }
-                    (_h = (_g = props.options) === null || _g === void 0 ? void 0 : _g.onCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, (_j = e.data) === null || _j === void 0 ? void 0 : _j.data);
                 });
-                return [2 /*return*/, iframe];
+                return [2 /*return*/, modalPromise];
         }
     });
 }); };
@@ -247,7 +210,7 @@ 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

@@ -46,7 +46,7 @@ declare const _default: {
         resetMemberPassword(params: import("@memberstack/client/lib/types/params").ResetMemberPasswordParams): Promise<import("@memberstack/client/lib/types/payloads").ResetMemberPasswordPayload>;
         logout(options?: import("@memberstack/client/lib/methods").MemberstackOptions): Promise<import("@memberstack/client/lib/types/payloads").LogoutMemberPayload>;
         replacePlan(params: import("@memberstack/client/lib/types/params").ReplacePlanParams, options?: import("@memberstack/client/lib/methods").MemberstackOptions): Promise<import("@memberstack/client/lib/types/payloads").ReplacePlanPayload>;
-        verifyToken({ token }: {
+        decodeToken({ token }: {
             token: string;
         }): Promise<Pick<import("jose").JWTPayload, "iat" | "exp"> & {
             id: string;
@@ -58,6 +58,7 @@ declare const _default: {
         onAuthChange: (cb: any) => {
             unsubscribe: () => boolean;
         };
+        getMemberCookie: () => string;
         _showLoader: (element?: any) => void;
         _hideLoader: (element?: any) => void;
         _showMessage: (msg: any, isError: any) => void;
@@ -67,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

@@ -50,12 +50,14 @@ var DOM = __importStar(require("./dom/methods"));
 var client_1 = require("./client");
 var interceptor_1 = require("../utils/interceptor");
 var logger_1 = require("../utils/logger");
+var cookies_1 = require("../utils/cookies");
 var DOMMethods = function (_a) {
     var _b = _a.useCookie, useCookie = _b === void 0 ? true : _b, _c = _a.persistence, persistence = _c === void 0 ? persistence_1.Persistence.LOCAL : _c, props = __rest(_a, ["useCookie", "persistence"]);
     return ({
         load: function () { return DOM.load({ publicKey: props.publicKey }); },
         hideModal: DOM.hideModal,
         onAuthChange: persistence_1.onAuthChange,
+        getMemberCookie: function () { return (0, cookies_1.getMemberCookie)(); },
         _showLoader: DOM.showLoader,
         _hideLoader: DOM.hideLoader,
         _showMessage: DOM.showMessage,
@@ -64,8 +66,15 @@ var DOMMethods = function (_a) {
 };
 function init(props) {
     (0, logger_1.initializeLogger)(props.debug);
+    // added because default persistence is not being set in DOMMethods above
+    if (!props.persistence) {
+        props.persistence = persistence_1.Persistence.LOCAL;
+    }
     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/lib/utils/proxy.js

@@ -71,11 +71,15 @@ var handleResponse = function (fn, props) {
         var result = fn.apply(void 0, __spreadArray([], __read(args), false));
         if (result === null || result === void 0 ? void 0 : result.then) {
             return result.then(function (res) {
-                var _a, _b, _c, _d;
+                var _a, _b, _c, _d, _e;
                 if ((_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.member) {
                     (0, persistence_1.setPersistedMember)((_b = res.data) === null || _b === void 0 ? void 0 : _b.member, props.persistence);
                 }
                 if ((_d = (_c = res === null || res === void 0 ? void 0 : res.data) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.startsWith("mem_")) {
+                    // added to prevent setting persisted member value with payload from logout response
+                    if (!((_e = res === null || res === void 0 ? void 0 : res.data) === null || _e === void 0 ? void 0 : _e.member)) {
+                        return res;
+                    }
                     (0, persistence_1.setPersistedMember)(res.data, props.persistence);
                 }
                 return res;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberstack/dom",
-  "version": "1.6.0",
+  "version": "1.9.0",
   "main": "./lib/index.js",
   "files": [
     "lib/**/*"
@@ -8,16 +8,17 @@
   "author": "Lydia Hallie",
   "license": "MIT",
   "dependencies": {
-    "@memberstack/client": "^1.6.0",
+    "@memberstack/client": "^1.9.0",
     "js-cookie": "^3.0.1"
   },
   "scripts": {
-    "prepublishOnly": "npx tsc",
-    "watch": "tsc-watch --onSuccess 'yarn replace:vars:local'",
+    "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",
     "replace:vars:local": "ts-node utils/replaceDynamicVars -development",
     "deploy:latest": "npx np --tag latest --no-tests --any-branch",
     "deploy:next": "npx np --tag next --no-tests --any-branch",
     "build:local": "npx tsc"
   }
-}
+}