@memberstack/dom 1.0.0-beta.27 → 1.0.0-beta.30

package/lib/methods/dom/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.initialize = exports.openModal = exports.load = exports.hideModal = void 0;
 var methods_1 = require("./methods");
 Object.defineProperty(exports, "hideModal", { enumerable: true, get: function () { return methods_1.hideModal; } });
 Object.defineProperty(exports, "load", { enumerable: true, get: function () { return methods_1.load; } });

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

@@ -3,7 +3,7 @@ export declare type OpenModalParams = {
     type: "LOGIN" | "SIGNUP" | "FORGOT_PASSWORD";
     params?: {
         planId?: string;
-        priceId?: string;
+        planPaymentOptionId?: string;
     };
     options?: {
         onCompleted?: (x: any) => any;
@@ -13,5 +13,5 @@ export declare type OpenModalParams = {
 export declare const load: (props: {
     publicKey: string;
 }) => void;
-export declare const openModal: (props: OpenModalParams & DOMConfig) => void;
+export declare const openModal: (props: OpenModalParams & DOMConfig) => Promise<void>;
 export declare const hideModal: () => void;

package/lib/methods/dom/methods.js

@@ -1,10 +1,48 @@
 "use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hideModal = exports.openModal = 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 script_1 = require("./script");
 var isBrowser = typeof window !== "undefined";
 var isInitialized = function () {
     if (!isBrowser)
@@ -26,36 +64,50 @@ var hasIFrame = function () {
     }
     return true;
 };
-exports.load = function (props) {
+var load = function (props) {
     var _a;
     if (isInitialized()) {
         (_a = window[window_1.Window.MSDOM]) === null || _a === void 0 ? void 0 : _a.load({ publicKey: props.publicKey });
     }
 };
-exports.openModal = function (props) {
+exports.load = load;
+var openModal = function (props) { return __awaiter(void 0, void 0, void 0, function () {
     var _a;
-    if (hasIFrame()) {
-        (_a = window[window_1.Window.MSDOM]) === null || _a === void 0 ? void 0 : _a.show(props.type, props.params);
-        window.addEventListener("message", function (e) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-            if (e.origin === endpoint_1.endpoints.parentOrigin) {
-                if (e.data.type === "CLOSE") {
-                    return exports.hideModal();
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0:
+                (0, logger_1.log)("call openModal()");
+                return [4 /*yield*/, script_1.hostedUIReady.isReady];
+            case 1:
+                _b.sent();
+                if (hasIFrame()) {
+                    (_a = window[window_1.Window.MSDOM]) === null || _a === void 0 ? void 0 : _a.show(props.type, props.params);
+                    window.addEventListener("message", function (e) {
+                        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+                        if (e.origin === endpoint_1.endpoints.parentOrigin) {
+                            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);
+                            }
+                            (_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);
+                        }
+                    });
                 }
-                if ((_b = (_a = e.data) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.member) {
-                    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)) {
-                    cookies_1.setMemberCookie(e.data.data.tokens.accessToken);
-                }
-                (_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);
-            }
-        });
-    }
-};
-exports.hideModal = function () {
+                return [2 /*return*/];
+        }
+    });
+}); };
+exports.openModal = openModal;
+var hideModal = function () {
     var _a;
+    (0, logger_1.log)("call hideModal()");
     if (hasIFrame()) {
         (_a = window[window_1.Window.MSDOM]) === null || _a === void 0 ? void 0 : _a.hide();
     }
 };
+exports.hideModal = hideModal;

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

@@ -1,3 +1,11 @@
 export declare function initialize(props: {
     publicKey: string;
 }): Promise<any>;
+export declare class HostedUI {
+    private __globalResolver;
+    private __isReady;
+    constructor();
+    get isReady(): Promise<void>;
+    resolve(): void;
+}
+export declare const hostedUIReady: HostedUI;

package/lib/methods/dom/script.js

@@ -36,14 +36,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initialize = void 0;
+exports.hostedUIReady = exports.HostedUI = exports.initialize = void 0;
 var endpoint_1 = require("../../constants/endpoint");
 var window_1 = require("../../constants/window");
+var logger_1 = require("../../utils/logger");
 var isBrowser = typeof window !== "undefined";
 var SCRIPT_URL = endpoint_1.endpoints.loaderScript;
 var SCRIPT_URL_REGEX = new RegExp(SCRIPT_URL);
 var getScript = function () {
-    var existingScript = document.querySelector("script[src^=\"" + SCRIPT_URL + "\"]");
+    var existingScript = document.querySelector("script[src^=\"".concat(SCRIPT_URL, "\"]"));
     if (existingScript && SCRIPT_URL_REGEX.test(existingScript.src)) {
         return existingScript;
     }
@@ -55,26 +56,61 @@ var getScript = function () {
         throw new Error("Memberstack requires a <body> element.");
     }
     document.body.appendChild(script);
+    (0, logger_1.log)("Appending script to load parent hosted UI");
     return script;
 };
 function initialize(props) {
     return __awaiter(this, void 0, void 0, function () {
         var script;
+        var _this = this;
         return __generator(this, function (_a) {
             if (!isBrowser)
                 return [2 /*return*/, null];
             script = getScript();
-            script.addEventListener("load", function () {
-                if (window[window_1.Window.MSDOM]) {
-                    window[window_1.Window.MSDOM].load({ publicKey: props.publicKey });
-                    console.info("\x1b[36m%s\x1b[0m", "Memberstack has been initialized");
-                }
-                else {
-                    console.warn("Could not initialize Memberstack.");
-                }
-            });
+            (0, logger_1.log)("Add script event listener for load");
+            script.addEventListener("load", function () { return __awaiter(_this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            (0, logger_1.log)("Hosted UI parent script loaded");
+                            if (!window[window_1.Window.MSDOM]) return [3 /*break*/, 2];
+                            (0, logger_1.log)("Call MSDOM load function, pass public key");
+                            return [4 /*yield*/, window[window_1.Window.MSDOM].load({ publicKey: props.publicKey })];
+                        case 1:
+                            _a.sent();
+                            exports.hostedUIReady.resolve();
+                            console.info("\x1b[36m%s\x1b[0m", "Memberstack has been initialized");
+                            return [3 /*break*/, 3];
+                        case 2:
+                            console.warn("Could not initialize Memberstack.");
+                            _a.label = 3;
+                        case 3: return [2 /*return*/];
+                    }
+                });
+            }); });
             return [2 /*return*/];
         });
     });
 }
 exports.initialize = initialize;
+var HostedUI = /** @class */ (function () {
+    function HostedUI() {
+        var _this = this;
+        this.__isReady = new Promise(function (resolve) {
+            _this.__globalResolver = resolve;
+        });
+    }
+    Object.defineProperty(HostedUI.prototype, "isReady", {
+        get: function () {
+            return this.__isReady;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    HostedUI.prototype.resolve = function () {
+        this.__globalResolver();
+    };
+    return HostedUI;
+}());
+exports.HostedUI = HostedUI;
+exports.hostedUIReady = new HostedUI();

package/lib/methods/index.d.ts

@@ -1,26 +1,18 @@
 import { Persistence } from "../auth/persistence";
-import * as DOM from "./dom/methods";
-import { initClient, ClientConfig } from "./client";
+import { ClientConfig } from "./client";
 declare global {
     interface Window {
         __MSDOM: any;
+        __MSDOMREADY: any;
         APP_ID: string;
     }
 }
 export declare type DOMConfig = ClientConfig & {
     persistence?: Persistence;
     useCookie: boolean;
+    debug?: boolean;
 };
-declare const DOMMethods: ({ useCookie, persistence, ...props }: DOMConfig) => {
-    load: () => void;
-    hideModal: () => void;
-    onAuthChange: (cb: any) => {
-        unsubscribe: () => boolean;
-    };
-    openModal: (type: DOM.OpenModalParams["type"], params?: DOM.OpenModalParams["params"], options?: DOM.OpenModalParams["options"]) => void;
-};
-export declare const init: (props: DOMConfig) => ReturnType<typeof initClient> & ReturnType<typeof DOMMethods>;
+export declare const init: (props: any) => any;
 export declare const Methods: {
-    init: (props: DOMConfig) => ReturnType<typeof initClient> & ReturnType<typeof DOMMethods>;
+    init: (props: any) => any;
 };
-export {};

package/lib/methods/index.js

@@ -25,7 +25,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };
@@ -50,6 +50,8 @@ var proxy_1 = __importDefault(require("../utils/proxy"));
 var DOM = __importStar(require("./dom/methods"));
 var script_1 = require("./dom/script");
 var client_1 = require("./client");
+var interceptor_1 = require("../utils/interceptor");
+var logger_1 = require("../utils/logger");
 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 ({
@@ -62,13 +64,14 @@ var DOMMethods = function (_a) {
 var withScript = function (fn) {
     return function (props) {
         var config = __assign({ persistence: persistence_1.Persistence.LOCAL, useCookie: true }, props);
-        script_1.initialize({ publicKey: props.publicKey });
+        (0, logger_1.log)("Calling Function that initializes hosted UI script");
+        (0, script_1.initialize)({ publicKey: props.publicKey });
         return fn(config);
     };
 };
-exports.init = withScript(function (props) {
-    var client = proxy_1.default(client_1.initClient(props), props);
+exports.init = (0, logger_1.withLogger)(withScript(function (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);
-});
+}));
 exports.Methods = { init: exports.init };

package/lib/utils/cookies.js

@@ -6,12 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMemberCookie = exports.setMemberCookie = void 0;
 var js_cookie_1 = __importDefault(require("js-cookie"));
 var cookies_1 = require("../constants/cookies");
-exports.setMemberCookie = function (token, expires) {
+var setMemberCookie = function (token, expires) {
     js_cookie_1.default.set(cookies_1.MemberCookies.AUTH, token, {
         expires: expires || new Date(Date.now() + 604800000),
         sameSite: "strict",
     });
 };
-exports.getMemberCookie = function () {
+exports.setMemberCookie = setMemberCookie;
+var getMemberCookie = function () {
     return js_cookie_1.default.get(cookies_1.MemberCookies.AUTH);
 };
+exports.getMemberCookie = getMemberCookie;

package/lib/utils/interceptor.js

@@ -3,15 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleMemberToken = void 0;
 var cookies_1 = require("./cookies");
 var persistence_1 = require("../auth/persistence");
-exports.handleMemberToken = function (_a) {
+var handleMemberToken = function (_a) {
     var persistence = _a.persistence, token = _a.token;
     if (token === "null") {
-        cookies_1.setMemberCookie("", -1);
-        if (persistence_1.getPersistedMember(persistence)) {
-            persistence_1.unsetPersistedMember(persistence);
+        (0, cookies_1.setMemberCookie)("", -1);
+        if ((0, persistence_1.getPersistedMember)(persistence)) {
+            (0, persistence_1.unsetPersistedMember)(persistence);
         }
     }
     else {
-        cookies_1.setMemberCookie(token);
+        (0, cookies_1.setMemberCookie)(token);
     }
 };
+exports.handleMemberToken = handleMemberToken;

package/lib/utils/logger.d.ts

@@ -0,0 +1,3 @@
+export declare const initializeLogger: (debugFlag: boolean) => void;
+export declare const log: (...msg: any[]) => void;
+export declare const withLogger: (fn: any) => (props: any) => any;

package/lib/utils/logger.js

@@ -0,0 +1,51 @@
+"use strict";
+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 __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withLogger = exports.log = exports.initializeLogger = void 0;
+var debug;
+var initializeLogger = function (debugFlag) {
+    debug = !!debugFlag;
+};
+exports.initializeLogger = initializeLogger;
+var log = function () {
+    var msg = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        msg[_i] = arguments[_i];
+    }
+    if (!debug)
+        return;
+    var timestamp = '[' + Date.now() + ']';
+    console.log.apply(console, __spreadArray(['\x1b[33m%s\x1b[0m', "@memberstack/dom ".concat(timestamp)], __read(msg), false));
+};
+exports.log = log;
+var withLogger = function (fn) {
+    return function (props) {
+        (0, exports.initializeLogger)(props.debug);
+        return fn(props);
+    };
+};
+exports.withLogger = withLogger;

package/lib/utils/proxy.js

@@ -51,9 +51,14 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var __spread = (this && this.__spread) || function () {
-    for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
-    return ar;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var persistence_1 = require("../auth/persistence");
@@ -63,15 +68,15 @@ var handleResponse = function (fn, props) {
         for (var _i = 0; _i < arguments.length; _i++) {
             args[_i] = arguments[_i];
         }
-        var result = fn.apply(void 0, __spread(args));
+        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;
                 if ((_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.member) {
-                    persistence_1.setPersistedMember((_b = res.data) === null || _b === void 0 ? void 0 : _b.member, props.persistence);
+                    (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_")) {
-                    persistence_1.setPersistedMember(res.data, props.persistence);
+                    (0, persistence_1.setPersistedMember)(res.data, props.persistence);
                 }
                 return res;
             });
@@ -83,7 +88,7 @@ var handler = function (props) { return ({
     get: function (target, prop, receiver) {
         var _this = this;
         if (prop === "getCurrentMember") {
-            var persistedMember_1 = persistence_1.getPersistedMember(props.persistence);
+            var persistedMember_1 = (0, persistence_1.getPersistedMember)(props.persistence);
             if (persistedMember_1) {
                 return function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
                     return [2 /*return*/, ({ data: persistedMember_1 })];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberstack/dom",
-  "version": "1.0.0-beta.27",
+  "version": "1.0.0-beta.30",
   "main": "./lib/index.js",
   "files": [
     "lib/**/*"
@@ -8,8 +8,9 @@
   "author": "Lydia Hallie",
   "license": "MIT",
   "dependencies": {
-    "@memberstack/client": "1.0.1-beta.9",
-    "js-cookie": "^3.0.1"
+    "@memberstack/client": "^1.0.1-beta.11",
+    "js-cookie": "^3.0.1",
+    "node-request-interceptor": "^0.6.3"
   },
   "scripts": {
     "prepublishOnly": "npx tsc",