@memberstack/dom 1.0.0-beta.11 → 1.0.0-beta.15

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

@@ -7,5 +7,7 @@ export declare enum Persistence {
 export declare const setPersistedMember: (member: Await<ReturnType<ReturnType<typeof memberstack.init>["loginMemberEmailPassword"]>>["data"]["member"], persistence: Persistence) => void;
 export declare const getPersistedMember: (persistence: any) => any;
 export declare const unsetPersistedMember: (persistence: any) => void;
-export declare const onAuthChange: (cb: any) => void;
+export declare const onAuthChange: (cb: any) => {
+    unsubscribe: () => boolean;
+};
 export {};

package/lib/auth/persistence/methods.js

@@ -1,4 +1,24 @@
 "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 __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 });
 exports.onAuthChange = exports.unsetPersistedMember = exports.getPersistedMember = exports.setPersistedMember = exports.Persistence = void 0;
 var local_1 = require("./local");
@@ -9,17 +29,18 @@ var Persistence;
     Persistence["LOCAL"] = "LOCAL";
 })(Persistence = exports.Persistence || (exports.Persistence = {}));
 var createObservable = function () {
-    var observers = [];
+    var observer = new Map();
     return {
-        subscribe: function (fn) {
-            if (typeof fn === "function") {
-                observers.push(fn);
-            }
+        subscribe: function (key, fn) {
+            if (typeof fn !== "function")
+                return;
+            return observer.set(key, fn);
+        },
+        unsubscribe: function (key) {
+            return observer.delete(key);
         },
         notify: function (data) {
-            return observers.forEach(function (observer) {
-                observer(data);
-            });
+            return __spread(observer.values()).forEach(function (fn) { return fn(data); });
         },
     };
 };
@@ -52,6 +73,10 @@ var unsetPersistedMember = function (persistence) {
 };
 exports.unsetPersistedMember = unsetPersistedMember;
 var onAuthChange = function (cb) {
-    observable.subscribe(cb);
+    var id = Math.floor(Math.random() * 1000);
+    observable.subscribe(id, cb);
+    return {
+        unsubscribe: function () { return observable.unsubscribe(id); },
+    };
 };
 exports.onAuthChange = onAuthChange;

package/lib/methods/index.d.ts

@@ -13,7 +13,9 @@ export declare type DOMConfig = ClientConfig & {
 declare const DOMMethods: ({ useCookie, persistence, ...props }: DOMConfig) => {
     load: () => void;
     hideModal: () => void;
-    onAuthChange: (cb: any) => 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>;

package/lib/methods/index.js

@@ -64,8 +64,7 @@ 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();
+        interceptor_1.initializeInterceptors({ persistence: config.persistence });
         return fn(config);
     };
 };

package/lib/utils/interceptor.d.ts

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

package/lib/utils/interceptor.js

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

package/lib/utils/proxy.js

@@ -59,20 +59,16 @@ 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);
+        return Promise.resolve(fn.apply(void 0, __spread(args))).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);
             }
-            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_")) {
+            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);
             }
             return res;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberstack/dom",
-  "version": "1.0.0-beta.11",
+  "version": "1.0.0-beta.15",
   "main": "./lib/index.js",
   "files": [
     "lib/**/*"