@memberstack/dom 1.9.14 → 1.9.16

package/lib/methods/index.js

@@ -41,8 +41,10 @@ var cookies_1 = require("../utils/cookies");
 var requests_1 = require("./requests");
 var auth_1 = require("../auth");
 var captchaReadyPromise = new Promise(function (resolve) {
-    //@ts-ignore
-    window._hcaptchaReady = resolve;
+    if (typeof window !== "undefined") {
+        //@ts-ignore
+        window._hcaptchaReady = resolve;
+    }
 });
 var methods = {
     openModal: methods_1.openModal,
@@ -50,16 +52,16 @@ var methods = {
     _hideLoader: methods_1.hideLoader,
     _showLoader: methods_1.showLoader,
     _showMessage: methods_1.showMessage,
-    getMemberCookie: cookies_1.getMemberCookie,
+    getMemberCookie: cookies_1.getMemberToken,
     onAuthChange: auth_1.onAuthChange,
     _captchaReady: captchaReadyPromise,
 };
 function init(props) {
-    var requests = (0, requests_1.initRequest)({
+    var requests = requests_1.initRequest({
         publicKey: props.publicKey,
         appId: props.appId,
         sessionDurationDays: props.sessionDurationDays,
-        token: (0, cookies_1.getMemberCookie)(),
+        token: cookies_1.getMemberToken(),
     });
     var allMethods = Object.assign(methods, requests);
     if (typeof window !== "undefined") {
@@ -74,6 +76,9 @@ function _initCaptchas() {
     return __awaiter(this, void 0, void 0, function () {
         var script;
         return __generator(this, function (_a) {
+            // don't init if not in browser
+            if (typeof window === "undefined")
+                return [2 /*return*/];
             script = document.createElement("script");
             script.src = "https://js.hcaptcha.com/1/api.js?render=explicit&onload=_hcaptchaReady";
             script.async = true;

package/lib/methods/requests/index.js

@@ -55,7 +55,7 @@ var cookies_1 = require("../../utils/cookies");
 var endpoints_1 = require("../../constants/endpoints");
 var globalSessionDurationDays;
 var addHeaders = function (options) { return (__assign({}, ((options === null || options === void 0 ? void 0 : options.token) && {
-    Authorization: "Bearer ".concat(options.token),
+    Authorization: "Bearer " + options.token,
 }))); };
 var promiseResolve, promiseReject;
 var receiveMessage = function (event) {
@@ -69,8 +69,8 @@ var receiveMessage = function (event) {
     if (!acceptedOrigins.includes(origin))
         return;
     if ((_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.member) {
-        (0, auth_1.setPersistedMember)(data.data.member);
-        (0, cookies_1.setMemberCookie)(data.data.tokens.accessToken, globalSessionDurationDays);
+        auth_1.setPersistedMember(data.data.member);
+        cookies_1.setMemberToken(data.data.tokens.accessToken, globalSessionDurationDays);
     }
     if (data === null || data === void 0 ? void 0 : data.error) {
         promiseReject(data.error);
@@ -91,7 +91,7 @@ var openSignInWindow = function (url, name) { return __awaiter(void 0, void 0, v
         systemZoom = width / window.screen.availWidth;
         left = (width - 600) / 2 / systemZoom + dualScreenLeft;
         top = (height - 700) / 2 / systemZoom + dualScreenTop;
-        strWindowFeatures = "toolbar=no, menubar=no, width=".concat(600 / systemZoom, ", height=").concat(700 / systemZoom, ", top=").concat(top, ", left=").concat(left);
+        strWindowFeatures = "toolbar=no, menubar=no, width=" + 600 / systemZoom + ", height=" + 700 / systemZoom + ", top=" + top + ", left=" + left;
         if (windowObjectReference === null || windowObjectReference.closed) {
             windowObjectReference = window.open(url, name, strWindowFeatures);
         }
@@ -114,9 +114,9 @@ var openSignInWindow = function (url, name) { return __awaiter(void 0, void 0, v
             })];
     });
 }); };
-var initRequest = function (_a) {
+exports.initRequest = function (_a) {
     var publicKey = _a.publicKey, appId = _a.appId, token = _a.token, customEndpoint = _a.customEndpoint, sessionDurationDays = _a.sessionDurationDays;
-    var sendRequest = (0, requests_1.createRequestHandler)({
+    var sendRequest = requests_1.createRequestHandler({
         publicKey: publicKey,
         token: token,
         customEndpoint: customEndpoint,
@@ -130,10 +130,12 @@ var initRequest = function (_a) {
                 return __generator(this, function (_a) {
                     customFields = encodeURIComponent(params.customFields ? JSON.stringify(params.customFields) : "{}");
                     plans = encodeURIComponent(params.plans ? JSON.stringify(params.plans) : "[]");
-                    queryParams = new URLSearchParams(__assign(__assign({ provider: params.provider, customFields: customFields, plans: plans, appId: appId }, (publicKey && {
+                    queryParams = new URLSearchParams(__assign(__assign({ provider: params.provider, customFields: customFields,
+                        plans: plans,
+                        appId: appId }, (publicKey && {
                         publicKey: publicKey,
                     })), { origin: window.location.hostname }));
-                    return [2 /*return*/, openSignInWindow("".concat(endpoints_1.endpoints.API, "/auth-provider/signup?").concat(queryParams), "signup")];
+                    return [2 /*return*/, openSignInWindow(endpoints_1.endpoints.API + "/auth-provider/signup?" + queryParams, "signup")];
                 });
             });
         },
@@ -144,7 +146,7 @@ var initRequest = function (_a) {
                     queryParams = new URLSearchParams(__assign(__assign({ provider: params.provider, appId: appId }, (publicKey && {
                         publicKey: publicKey,
                     })), { origin: window.location.hostname }));
-                    return [2 /*return*/, openSignInWindow("".concat(endpoints_1.endpoints.API, "/auth-provider/login?").concat(queryParams), "login")];
+                    return [2 /*return*/, openSignInWindow(endpoints_1.endpoints.API + "/auth-provider/login?" + queryParams, "login")];
                 });
             });
         },
@@ -154,9 +156,9 @@ var initRequest = function (_a) {
                 return __generator(this, function (_a) {
                     queryParams = new URLSearchParams(__assign(__assign({ provider: params.provider, appId: appId }, (publicKey && {
                         publicKey: publicKey,
-                    })), { member: (0, cookies_1.getMemberCookie)(), origin: window.location.hostname }));
+                    })), { member: cookies_1.getMemberToken(), origin: window.location.hostname }));
                     //@ts-ignore
-                    return [2 /*return*/, openSignInWindow("".concat(endpoints_1.endpoints.API, "/auth-provider/connect?").concat(queryParams), "connect")];
+                    return [2 /*return*/, openSignInWindow(endpoints_1.endpoints.API + "/auth-provider/connect?" + queryParams, "connect")];
                 });
             });
         },
@@ -183,7 +185,7 @@ var initRequest = function (_a) {
                     });
                     return [2 /*return*/, sendRequest({
                             method: requests_2.HttpMethod.GET,
-                            url: "/app-member?".concat(queryParams),
+                            url: "/app-member?" + queryParams,
                         })];
                 });
             });
@@ -198,7 +200,7 @@ var initRequest = function (_a) {
                     });
                     return [2 /*return*/, sendRequest({
                             method: requests_2.HttpMethod.GET,
-                            url: "/app?".concat(queryParams),
+                            url: "/app?" + queryParams,
                         })];
                 });
             });
@@ -219,8 +221,8 @@ var initRequest = function (_a) {
                             })];
                         case 1:
                             data = _a.sent();
-                            (0, auth_1.setPersistedMember)(data.data.member);
-                            (0, cookies_1.setMemberCookie)(data.data.tokens.accessToken, sessionDurationDays);
+                            auth_1.setPersistedMember(data.data.member);
+                            cookies_1.setMemberToken(data.data.tokens.accessToken, sessionDurationDays);
                             return [2 /*return*/, data];
                     }
                 });
@@ -278,8 +280,8 @@ var initRequest = function (_a) {
                             })];
                         case 1:
                             data = _a.sent();
-                            (0, auth_1.setPersistedMember)(data.data.member);
-                            (0, cookies_1.setMemberCookie)(data.data.tokens.accessToken, sessionDurationDays);
+                            auth_1.setPersistedMember(data.data.member);
+                            cookies_1.setMemberToken(data.data.tokens.accessToken, sessionDurationDays);
                             return [2 /*return*/, data];
                     }
                 });
@@ -290,7 +292,7 @@ var initRequest = function (_a) {
                 return __generator(this, function (_a) {
                     return [2 /*return*/, sendRequest({
                             method: requests_2.HttpMethod.GET,
-                            url: "/app/plans/".concat(params.planId),
+                            url: "/app/plans/" + params.planId,
                         })];
                 });
             });
@@ -341,7 +343,7 @@ var initRequest = function (_a) {
                                 case 0: return [4 /*yield*/, getMemberRequest];
                                 case 1:
                                     data = _a.sent();
-                                    (0, auth_1.updatePersistedMember)(data.data);
+                                    auth_1.updatePersistedMember(data.data);
                                     return [2 /*return*/];
                             }
                         });
@@ -351,13 +353,13 @@ var initRequest = function (_a) {
                 return __generator(this, function (_a) {
                     getMemberRequest = sendRequest({
                         method: requests_2.HttpMethod.GET,
-                        url: "/member?".concat(Math.floor(1000 + Math.random() * 9000)),
+                        url: "/member?" + Math.floor(1000 + Math.random() * 9000),
                         headers: addHeaders(options),
                     });
                     // temp hacky solution
                     setMember();
                     if ((options === null || options === void 0 ? void 0 : options.useCache) === true) {
-                        member = (0, auth_1.getPersistedMember)();
+                        member = auth_1.getPersistedMember();
                         return [2 /*return*/, { data: member }];
                     }
                     else {
@@ -571,8 +573,8 @@ var initRequest = function (_a) {
                             })];
                         case 1:
                             data = _c.sent();
-                            (0, auth_1.setPersistedMember)(data.data.member);
-                            (0, cookies_1.setMemberCookie)(data.data.tokens.accessToken, sessionDurationDays);
+                            auth_1.setPersistedMember(data.data.member);
+                            cookies_1.setMemberToken(data.data.tokens.accessToken, sessionDurationDays);
                             return [2 /*return*/, data];
                     }
                 });
@@ -600,8 +602,8 @@ var initRequest = function (_a) {
                             })];
                         case 1:
                             data = _c.sent();
-                            (0, auth_1.setPersistedMember)(data.data.member);
-                            (0, cookies_1.setMemberCookie)(data.data.tokens.accessToken, sessionDurationDays);
+                            auth_1.setPersistedMember(data.data.member);
+                            cookies_1.setMemberToken(data.data.tokens.accessToken, sessionDurationDays);
                             return [2 /*return*/, data];
                     }
                 });
@@ -660,7 +662,7 @@ var initRequest = function (_a) {
                             })];
                         case 1:
                             data = _a.sent();
-                            (0, auth_1.unsetPersistedMember)();
+                            auth_1.unsetPersistedMember();
                             return [2 /*return*/, data];
                     }
                 });
@@ -668,4 +670,3 @@ var initRequest = function (_a) {
         },
     };
 };
-exports.initRequest = initRequest;

package/lib/methods/requests/requests.js

@@ -67,11 +67,11 @@ var HttpHeaders;
     HttpHeaders["API_VERSION"] = "X-API-Version";
     HttpHeaders["USER_AGENT"] = "X-User-Agent";
 })(HttpHeaders = exports.HttpHeaders || (exports.HttpHeaders = {}));
-var createRequestHandler = function (_a) {
+exports.createRequestHandler = function (_a) {
     var publicKey = _a.publicKey, appId = _a.appId, token = _a.token, customEndpoint = _a.customEndpoint;
     return {
         sendRequest: function (data, options) { return __awaiter(void 0, void 0, void 0, function () {
-            var url, memberCookie, authHeader, formattedUrl, res, e_1;
+            var url, memberToken, authHeader, formattedUrl, res, e_1;
             var _a, _b, _c;
             var _d, _e, _f, _g, _h, _j, _k, _l;
             return __generator(this, function (_m) {
@@ -79,14 +79,14 @@ var createRequestHandler = function (_a) {
                     case 0:
                         _m.trys.push([0, 2, , 3]);
                         url = data.url;
-                        memberCookie = (0, cookies_1.getMemberCookie)();
+                        memberToken = cookies_1.getMemberToken();
                         authHeader = [
                             (_e = (_d = data.headers) === null || _d === void 0 ? void 0 : _d["Authorization"]) === null || _e === void 0 ? void 0 : _e.replace("Bearer ", ""),
-                            memberCookie,
+                            memberToken,
                             options === null || options === void 0 ? void 0 : options.token,
                         ].find(function (x) { return x; });
-                        formattedUrl = "".concat(customEndpoint || endpoints_1.endpoints.API).concat(url);
-                        return [4 /*yield*/, (0, axios_1.default)(__assign(__assign({}, data), { url: formattedUrl, headers: __assign(__assign(__assign(__assign({}, (authHeader && { authorization: "Bearer ".concat(authHeader) })), (publicKey && (_a = {}, _a[HttpHeaders.API_KEY] = publicKey, _a))), (appId && (_b = {}, _b[HttpHeaders.APP_ID] = appId, _b))), (_c = {}, _c[HttpHeaders.USER_AGENT] = "@memberstack/client@1.2.0", _c)), withCredentials: true }))];
+                        formattedUrl = "" + (customEndpoint || endpoints_1.endpoints.API) + url;
+                        return [4 /*yield*/, axios_1.default(__assign(__assign({}, data), { url: formattedUrl, headers: __assign(__assign(__assign(__assign({}, (authHeader && { authorization: "Bearer " + authHeader })), (publicKey && (_a = {}, _a[HttpHeaders.API_KEY] = publicKey, _a))), (appId && (_b = {}, _b[HttpHeaders.APP_ID] = appId, _b))), (_c = {}, _c[HttpHeaders.USER_AGENT] = "@memberstack/client@1.2.0", _c)), withCredentials: true }))];
                     case 1:
                         res = _m.sent();
                         if ((_f = res === null || res === void 0 ? void 0 : res.headers) === null || _f === void 0 ? void 0 : _f["ms-mid"]) {
@@ -113,4 +113,3 @@ var createRequestHandler = function (_a) {
         }); },
     };
 };
-exports.createRequestHandler = createRequestHandler;

package/lib/types/index.js

@@ -1,17 +1,13 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    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 __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./params"), exports);

package/lib/utils/cookies.d.ts

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

package/lib/utils/cookies.js

@@ -3,17 +3,47 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMemberCookie = exports.setMemberCookie = void 0;
+exports.getMemberToken = exports.removeMemberToken = exports.setMemberToken = void 0;
 var js_cookie_1 = __importDefault(require("js-cookie"));
-var memberAuthCookie = "_ms-mid";
-var setMemberCookie = function (token, expires) {
-    js_cookie_1.default.set(memberAuthCookie, token, {
-        expires: (expires && Number(expires)) || 14,
+var memberAuthTokenName = "_ms-mid";
+function isLocalStorageAvailable() {
+    try {
+        localStorage.setItem("test", "test");
+        localStorage.removeItem("test");
+        return true;
+    }
+    catch (e) {
+        return false;
+    }
+}
+var localStorageAvailable = isLocalStorageAvailable();
+exports.setMemberToken = function (token, expires) {
+    if (localStorageAvailable) {
+        localStorage.setItem(memberAuthTokenName, token);
+    }
+    else {
+        js_cookie_1.default.set(memberAuthTokenName, token, {
+            expires: (expires && Number(expires)) || 14,
+            sameSite: "strict",
+        });
+    }
+};
+exports.removeMemberToken = function () {
+    if (localStorageAvailable) {
+        localStorage.removeItem(memberAuthTokenName);
+    }
+    js_cookie_1.default.set(memberAuthTokenName, "", {
+        expires: -1,
         sameSite: "strict",
     });
 };
-exports.setMemberCookie = setMemberCookie;
-var getMemberCookie = function () {
-    return js_cookie_1.default.get(memberAuthCookie);
+exports.getMemberToken = function () {
+    if (localStorageAvailable) {
+        var memAuthToken = localStorage.getItem(memberAuthTokenName);
+        if (memAuthToken)
+            return memAuthToken;
+    }
+    // todo: it's safe to make this an else in 2 weeks
+    // fallback to cookie -> this is to prevent folks from having to log in again
+    return js_cookie_1.default.get(memberAuthTokenName);
 };
-exports.getMemberCookie = getMemberCookie;

package/lib/utils/defaultMessageBox.js

@@ -8,35 +8,32 @@ if (typeof window !== "undefined") {
     closeIcon.setAttribute("data-ms-message-close", "");
     closeIcon.innerHTML = "<svg width=\"14\" height=\"14\" viewBox=\"0 0 14 14\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M14 1.41L12.59 0L7 5.59L1.41 0L0 1.41L5.59 7L0 12.59L1.41 14L7 8.41L12.59 14L14 12.59L8.41 7L14 1.41Z\" fill=\"white\"/></svg>";
 }
-var addSuccessBox = function () {
+exports.addSuccessBox = function () {
     var successStatusIcon = document.createElement("div");
     successStatusIcon.setAttribute("id", "ms-status-icon");
     successStatusIcon.innerHTML = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" xmlns=\"http://www.w3.org/2000/svg\"><circle cx=\"10\" cy=\"10\" r=\"10\" fill=\"#62d37f\"/><path d=\"M10 0C4.48 0 0 4.48 0 10s4.48 10 10 10 10-4.48 10-10S15.52 0 10 0Zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8Zm4.59-12.42L8 12.17 5.41 9.59 4 11l4 4 8-8-1.41-1.42Z\" fill=\"#fff\"/></svg>";
-    var successHTML = "<div data-ms-message class=\"ms-error-message\">\n\t\t".concat(successStatusIcon.outerHTML, "\n\t\t<div id=\"ms-message\" data-ms-message-text></div>\n\t\t").concat(closeIcon.outerHTML, "\n\t\t</div>");
+    var successHTML = "<div data-ms-message class=\"ms-error-message\">\n\t\t" + successStatusIcon.outerHTML + "\n\t\t<div id=\"ms-message\" data-ms-message-text></div>\n\t\t" + closeIcon.outerHTML + "\n\t\t</div>";
     var successdiv = document.createElement("div");
     successdiv.setAttribute("data-ms-message", "success");
     successdiv.innerHTML = successHTML;
     successdiv.style.display = "none";
     document.body.appendChild(successdiv);
 };
-exports.addSuccessBox = addSuccessBox;
-var addErrorBox = function () {
+exports.addErrorBox = function () {
     var errorStatusIcon = document.createElement("div");
     errorStatusIcon.setAttribute("id", "ms-status-icon");
     errorStatusIcon.innerHTML = "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M10 0C4.48 0 0 4.48 0 10C0 15.52 4.48 20 10 20C15.52 20 20 15.52 20 10C20 4.48 15.52 0 10 0ZM11 15H9V13H11V15ZM11 11H9V5H11V11Z\" fill=\"#E40023\"/></svg>";
-    var errorHTML = "<div data-ms-message class=\"ms-error-message\">\n\t\t".concat(errorStatusIcon.outerHTML, "\n\t\t<div id=\"ms-message\" data-ms-message-text></div>\n\t\t").concat(closeIcon.outerHTML, "\n\t\t</div>");
+    var errorHTML = "<div data-ms-message class=\"ms-error-message\">\n\t\t" + errorStatusIcon.outerHTML + "\n\t\t<div id=\"ms-message\" data-ms-message-text></div>\n\t\t" + closeIcon.outerHTML + "\n\t\t</div>";
     var errordiv = document.createElement("div");
     errordiv.setAttribute("data-ms-message", "error");
     errordiv.innerHTML = errorHTML;
     errordiv.style.display = "none";
     document.body.appendChild(errordiv);
 };
-exports.addErrorBox = addErrorBox;
-var initCSS = function () {
+exports.initCSS = function () {
     var cssEl = document.createElement("style");
     var css = "\n\t\t@keyframes fadeIn {\n\t\t\t0% {\n\t\t\t\topacity: 0;\n\t\t\t}\n\t\t\t100% {\n\t\t\t\topacity: 1;\n\t\t\t}\n\t\t}\n\t\t.ms-error-message { \n\t\t\t\tposition: fixed;\n\t\t\t\tleft: 50%;\n\t\t\t\tbottom: 3%;\n\t\t\t\ttransform: translate(-50%, -50%);\n\t\t\t\tmargin: 0 auto;\n\t\t\t\tz-index: 10000000; \n\t\t\t\tdisplay: flex; \n\t\t\t\talign-items: center;\n\t\t\t\tpadding: 12px 16px;\n\t\t\t\tborder-radius: 8px; \n\t\t\t\tbackground-color: #0A0A0A; \n\t\t\t\tcolor: #fff; \n\t\t\t\tfont-size: 16.8px; \n\t\t\t\tline-height: 28px; \n\t\t\t\tfont-weight: 500; \n\t\t\t\ttransform-origin: center;\n\t\t\t\tanimation: fadeIn 0.2s ease-in;\n\t\t\t\t-webkit-animation: fadeIn 0.2s ease-in;\n\t\t\t\t-moz-animation: fadeIn 0.2s ease-in;\n\t\t\t\t-o-animation: fadeIn 0.2s ease-in;\n\t\t\t\t-ms-animation: fadeIn 0.2s ease-in;\n\t\t\t}\n\t\t\t#ms-status-icon {\n\t\t\t\twidth: 20px;\n\t\t\t\theight: 20px;\n\t\t\t\tmargin-right: 12px;\n\t\t\t\t}\n\t\t\t\t#ms-status-close {\n\t\t\t\t\tmargin-left: 20px;\n\t\t\t\t\tcursor: pointer;\n\t\t\t\t\t}\n\t\t\t\t\t#ms-status-close svg {\n\t\t\t\t\t\theight: 12px;\n\t\t\t\t\t}";
     cssEl.setAttribute("data-ms-style", "");
     cssEl.appendChild(document.createTextNode(css));
     document.head.appendChild(cssEl);
 };
-exports.initCSS = initCSS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberstack/dom",
-  "version": "1.9.14",
+  "version": "1.9.16",
   "main": "./lib/index.js",
   "files": [
     "lib/**/*"