@memberstack/dom 1.0.0-beta.24 → 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.js

@@ -26,14 +26,13 @@ var hasIFrame = function () {
     }
     return true;
 };
-var load = function (props) {
+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.load = load;
-var openModal = function (props) {
+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);
@@ -41,24 +40,22 @@ var openModal = function (props) {
             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)();
+                    return 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);
+                    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);
+                    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.openModal = openModal;
-var hideModal = function () {
+exports.hideModal = function () {
     var _a;
     if (hasIFrame()) {
         (_a = window[window_1.Window.MSDOM]) === null || _a === void 0 ? void 0 : _a.hide();
     }
 };
-exports.hideModal = hideModal;

package/lib/methods/index.d.ts

@@ -9,6 +9,7 @@ declare global {
 }
 export declare type DOMConfig = ClientConfig & {
     persistence?: Persistence;
+    useCookie: boolean;
 };
 declare const DOMMethods: ({ useCookie, persistence, ...props }: DOMConfig) => {
     load: () => void;

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.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };
@@ -50,7 +50,6 @@ 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 _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 ({
@@ -63,13 +62,12 @@ var DOMMethods = function (_a) {
 var withScript = function (fn) {
     return function (props) {
         var config = __assign({ persistence: persistence_1.Persistence.LOCAL, useCookie: true }, props);
-        (0, script_1.initialize)({ publicKey: props.publicKey });
-        (0, interceptor_1.initializeInterceptors)({ persistence: config.persistence });
+        script_1.initialize({ publicKey: props.publicKey });
         return fn(config);
     };
 };
 exports.init = withScript(function (props) {
-    var client = (0, proxy_1.default)((0, client_1.initClient)(props), props);
+    var client = proxy_1.default(client_1.initClient(props), props);
     var methods = DOMMethods(props);
     return Object.assign(client, methods);
 });

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.d.ts

@@ -1,3 +1,4 @@
-export declare const initializeInterceptors: ({ persistence }: {
+export declare const handleMemberToken: ({ persistence, token }: {
     persistence: any;
+    token: any;
 }) => void;

package/lib/utils/interceptor.js

@@ -1,28 +1,17 @@
 "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"));
+exports.handleMemberToken = void 0;
 var cookies_1 = require("./cookies");
 var persistence_1 = require("../auth/persistence");
-var interceptor = new node_request_interceptor_1.RequestInterceptor(default_1.default);
-var initializeInterceptors = function (_a) {
-    var persistence = _a.persistence;
-    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") {
-                (0, cookies_1.setMemberCookie)("", -1);
-                if ((0, persistence_1.getPersistedMember)(persistence)) {
-                    (0, persistence_1.unsetPersistedMember)(persistence);
-                }
-            }
-            else {
-                (0, cookies_1.setMemberCookie)(response.headers["ms-mid"]);
-            }
+exports.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);
         }
-    });
+    }
+    else {
+        cookies_1.setMemberCookie(token);
+    }
 };
-exports.initializeInterceptors = initializeInterceptors;

package/lib/utils/proxy.js

@@ -1,40 +1,4 @@
 "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;
@@ -51,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");
@@ -68,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;
             });
@@ -86,13 +45,10 @@ var handleResponse = function (fn, props) {
 };
 var handler = function (props) { return ({
     get: function (target, prop, receiver) {
-        var _this = this;
         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 __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                    return [2 /*return*/, ({ data: persistedMember_1 })];
-                }); }); };
+                return function () { return ({ data: persistedMember_1 }); };
             }
         }
         return handleResponse(Reflect.get(target, prop, receiver), props);

package/package.json

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