@memberstack/dom 1.9.3 → 1.9.6

package/lib/methods/index.js

@@ -14,9 +14,11 @@ var methods = {
     onAuthChange: auth_1.onAuthChange,
 };
 function init(props) {
-    var requests = (0, requests_1.initRequest)({
+    var requests = requests_1.initRequest({
         publicKey: props.publicKey,
-        token: (0, cookies_1.getMemberCookie)(),
+        appId: props.appId,
+        sessionDurationDays: props.sessionDurationDays,
+        token: cookies_1.getMemberCookie(),
     });
     var allMethods = Object.assign(methods, requests);
     if (typeof window !== "undefined") {

package/lib/methods/requests/index.d.ts

@@ -9,17 +9,19 @@ export interface GetCurrentMemberParams {
 }
 export interface ClientConfig {
     publicKey: string;
+    sessionDurationDays?: number;
+    appId?: string;
     token?: string;
     customEndpoint?: string;
 }
 declare type BearerToken = string;
-export declare const initRequest: ({ publicKey, token, customEndpoint, }: ClientConfig) => {
+export declare const initRequest: ({ publicKey, appId, token, customEndpoint, sessionDurationDays }: ClientConfig) => {
     getApp(): Promise<Payloads.AppPayload>;
     getAuthProviders(): Promise<Payloads.AppPayload>;
     loginMemberEmailPassword(params: Params.LoginMemberEmailPasswordParams): Promise<Payloads.LoginMemberEmailPasswordPayload>;
     loginMemberAuthProvider(params: Params.LoginMemberAuthProviderParams): Promise<Payloads.LoginMemberAuthProviderPayload>;
     getPlan(params: Params.GetPlanParams): Promise<Payloads.GetPlanPayload>;
-    getPlans(params?: Params.GetPlansParams): Promise<Payloads.GetPlansPayload>;
+    getPlans(): Promise<Payloads.GetPlansPayload>;
     getRestrictedUrlGroups(): Promise<Payloads.GetRestrictedUrlGroupsPayload>;
     getCurrentMember(options?: GetCurrentMemberParams): Promise<Payloads.GetCurrentMemberPayload>;
     getMemberJSON(options?: MemberstackOptions): Promise<Payloads.GetMemberJSONPayload>;

package/lib/methods/requests/index.js

@@ -54,14 +54,15 @@ var jose_1 = require("jose");
 var auth_1 = require("../../auth");
 var cookies_1 = require("../../utils/cookies");
 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 initRequest = function (_a) {
-    var publicKey = _a.publicKey, token = _a.token, customEndpoint = _a.customEndpoint;
-    var sendRequest = (0, requests_1.createRequestHandler)({
+exports.initRequest = function (_a) {
+    var publicKey = _a.publicKey, appId = _a.appId, token = _a.token, customEndpoint = _a.customEndpoint, sessionDurationDays = _a.sessionDurationDays;
+    var sendRequest = requests_1.createRequestHandler({
         publicKey: publicKey,
         token: token,
         customEndpoint: customEndpoint,
+        appId: appId,
     }).sendRequest;
     return {
         getApp: function () {
@@ -99,8 +100,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);
+                            auth_1.setPersistedMember(data.data.member);
+                            cookies_1.setMemberCookie(data.data.tokens.accessToken, sessionDurationDays);
                             return [2 /*return*/, data];
                     }
                 });
@@ -125,28 +126,44 @@ 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,
                         })];
                 });
             });
         },
-        getPlans: function (params) {
+        getPlans: function () {
             return __awaiter(this, void 0, void 0, function () {
+                var data;
                 return __generator(this, function (_a) {
-                    return [2 /*return*/, sendRequest({
-                            method: requests_2.HttpMethod.GET,
-                            url: "/app/plans?status=".concat((params === null || params === void 0 ? void 0 : params.status) || "ALL"),
-                        })];
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, sendRequest({
+                                method: requests_2.HttpMethod.GET,
+                                url: "/app",
+                            })];
+                        case 1:
+                            data = (_a.sent()).data;
+                            return [2 /*return*/, {
+                                    data: data.plans
+                                }];
+                    }
                 });
             });
         },
         getRestrictedUrlGroups: function () {
             return __awaiter(this, void 0, void 0, function () {
+                var data;
                 return __generator(this, function (_a) {
-                    return [2 /*return*/, sendRequest({
-                            method: requests_2.HttpMethod.GET,
-                            url: "/app/content-groups",
-                        })];
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, sendRequest({
+                                method: requests_2.HttpMethod.GET,
+                                url: "/app",
+                            })];
+                        case 1:
+                            data = (_a.sent()).data;
+                            return [2 /*return*/, {
+                                    data: data.contentGroups
+                                }];
+                    }
                 });
             });
         },
@@ -160,7 +177,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*/];
                             }
                         });
@@ -176,7 +193,7 @@ var initRequest = function (_a) {
                     // 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 {
@@ -227,10 +244,10 @@ var initRequest = function (_a) {
                 var queryParams;
                 return __generator(this, function (_a) {
                     queryParams = params &&
-                        new URLSearchParams(__assign(__assign(__assign({}, (params.first && { first: "".concat(params.first) })), (params.after && { after: params.after })), (params.order && { order: params.order })));
+                        new URLSearchParams(__assign(__assign(__assign({}, (params.first && { first: "" + params.first })), (params.after && { after: params.after })), (params.order && { order: params.order })));
                     return [2 /*return*/, sendRequest({
                             method: requests_2.HttpMethod.GET,
-                            url: "/member/invoices".concat((queryParams === null || queryParams === void 0 ? void 0 : queryParams.toString().length) ? "?".concat(queryParams) : ""),
+                            url: "/member/invoices" + ((queryParams === null || queryParams === void 0 ? void 0 : queryParams.toString().length) ? "?" + queryParams : ""),
                             headers: addHeaders(options),
                         })];
                 });
@@ -241,10 +258,10 @@ var initRequest = function (_a) {
                 var queryParams;
                 return __generator(this, function (_a) {
                     queryParams = params &&
-                        new URLSearchParams(__assign(__assign(__assign({}, (params.first && { first: "".concat(params.first) })), (params.after && { after: params.after })), (params.order && { order: params.order })));
+                        new URLSearchParams(__assign(__assign(__assign({}, (params.first && { first: "" + params.first })), (params.after && { after: params.after })), (params.order && { order: params.order })));
                     return [2 /*return*/, sendRequest({
                             method: requests_2.HttpMethod.GET,
-                            url: "/member/receipts".concat((queryParams === null || queryParams === void 0 ? void 0 : queryParams.toString().length) ? "?".concat(queryParams) : ""),
+                            url: "/member/receipts" + ((queryParams === null || queryParams === void 0 ? void 0 : queryParams.toString().length) ? "?" + queryParams : ""),
                             headers: addHeaders(options),
                         })];
                 });
@@ -255,7 +272,7 @@ var initRequest = function (_a) {
                 return __generator(this, function (_a) {
                     return [2 /*return*/, sendRequest({
                             method: requests_2.HttpMethod.GET,
-                            url: "/member/planConnections/".concat(params.planConnectionId, "/authentication-client-secret"),
+                            url: "/member/planConnections/" + params.planConnectionId + "/authentication-client-secret",
                             headers: addHeaders(options),
                         })];
                 });
@@ -505,8 +522,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);
+                            auth_1.setPersistedMember(data.data.member);
+                            cookies_1.setMemberCookie(data.data.tokens.accessToken, sessionDurationDays);
                             return [2 /*return*/, data];
                     }
                 });
@@ -572,7 +589,7 @@ var initRequest = function (_a) {
         logout: function (options) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
-                    (0, auth_1.unsetPersistedMember)();
+                    auth_1.unsetPersistedMember();
                     return [2 /*return*/, sendRequest({
                             method: requests_2.HttpMethod.POST,
                             url: "/member/logout",
@@ -605,11 +622,10 @@ var initRequest = function (_a) {
             return __awaiter(this, void 0, void 0, function () {
                 var claims;
                 return __generator(this, function (_b) {
-                    claims = (0, jose_1.decodeJwt)(token);
+                    claims = jose_1.decodeJwt(token);
                     return [2 /*return*/, claims];
                 });
             });
         },
     };
 };
-exports.initRequest = initRequest;

package/lib/methods/requests/requests.d.ts

@@ -5,11 +5,13 @@ export declare enum HttpMethod {
 export declare enum HttpHeaders {
     AUTHORIZATION = "Authorization",
     API_KEY = "X-API-Key",
+    APP_ID = "X-APP-ID",
     API_VERSION = "X-API-Version",
     USER_AGENT = "X-User-Agent"
 }
-export declare const createRequestHandler: ({ publicKey, token, customEndpoint, }: {
+export declare const createRequestHandler: ({ publicKey, appId, token, customEndpoint, }: {
     publicKey: any;
+    appId: any;
     token: any;
     customEndpoint: any;
 }) => {

package/lib/methods/requests/requests.js

@@ -62,52 +62,52 @@ var HttpHeaders;
 (function (HttpHeaders) {
     HttpHeaders["AUTHORIZATION"] = "Authorization";
     HttpHeaders["API_KEY"] = "X-API-Key";
+    HttpHeaders["APP_ID"] = "X-APP-ID";
     HttpHeaders["API_VERSION"] = "X-API-Version";
     HttpHeaders["USER_AGENT"] = "X-User-Agent";
 })(HttpHeaders = exports.HttpHeaders || (exports.HttpHeaders = {}));
-var createRequestHandler = function (_a) {
-    var publicKey = _a.publicKey, token = _a.token, customEndpoint = _a.customEndpoint;
+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, authHeader, formattedUrl, res, e_1;
-            var _a;
-            var _b, _c, _d, _e, _f, _g, _h, _j;
-            return __generator(this, function (_k) {
-                switch (_k.label) {
+            var _a, _b, _c;
+            var _d, _e, _f, _g, _h, _j, _k, _l;
+            return __generator(this, function (_m) {
+                switch (_m.label) {
                     case 0:
-                        _k.trys.push([0, 2, , 3]);
+                        _m.trys.push([0, 2, , 3]);
                         url = data.url;
                         authHeader = [
-                            (_c = (_b = data.headers) === null || _b === void 0 ? void 0 : _b["Authorization"]) === null || _c === void 0 ? void 0 : _c.replace("Bearer ", ""),
+                            (_e = (_d = data.headers) === null || _d === void 0 ? void 0 : _d["Authorization"]) === null || _e === void 0 ? void 0 : _e.replace("Bearer ", ""),
                             token,
                             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({}, (authHeader && { authorization: "Bearer ".concat(authHeader) })), (_a = {}, _a[HttpHeaders.API_KEY] = publicKey, _a[HttpHeaders.USER_AGENT] = "@memberstack/client@1.2.0", _a)), 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 = _k.sent();
-                        if ((_d = res === null || res === void 0 ? void 0 : res.headers) === null || _d === void 0 ? void 0 : _d["ms-mid"]) {
+                        res = _m.sent();
+                        if ((_f = res === null || res === void 0 ? void 0 : res.headers) === null || _f === void 0 ? void 0 : _f["ms-mid"]) {
                             token = res.headers["ms-mid"];
                         }
-                        if ((_e = res === null || res === void 0 ? void 0 : res.data) === null || _e === void 0 ? void 0 : _e.error) {
+                        if ((_g = res === null || res === void 0 ? void 0 : res.data) === null || _g === void 0 ? void 0 : _g.error) {
                             if (res.data.error.name === "JsonWebTokenError") {
                                 throw {
                                     code: "client/invalid-token",
                                     message: "An invalid token has been provided. Please make sure the token is valid.",
                                 };
                             }
-                            throw (_f = res.data) === null || _f === void 0 ? void 0 : _f.error;
+                            throw (_h = res.data) === null || _h === void 0 ? void 0 : _h.error;
                         }
                         return [2 /*return*/, res === null || res === void 0 ? void 0 : res.data];
                     case 2:
-                        e_1 = _k.sent();
+                        e_1 = _m.sent();
                         if (!e_1.response)
                             throw e_1;
-                        throw ((_h = (_g = e_1.response) === null || _g === void 0 ? void 0 : _g.data) === null || _h === void 0 ? void 0 : _h.error) || ((_j = e_1.response) === null || _j === void 0 ? void 0 : _j.data);
+                        throw ((_k = (_j = e_1.response) === null || _j === void 0 ? void 0 : _j.data) === null || _k === void 0 ? void 0 : _k.error) || ((_l = e_1.response) === null || _l === void 0 ? void 0 : _l.data);
                     case 3: return [2 /*return*/];
                 }
             });
         }); },
     };
 };
-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/types/utils/payloads.d.ts

@@ -1,7 +1,3 @@
-declare type Domain = {
-    url: string;
-    verified: boolean;
-};
 export declare namespace Payload {
     interface PaginatedResponse<T> {
         hasNext: boolean;
@@ -18,14 +14,25 @@ export declare namespace Payload {
         App: {
             id: string;
             name: string;
-            domains?: Domain[];
+            mode: "live" | "sandbox";
             plans: Transforms["Plan"][];
-            customFields: Transforms["CustomField"][];
+            contentGroups: Transforms["RestrictedUrlGroup"][];
+            customField: Transforms["CustomField"][];
+            branding: Transforms["Branding"];
+        };
+        Branding: {
+            logo: string;
+            colors: {
+                lightMode: {
+                    primaryButton: string;
+                };
+            };
         };
         RestrictedUrlGroup: {
             id: string;
             name: string;
             key: string;
+            allowAllMembers: boolean;
             redirect: string;
             urls: {
                 url: string;
@@ -43,7 +50,6 @@ export declare namespace Payload {
             };
             member: Transforms["Member"];
             redirect: string;
-            loginRedirect: string;
             payment: {
                 requirePayment: string[];
                 requireAuthentication: string[];
@@ -57,6 +63,7 @@ export declare namespace Payload {
             auth: {
                 email: string;
             };
+            loginRedirect: string;
             stripeCustomerId: string;
             createdAt: string;
             metaData: object;
@@ -148,10 +155,10 @@ export declare namespace Payload {
             permissions: Transforms["Permission"][];
         };
         CustomField: {
-            id: string;
+            order: number;
             key: string;
             label: string;
-            plans: Transforms["Plan"][];
+            hidden: boolean;
         };
         MemberPlanConnection: {
             id: 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 memberAuthCookie = "_ms-mid";
-var setMemberCookie = function (token, expires) {
+exports.setMemberCookie = function (token, expires) {
     js_cookie_1.default.set(memberAuthCookie, token, {
-        expires: expires || new Date(Date.now() + 604800000),
+        expires: (expires && Number(expires)) || 3,
         sameSite: "strict",
     });
 };
-exports.setMemberCookie = setMemberCookie;
-var getMemberCookie = function () {
+exports.getMemberCookie = function () {
     return js_cookie_1.default.get(memberAuthCookie);
 };
-exports.getMemberCookie = getMemberCookie;

package/package.json

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