@memberstack/dom 1.0.0-beta.21 → 1.0.0-beta.25

package/lib/methods/dom/index.js

@@ -1,6 +1,5 @@
 "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

@@ -1,31 +1,17 @@
 import type { DOMConfig } from "..";
-declare type ActionParams = {
-    onCompleted?: (x: any) => any;
-    onError?: (x: any) => any;
-};
-export declare type OpenModalParams = ActionParams & ({
-    type: "LOGIN";
+export declare type OpenModalParams = {
+    type: "LOGIN" | "SIGNUP" | "FORGOT_PASSWORD";
     params?: {
         planId?: string;
-        priceId?: string;
-    };
-} | {
-    type: "SIGNUP";
-    params: {
-        planId: string;
-        priceId?: string;
+        planPaymentOptionId?: string;
     };
-} | {
-    type: "FORGOT_PASSWORD";
-    params: {};
-});
-export declare const initDOM: (props: {
-    publicKey: string;
-} & DOMConfig) => {
-    openModal: (openModalProps: OpenModalParams) => void;
-    hideModal: any;
-    onAuthChange: (cb: any) => {
-        unsubscribe: () => boolean;
+    options?: {
+        onCompleted?: (x: any) => any;
+        onError?: (x: any) => any;
     };
 };
-export {};
+export declare const load: (props: {
+    publicKey: string;
+}) => void;
+export declare const openModal: (props: OpenModalParams & DOMConfig) => void;
+export declare const hideModal: () => void;

package/lib/methods/dom/methods.js

@@ -1,45 +1,61 @@
 "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);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initDOM = void 0;
+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 initDOM = function (props) {
-    var methods = window[window_1.Window.MEMBERSTACK].init({ publicKey: props.publicKey });
-    return {
-        openModal: function (openModalProps) { return openModal(methods, __assign(__assign({}, props), openModalProps)); },
-        hideModal: methods.hide,
-        onAuthChange: persistence_1.onAuthChange
-    };
+var isBrowser = typeof window !== "undefined";
+var isInitialized = function () {
+    if (!isBrowser)
+        return;
+    if (!(window === null || window === void 0 ? void 0 : window[window_1.Window.MSDOM])) {
+        console.warn("Memberstack has not been initialized yet.");
+        return false;
+    }
+    return true;
 };
-exports.initDOM = initDOM;
-var openModal = function (methods, props) {
-    methods.show(props.type, props.params);
-    window.addEventListener("message", function (e) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        if (e.origin === endpoint_1.endpoints.parentOrigin) {
-            if (e.data.type === "CLOSE") {
-                return methods.hide();
-            }
-            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);
+var hasIFrame = function () {
+    var initialized = isInitialized();
+    if (!initialized)
+        return false;
+    var iframe = document.querySelector("iframe[id=\"_ms-iframe\"]");
+    if (!iframe) {
+        console.warn("iFrame has not been loaded yet.");
+        return false;
+    }
+    return true;
+};
+exports.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) {
+    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();
+                }
+                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);
             }
-            (_g = props.onCompleted) === null || _g === void 0 ? void 0 : _g.call(props, (_h = e.data) === null || _h === void 0 ? void 0 : _h.data);
-        }
-    });
+        });
+    }
+};
+exports.hideModal = function () {
+    var _a;
+    if (hasIFrame()) {
+        (_a = window[window_1.Window.MSDOM]) === null || _a === void 0 ? void 0 : _a.hide();
+    }
 };

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

@@ -1,3 +1,3 @@
-export declare function appendScript(props: {
+export declare function initialize(props: {
     publicKey: string;
-}): HTMLScriptElement;
+}): Promise<any>;

package/lib/methods/dom/script.js

@@ -1,13 +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.appendScript = void 0;
+exports.initialize = void 0;
 var endpoint_1 = require("../../constants/endpoint");
 var window_1 = require("../../constants/window");
 var isBrowser = typeof window !== "undefined";
 var SCRIPT_URL = endpoint_1.endpoints.loaderScript;
 var SCRIPT_URL_REGEX = new RegExp(SCRIPT_URL);
-var getScript = function (_a) {
-    var publicKey = _a.publicKey;
+var getScript = function () {
     var existingScript = document.querySelector("script[src^=\"" + SCRIPT_URL + "\"]");
     if (existingScript && SCRIPT_URL_REGEX.test(existingScript.src)) {
         return existingScript;
@@ -19,22 +54,27 @@ var getScript = function (_a) {
     if (!document.body) {
         throw new Error("Memberstack requires a <body> element.");
     }
-    script.addEventListener("load", function () {
-        if (window[window_1.Window.MEMBERSTACK]) {
-            window[window_1.Window.MEMBERSTACK].init({ publicKey: publicKey });
-            console.info("\x1b[36m%s\x1b[0m", "Memberstack has been initialized.");
-        }
-        else {
-            console.warn("Could not initialize Memberstack.");
-        }
-    });
     document.body.appendChild(script);
     return script;
 };
-function appendScript(props) {
-    if (!isBrowser) {
-        throw new Error("Memberstack requires a <body> element.");
-    }
-    return getScript({ publicKey: props.publicKey });
+function initialize(props) {
+    return __awaiter(this, void 0, void 0, function () {
+        var script;
+        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.");
+                }
+            });
+            return [2 /*return*/];
+        });
+    });
 }
-exports.appendScript = appendScript;
+exports.initialize = initialize;

package/lib/methods/index.d.ts

@@ -1,12 +1,26 @@
 import { Persistence } from "../auth/persistence";
-import { ClientConfig } from "./client";
+import * as DOM from "./dom/methods";
+import { initClient, ClientConfig } from "./client";
 declare global {
     interface Window {
-        memberstack: any;
+        __MSDOM: any;
+        APP_ID: string;
     }
 }
 export declare type DOMConfig = ClientConfig & {
     persistence?: Persistence;
-    useCookie?: boolean;
+    useCookie: boolean;
 };
-export declare const init: any;
+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 Methods: {
+    init: (props: DOMConfig) => ReturnType<typeof initClient> & ReturnType<typeof DOMMethods>;
+};
+export {};

package/lib/methods/index.js

@@ -10,26 +10,65 @@ var __assign = (this && this.__assign) || function () {
     };
     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.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = void 0;
+exports.Methods = exports.init = void 0;
 var persistence_1 = require("../auth/persistence");
 var proxy_1 = __importDefault(require("../utils/proxy"));
-var methods_1 = require("./dom/methods");
+var DOM = __importStar(require("./dom/methods"));
 var script_1 = require("./dom/script");
 var client_1 = require("./client");
-var interceptor_1 = require("../utils/interceptor");
+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,
+        openModal: function (type, params, options) { return DOM.openModal(__assign({ type: type, params: params, options: options, useCookie: useCookie, persistence: persistence }, props)); },
+    });
+};
 var withScript = function (fn) {
     return function (props) {
         var config = __assign({ persistence: persistence_1.Persistence.LOCAL, useCookie: true }, props);
-        (0, script_1.appendScript)({ publicKey: props.publicKey });
+        script_1.initialize({ publicKey: props.publicKey });
         return fn(config);
     };
 };
 exports.init = 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 = (0, methods_1.initDOM)({ publicKey: props.publicKey });
+    var client = proxy_1.default(client_1.initClient(props), props);
+    var methods = DOMMethods(props);
     return Object.assign(client, methods);
 });
+exports.Methods = { init: exports.init };

package/lib/utils/cookies.d.ts

@@ -1,2 +1,2 @@
 export declare const setMemberCookie: (token: any, expires?: number) => void;
-export declare const getMemberCookie: () => any;
+export declare const getMemberCookie: () => string;

package/lib/utils/cookies.js

@@ -6,14 +6,12 @@ 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");
-var setMemberCookie = function (token, expires) {
+exports.setMemberCookie = function (token, expires) {
     js_cookie_1.default.set(cookies_1.MemberCookies.AUTH, token, {
         expires: expires || new Date(Date.now() + 604800000),
         sameSite: "strict",
     });
 };
-exports.setMemberCookie = setMemberCookie;
-var getMemberCookie = function () {
+exports.getMemberCookie = function () {
     return js_cookie_1.default.get(cookies_1.MemberCookies.AUTH);
 };
-exports.getMemberCookie = getMemberCookie;

package/lib/utils/interceptor.js

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

package/lib/utils/proxy.js

@@ -15,14 +15,9 @@ var __read = (this && this.__read) || function (o, n) {
     }
     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));
+var __spread = (this && this.__spread) || function () {
+    for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
+    return ar;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var persistence_1 = require("../auth/persistence");
@@ -32,15 +27,15 @@ var handleResponse = function (fn, props) {
         for (var _i = 0; _i < arguments.length; _i++) {
             args[_i] = arguments[_i];
         }
-        var result = fn.apply(void 0, __spreadArray([], __read(args), false));
+        var result = fn.apply(void 0, __spread(args));
         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) {
-                    (0, persistence_1.setPersistedMember)((_b = res.data) === null || _b === void 0 ? void 0 : _b.member, props.persistence);
+                    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_")) {
-                    (0, persistence_1.setPersistedMember)(res.data, props.persistence);
+                    persistence_1.setPersistedMember(res.data, props.persistence);
                 }
                 return res;
             });
@@ -51,7 +46,7 @@ var handleResponse = function (fn, props) {
 var handler = function (props) { return ({
     get: function (target, prop, receiver) {
         if (prop === "getCurrentMember") {
-            var persistedMember_1 = (0, persistence_1.getPersistedMember)(props.persistence);
+            var persistedMember_1 = persistence_1.getPersistedMember(props.persistence);
             if (persistedMember_1) {
                 return function () { return ({ data: persistedMember_1 }); };
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberstack/dom",
-  "version": "1.0.0-beta.21",
+  "version": "1.0.0-beta.25",
   "main": "./lib/index.js",
   "files": [
     "lib/**/*"
@@ -8,11 +8,12 @@
   "author": "Lydia Hallie",
   "license": "MIT",
   "dependencies": {
-    "@memberstack/client": "^1.0.1-beta.7",
-    "axios": "^0.24.0",
+    "@memberstack/client": "1.0.1-beta.9",
     "js-cookie": "^3.0.1"
   },
   "scripts": {
-    "prepublishOnly": "tsc"
+    "prepublishOnly": "npx tsc",
+    "watch": "npx tsc -w",
+    "clean": "rm -rf node_modules"
   }
 }