@memberstack/dom 1.0.0-beta.1 → 1.0.0-beta.10

package/lib/methods/index.js

@@ -45,37 +45,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Methods = exports.init = void 0;
-var client_1 = __importDefault(require("@memberstack/client"));
 var persistence_1 = require("../auth/persistence");
-var DOM = __importStar(require("./dom"));
+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 DOMMethods = function (_a) {
-    var publicKey = _a.publicKey, _b = _a.useCookie, useCookie = _b === void 0 ? true : _b, token = _a.token, apiVersion = _a.apiVersion, _c = _a.persistence, persistence = _c === void 0 ? persistence_1.Persistence.LOCAL : _c;
+    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: publicKey }); },
-        openModal: function (type, params, options) {
-            return DOM.openModal({
-                publicKey: publicKey,
-                type: type,
-                params: params,
-                options: options,
-                useCookie: useCookie,
-                token: token,
-                apiVersion: apiVersion,
-                persistence: persistence,
-            });
-        },
-        hideModal: function () { return DOM.hideModal(); },
+        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 init = function (_a) {
-    var _b = _a.persistence, persistence = _b === void 0 ? persistence_1.Persistence.LOCAL : _b, _c = _a.useCookie, useCookie = _c === void 0 ? true : _c, props = __rest(_a, ["persistence", "useCookie"]);
-    var client = client_1.default.init(props);
-    DOM.initialize({ publicKey: props.publicKey });
-    persistence_1.initializeInterceptor(persistence, useCookie);
-    return __assign(__assign(__assign({}, client), DOMMethods(__assign({ persistence: persistence, useCookie: useCookie }, props))), { getCurrentMember: function (options) {
-            var persistedMember = persistence_1.getPersistedMember(persistence);
-            return persistedMember || client.getCurrentMember(options);
-        }, onAuthChange: persistence_1.onAuthChange });
+var withScript = function (fn) {
+    return function (props) {
+        var config = __assign({ persistence: persistence_1.Persistence.LOCAL, useCookie: true }, props);
+        script_1.initialize({ publicKey: props.publicKey });
+        if (config.useCookie)
+            interceptor_1.initializeInterceptors();
+        return fn(config);
+    };
 };
-exports.init = init;
+exports.init = withScript(function (props) {
+    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 @@
-export declare const getMemberCookie: () => any;
-export declare const setMemberCookie: (token: any) => any;
+export declare const setMemberCookie: (token: any, expires?: number) => void;

package/lib/utils/cookies.js

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

package/lib/utils/interceptor.d.ts

@@ -0,0 +1 @@
+export declare const initializeInterceptors: () => void;

package/lib/utils/interceptor.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initializeInterceptors = void 0;
+var node_request_interceptor_1 = require("node-request-interceptor");
+var default_1 = __importDefault(require("node-request-interceptor/lib/presets/default"));
+var cookies_1 = require("./cookies");
+var interceptor = new node_request_interceptor_1.RequestInterceptor(default_1.default);
+var initializeInterceptors = function () {
+    interceptor.on("response", function (req, response) {
+        if (response === null || response === void 0 ? void 0 : response.headers["ms-mid"]) {
+            if ((response === null || response === void 0 ? void 0 : response.headers["ms-mid"]) === "null") {
+                cookies_1.setMemberCookie("", -1);
+            }
+            cookies_1.setMemberCookie(response.headers["ms-mid"]);
+        }
+    });
+};
+exports.initializeInterceptors = initializeInterceptors;

package/lib/utils/localStorage.d.ts

@@ -0,0 +1,6 @@
+export declare const unsetRefreshToken: () => void;
+export declare const setRefreshToken: ({ expires, refreshToken, }: {
+    expires: number;
+    refreshToken: string;
+}) => void;
+export declare const getRefreshToken: () => string[] | [];

package/lib/utils/localStorage.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRefreshToken = exports.setRefreshToken = exports.unsetRefreshToken = void 0;
+var REFRESH_TOKEN_KEY = "_ms-rtk";
+var REFRESH_TOKEN_SEPARATOR = ":";
+var unsetRefreshToken = function () {
+    return localStorage === null || localStorage === void 0 ? void 0 : localStorage.removeItem(REFRESH_TOKEN_KEY);
+};
+exports.unsetRefreshToken = unsetRefreshToken;
+var setRefreshToken = function (_a) {
+    var expires = _a.expires, refreshToken = _a.refreshToken;
+    localStorage === null || localStorage === void 0 ? void 0 : localStorage.setItem(REFRESH_TOKEN_KEY, "" + expires + REFRESH_TOKEN_SEPARATOR + refreshToken);
+};
+exports.setRefreshToken = setRefreshToken;
+var getRefreshToken = function () {
+    var token = localStorage === null || localStorage === void 0 ? void 0 : localStorage.getItem(REFRESH_TOKEN_KEY);
+    if (!token)
+        return [];
+    return token === null || token === void 0 ? void 0 : token.split(REFRESH_TOKEN_SEPARATOR);
+};
+exports.getRefreshToken = getRefreshToken;

package/lib/utils/proxy.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (target: any, props: any) => any;
+export default _default;

package/lib/utils/proxy.js

@@ -0,0 +1,96 @@
+"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 };
+    }
+};
+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 __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");
+var handleResponse = function (fn, props) {
+    return function () {
+        var _a;
+        var args = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args[_i] = arguments[_i];
+        }
+        return (_a = fn.apply(void 0, __spread(args))) === null || _a === void 0 ? void 0 : _a.then(function (res) {
+            var _a, _b, _c, _d, _e, _f;
+            if ((_b = (_a = res.data) === null || _a === void 0 ? void 0 : _a.startsWith) === null || _b === void 0 ? void 0 : _b.call(_a, "mem_")) {
+                persistence_1.unsetPersistedMember(props.persistence);
+            }
+            if ((_c = res.data) === null || _c === void 0 ? void 0 : _c.member) {
+                persistence_1.setPersistedMember((_d = res.data) === null || _d === void 0 ? void 0 : _d.member, props.persistence);
+            }
+            if ((_f = (_e = res.data) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.startsWith("mem_")) {
+                persistence_1.setPersistedMember(res.data, props.persistence);
+            }
+            return res;
+        });
+    };
+};
+var handler = function (props) { return ({
+    get: function (target, prop, receiver) {
+        var _this = this;
+        if (prop === "getCurrentMember") {
+            var persistedMember_1 = 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 })];
+                }); }); };
+            }
+        }
+        return handleResponse(Reflect.get(target, prop, receiver), props);
+    },
+}); };
+exports.default = (function (target, props) { return new Proxy(target, handler(props)); });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberstack/dom",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.10",
   "main": "./lib/index.js",
   "files": [
     "lib/**/*"
@@ -8,7 +8,7 @@
   "author": "Lydia Hallie",
   "license": "MIT",
   "dependencies": {
-    "@memberstack/client": "^1.0.1-beta.1",
+    "@memberstack/client": "^1.0.1-beta.2",
     "js-cookie": "^3.0.1",
     "node-request-interceptor": "^0.6.3"
   },

package/lib/auth/persistence/interceptor.d.ts

@@ -1,2 +0,0 @@
-import { Persistence } from ".";
-export declare const initializeInterceptor: (persistence: Persistence, useCookie: boolean) => void;

package/lib/auth/persistence/interceptor.js

@@ -1,43 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.initializeInterceptor = void 0;
-var node_request_interceptor_1 = require("node-request-interceptor");
-var XMLHttpRequest_1 = require("node-request-interceptor/lib/interceptors/XMLHttpRequest");
-var _1 = require(".");
-var cookies_1 = require("../../utils/cookies");
-var methods_1 = require("./methods");
-var shouldIntercept = function (req) {
-    return (req.url.pathname.startsWith("/client/auth") || req.url.pathname.startsWith("/client/member"));
-};
-var persist = function (res, persistence) {
-    var _a, _b, _c, _d;
-    if (res === null || res === void 0 ? void 0 : res.body) {
-        var parsedResponse = JSON.parse(res.body);
-        if ((_a = parsedResponse.data) === null || _a === void 0 ? void 0 : _a.member) {
-            _1.setPersistedMember((_b = parsedResponse.data) === null || _b === void 0 ? void 0 : _b.member, persistence);
-        }
-        if ((_d = (_c = parsedResponse.data) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.startsWith("mem_")) {
-            _1.setPersistedMember(parsedResponse.data, persistence);
-        }
-    }
-};
-var setCookie = function (res, useCookie) {
-    var _a, _b, _c;
-    var body = JSON.parse(res.body || "{}");
-    if (useCookie && ((_b = (_a = body === null || body === void 0 ? void 0 : body.data) === null || _a === void 0 ? void 0 : _a.tokens) === null || _b === void 0 ? void 0 : _b.accessToken)) {
-        cookies_1.setMemberCookie((_c = body.data) === null || _c === void 0 ? void 0 : _c.tokens.accessToken);
-    }
-};
-var initializeInterceptor = function (persistence, useCookie) {
-    var interceptor = new node_request_interceptor_1.RequestInterceptor([XMLHttpRequest_1.interceptXMLHttpRequest]);
-    interceptor.on("response", function (req, res) {
-        if (shouldIntercept(req)) {
-            if (req.url.pathname.endsWith("/logout")) {
-                return methods_1.unsetPersistedMember(persistence);
-            }
-            persist(res, persistence);
-            setCookie(res, useCookie);
-        }
-    });
-};
-exports.initializeInterceptor = initializeInterceptor;

package/lib/methods/dom.d.ts

@@ -1,10 +0,0 @@
-import { ClientConfig } from ".";
-import type { OpenModalParams } from "../types/params";
-export declare function initialize(props: {
-    publicKey: string;
-}): any;
-export declare const load: (props: {
-    publicKey: string;
-}) => any;
-export declare const openModal: (props: OpenModalParams & ClientConfig) => any;
-export declare const hideModal: () => any;

package/lib/methods/dom.js

@@ -1,55 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.hideModal = exports.openModal = exports.load = exports.initialize = 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 isBrowser = typeof window !== "undefined";
-function initialize(props) {
-    if (!isBrowser)
-        return null;
-    var script = document.createElement("script");
-    script.setAttribute("src", endpoint_1.endpoints.loaderScript);
-    script.setAttribute("defer", "true");
-    script.setAttribute("crossorigin", "true");
-    document.body.appendChild(script);
-    window.onload = function () { return exports.load(props); };
-}
-exports.initialize = initialize;
-var load = function (props) {
-    var _a;
-    if (!isBrowser)
-        return null;
-    (_a = window[window_1.Window.MSDOM]) === null || _a === void 0 ? void 0 : _a.load({ publicKey: props.publicKey });
-};
-exports.load = load;
-var openModal = function (props) {
-    var _a;
-    if (!isBrowser)
-        return null;
-    (_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;
-        if (e.origin === endpoint_1.endpoints.parentOrigin) {
-            if (e.data.type === "CLOSE") {
-                return exports.hideModal();
-            }
-            if ((_a = e.data) === null || _a === void 0 ? void 0 : _a.data.member) {
-                persistence_1.setPersistedMember((_b = e.data) === null || _b === void 0 ? void 0 : _b.data.member, props.persistence);
-            }
-            if (props.useCookie && ((_d = (_c = e.data) === null || _c === void 0 ? void 0 : _c.data.tokens) === null || _d === void 0 ? void 0 : _d.accessToken)) {
-                cookies_1.setMemberCookie(e.data.data.tokens.accessToken);
-            }
-            (_f = (_e = props.options).onCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, e.data.data);
-        }
-    });
-};
-exports.openModal = openModal;
-var hideModal = function () {
-    var _a;
-    if (!isBrowser)
-        return null;
-    (_a = window[window_1.Window.MSDOM]) === null || _a === void 0 ? void 0 : _a.hide();
-};
-exports.hideModal = hideModal;

package/lib/types/params.d.ts

@@ -1,11 +0,0 @@
-export declare type OpenModalParams = {
-    type: "LOGIN" | "SIGNUP";
-    params?: {
-        planId?: string;
-        planPaymentOptionId?: string;
-    };
-    options?: {
-        onCompleted?: (x: any) => any;
-        onError?: (x: any) => any;
-    };
-};

package/lib/types/params.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });