authscape 1.0.334 → 1.0.338

package/index.js

@@ -2228,6 +2228,10 @@ var _material = require("@mui/material");
 var _xDataGrid = require("@mui/x-data-grid");
 var _PublishRounded = _interopRequireDefault(require("@mui/icons-material/PublishRounded"));
 var _image = _interopRequireDefault(require("next/image"));
+var _InputLabel = _interopRequireDefault(require("@mui/material/InputLabel"));
+var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
+var _FormControl = _interopRequireDefault(require("@mui/material/FormControl"));
+var _Select = _interopRequireDefault(require("@mui/material/Select"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -2240,9 +2244,14 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+// remove after NPM
+// import {FileUploader, apiService, ColorPicker} from 'authscape';
+
 function OEMEditor(_ref) {
   var loadedUser = _ref.loadedUser,
     notification = _ref.notification,
+    _ref$showAllDomains = _ref.showAllDomains,
+    showAllDomains = _ref$showAllDomains === void 0 ? false : _ref$showAllDomains,
     _ref$companyId = _ref.companyId,
     companyId = _ref$companyId === void 0 ? null : _ref$companyId;
   var monaco = (0, _react2.useMonaco)();
@@ -2262,57 +2271,123 @@ function OEMEditor(_ref) {
     setFonts = _useState6[1];
   var _useState7 = (0, _react.useState)([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    dnsFields = _useState8[0],
-    setDnsFields = _useState8[1];
-  var _useState9 = (0, _react.useState)(null),
+    oEMDomainList = _useState8[0],
+    setOEMDomainList = _useState8[1];
+  var _useState9 = (0, _react.useState)([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    selectedFont = _useState10[0],
-    setSelectedFont = _useState10[1];
+    dnsFields = _useState10[0],
+    setDnsFields = _useState10[1];
   var _useState11 = (0, _react.useState)(null),
     _useState12 = _slicedToArray(_useState11, 2),
-    fontUri = _useState12[0],
-    setFontUri = _useState12[1];
-  var _useState13 = (0, _react.useState)(''),
+    selectedFont = _useState12[0],
+    setSelectedFont = _useState12[1];
+  var _useState13 = (0, _react.useState)(null),
     _useState14 = _slicedToArray(_useState13, 2),
-    stateBaseUri = _useState14[0],
-    setBaseUri = _useState14[1];
+    fontUri = _useState14[0],
+    setFontUri = _useState14[1];
+  var _useState15 = (0, _react.useState)(null),
+    _useState16 = _slicedToArray(_useState15, 2),
+    oEMDomain = _useState16[0],
+    setOEMDomain = _useState16[1];
+  var _useState17 = (0, _react.useState)(''),
+    _useState18 = _slicedToArray(_useState17, 2),
+    stateBaseUri = _useState18[0],
+    setBaseUri = _useState18[1];
   var handleChange = function handleChange(event, newValue) {
     setValue(newValue);
   };
   var GetBaseUrl = function GetBaseUrl() {
     return window.location.protocol + "//" + window.location.host;
   };
+  var loadDNSFields = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _domain,
+        domain,
+        responseFields,
+        _args = arguments;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _domain = _args.length > 0 && _args[0] !== undefined ? _args[0] : null;
+            domain = null;
+            if (_domain != null) {
+              domain = _domain;
+            } else {
+              domain = GetBaseUrl();
+            }
+            _context.next = 5;
+            return apiService().get("/WhiteLabel/GetFields?domain=" + domain + (companyId != null ? "&companyId=" + companyId : ""));
+          case 5:
+            responseFields = _context.sent;
+            if (responseFields != null && responseFields.status == 200) {
+              setDnsFields(responseFields.data);
+            }
+          case 7:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function loadDNSFields() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  (0, _react.useEffect)(function () {
+    // if (oEMDomain != null)
+    // {
+    loadDNSFields(oEMDomain);
+    // }
+  }, [oEMDomain]);
   (0, _react.useEffect)(function () {
     if (loadedUser) {
       var fetchData = /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-          var response, domain, responseFields;
-          return _regeneratorRuntime().wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
+        var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+          var response, _response, _response2;
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
               case 0:
-                _context.next = 2;
+                _context2.next = 2;
                 return apiService().get("/WhiteLabel/GetFonts");
               case 2:
-                response = _context.sent;
+                response = _context2.sent;
                 if (response != null && response.status == 200) {
                   setFonts(response.data);
                 }
-                domain = GetBaseUrl();
-                _context.next = 7;
-                return apiService().get("/WhiteLabel/GetFields?domain=" + domain + (companyId != null ? "&companyId=" + companyId : ""));
-              case 7:
-                responseFields = _context.sent;
-                if (responseFields != null && responseFields.status == 200) {
-                  setDnsFields(responseFields.data);
+                _context2.next = 6;
+                return loadDNSFields();
+              case 6:
+                if (!showAllDomains) {
+                  _context2.next = 13;
+                  break;
                 }
+                _context2.next = 9;
+                return apiService().get("/WhiteLabel/GetAllDomains");
               case 9:
+                _response = _context2.sent;
+                if (_response != null && _response.status == 200) {
+                  setOEMDomainList(_response.data);
+                }
+                _context2.next = 17;
+                break;
+              case 13:
+                _context2.next = 15;
+                return apiService().get("/WhiteLabel/GetAllDomainsUser");
+              case 15:
+                _response2 = _context2.sent;
+                if (_response2 != null && _response2.status == 200) {
+                  setOEMDomainList(_response2.data);
+                  if (_response2.data.length > 0) {
+                    setOEMDomain(_response2.data[0].name);
+                  }
+                }
+              case 17:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
-          }, _callee);
+          }, _callee2);
         }));
         return function fetchData() {
-          return _ref2.apply(this, arguments);
+          return _ref3.apply(this, arguments);
         };
       }();
       fetchData();
@@ -2356,37 +2431,37 @@ function OEMEditor(_ref) {
   }];
   (0, _react.useEffect)(function () {
     var fetchData = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var baseUri, response;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var response;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               // if (monaco) {
               //     //console.log("here is the monaco instance:", monaco);
               // }
-              baseUri = GetBaseUrl();
-              setBaseUri(baseUri);
-              _context2.next = 4;
-              return apiService().get("/WhiteLabel/GetEditorData?domain=" + baseUri + (companyId != null ? "&companyId=" + companyId : ""));
-            case 4:
-              response = _context2.sent;
+
+              setData(null);
+              _context3.next = 3;
+              return apiService().get("/WhiteLabel/GetEditorData?domain=" + oEMDomain + (companyId != null ? "&companyId=" + companyId : ""));
+            case 3:
+              response = _context3.sent;
               if (response.status == 200) {
                 setData(response.data);
                 setSelectedFont(response.data.fontFamily);
                 setFontUri(response.data.fontUrl);
               }
-            case 6:
+            case 5:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2);
+        }, _callee3);
       }));
       return function fetchData() {
-        return _ref3.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }();
     fetchData();
-  }, [monaco]);
+  }, [monaco, oEMDomain]);
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_Box["default"], {
     sx: {
       width: '100%'
@@ -2394,10 +2469,31 @@ function OEMEditor(_ref) {
   }, selectedFont != null && fontUri == null && /*#__PURE__*/_react["default"].createElement("link", {
     href: "https://fonts.googleapis.com/css2?family=" + selectedFont,
     rel: "stylesheet"
-  }), /*#__PURE__*/_react["default"].createElement(_Box["default"], {
+  }), oEMDomain != null && /*#__PURE__*/_react["default"].createElement(_Box["default"], {
+    sx: {
+      paddingTop: 6
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_FormControl["default"], {
+    fullWidth: true
+  }, /*#__PURE__*/_react["default"].createElement(_InputLabel["default"], {
+    id: "demo-simple-select-label"
+  }, "Website Domain"), /*#__PURE__*/_react["default"].createElement(_Select["default"], {
+    labelId: "demo-simple-select-label",
+    id: "demo-simple-select",
+    defaultValue: oEMDomain,
+    label: "Website Domain",
+    onChange: function onChange(val) {
+      setOEMDomain(val.target.value);
+    }
+  }, oEMDomainList.map(function (dns) {
+    return /*#__PURE__*/_react["default"].createElement(_MenuItem["default"], {
+      value: dns.name
+    }, dns.name);
+  })))), /*#__PURE__*/_react["default"].createElement(_Box["default"], {
     sx: {
       borderBottom: 1,
-      borderColor: 'divider'
+      borderColor: 'divider',
+      paddingTop: 2
     }
   }, /*#__PURE__*/_react["default"].createElement(_Tabs["default"], {
     value: value,
@@ -2415,16 +2511,16 @@ function OEMEditor(_ref) {
     sx: {
       padding: 2
     }
-  }, value == 0 && /*#__PURE__*/_react["default"].createElement(_Box["default"], null, /*#__PURE__*/_react["default"].createElement(_Box["default"], {
+  }, value == 0 && /*#__PURE__*/_react["default"].createElement(_Box["default"], null, data != null && /*#__PURE__*/_react["default"].createElement(_Box["default"], null, /*#__PURE__*/_react["default"].createElement(_Box["default"], {
     sx: {
       paddingBottom: 4
     }
-  }, data.appIconUrl == null && /*#__PURE__*/_react["default"].createElement(_image["default"], {
-    src: "/DefaultNoImage.svg",
+  }, data != null && data.appIconUrl != null && data.appIconUrl.trim() != "" ? /*#__PURE__*/_react["default"].createElement(_image["default"], {
+    src: data.appIconUrl,
     width: 200,
     height: 200
-  }), data.appIconUrl != null && /*#__PURE__*/_react["default"].createElement(_image["default"], {
-    src: data.appIconUrl,
+  }) : /*#__PURE__*/_react["default"].createElement(_image["default"], {
+    src: "/DefaultNoImage.svg",
     width: 200,
     height: 200
   }), /*#__PURE__*/_react["default"].createElement(FileUploader, {
@@ -2458,11 +2554,11 @@ function OEMEditor(_ref) {
       name: dnsField.name,
       defaultColor: dnsField.value,
       onColorChanged: /*#__PURE__*/function () {
-        var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(name, hex) {
-          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-            while (1) switch (_context3.prev = _context3.next) {
+        var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(name, hex) {
+          return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+            while (1) switch (_context4.prev = _context4.next) {
               case 0:
-                _context3.next = 2;
+                _context4.next = 2;
                 return apiService().post("/WhiteLabel/SetFieldValue", {
                   id: dnsField.id,
                   fieldId: dnsField.fieldId,
@@ -2472,19 +2568,19 @@ function OEMEditor(_ref) {
                 notification(dnsField.name + " Saved");
               case 3:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
-          }, _callee3);
+          }, _callee4);
         }));
         return function (_x2, _x3) {
-          return _ref4.apply(this, arguments);
+          return _ref5.apply(this, arguments);
         };
       }()
     }))));
-  })), value == 1 && /*#__PURE__*/_react["default"].createElement(_Box["default"], {
+  }))), value == 1 && /*#__PURE__*/_react["default"].createElement(_Box["default"], {
     value: value,
     index: 1
-  }, /*#__PURE__*/_react["default"].createElement(_material.Grid, {
+  }, data != null && /*#__PURE__*/_react["default"].createElement(_Box["default"], null, /*#__PURE__*/_react["default"].createElement(_material.Grid, {
     container: true,
     spacing: 2
   }, /*#__PURE__*/_react["default"].createElement(_material.Grid, {
@@ -2506,33 +2602,32 @@ function OEMEditor(_ref) {
     // rowSelectionModel={selectedFont}
     ,
     onRowClick: /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-        var baseUri, response;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(params) {
+        var response;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              baseUri = GetBaseUrl();
-              _context4.next = 3;
+              _context5.next = 2;
               return apiService().post("/WhiteLabel/SetFont", {
                 companyId: companyId,
-                domain: baseUri,
+                domain: oEMDomain,
                 value: params.row.label
               });
-            case 3:
-              response = _context4.sent;
+            case 2:
+              response = _context5.sent;
               if (response != null && response.status == 200) {
                 setSelectedFont(params.row.label);
                 setFontUri(null);
                 notification("Font saved!");
               }
-            case 5:
+            case 4:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4);
+        }, _callee5);
       }));
       return function (_x4) {
-        return _ref5.apply(this, arguments);
+        return _ref6.apply(this, arguments);
       };
     }()
   }))), /*#__PURE__*/_react["default"].createElement(_material.Grid, {
@@ -2575,7 +2670,7 @@ function OEMEditor(_ref) {
     sx: {
       fontFamily: selectedFont
     }
-  }, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed ut ultricies odio. Nunc ut quam turpis. In hac habitasse platea dictumst. Suspendisse potenti. Nullam malesuada, purus id sagittis vestibulum, massa tellus gravida elit, vitae ultrices tortor nulla ac nunc. Aenean tempus semper est vel convallis. Sed feugiat, risus eu tincidunt eleifend, purus metus vulputate nulla, et condimentum sapien erat in nisi. Nunc non malesuada libero. Donec tempus tincidunt mi at vulputate. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Suspendisse potenti. Etiam nec eleifend orci. Suspendisse in est vel nunc rhoncus bibendum vitae id felis. Integer bibendum dolor elit, at tincidunt lacus tempor ac. Maecenas lobortis, mauris at condimentum feugiat, nulla orci condimentum massa, sed facilisis tellus ligula vitae metus. Aliquam erat volutpat. Quisque dignissim felis augue, at semper nisl posuere ut. Proin fringilla diam vitae faucibus finibus.", /*#__PURE__*/_react["default"].createElement("br", null), /*#__PURE__*/_react["default"].createElement("br", null), "Aenean tempus semper est vel convallis. Sed feugiat, risus eu tincidunt eleifend, purus metus vulputate nulla, et condimentum sapien erat in nisi. Nunc non malesuada libero. Donec tempus tincidunt mi at vulputate. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Suspendisse potenti")))), value == 2 && /*#__PURE__*/_react["default"].createElement(_Box["default"], {
+  }, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed ut ultricies odio. Nunc ut quam turpis. In hac habitasse platea dictumst. Suspendisse potenti. Nullam malesuada, purus id sagittis vestibulum, massa tellus gravida elit, vitae ultrices tortor nulla ac nunc. Aenean tempus semper est vel convallis. Sed feugiat, risus eu tincidunt eleifend, purus metus vulputate nulla, et condimentum sapien erat in nisi. Nunc non malesuada libero. Donec tempus tincidunt mi at vulputate. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Suspendisse potenti. Etiam nec eleifend orci. Suspendisse in est vel nunc rhoncus bibendum vitae id felis. Integer bibendum dolor elit, at tincidunt lacus tempor ac. Maecenas lobortis, mauris at condimentum feugiat, nulla orci condimentum massa, sed facilisis tellus ligula vitae metus. Aliquam erat volutpat. Quisque dignissim felis augue, at semper nisl posuere ut. Proin fringilla diam vitae faucibus finibus.", /*#__PURE__*/_react["default"].createElement("br", null), /*#__PURE__*/_react["default"].createElement("br", null), "Aenean tempus semper est vel convallis. Sed feugiat, risus eu tincidunt eleifend, purus metus vulputate nulla, et condimentum sapien erat in nisi. Nunc non malesuada libero. Donec tempus tincidunt mi at vulputate. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Suspendisse potenti"))))), value == 2 && /*#__PURE__*/_react["default"].createElement(_Box["default"], {
     value: value,
     index: 2
   }, /*#__PURE__*/_react["default"].createElement(_material.Grid, {
@@ -2600,28 +2695,27 @@ function OEMEditor(_ref) {
       marginTop: 4
     },
     variant: "contained",
-    onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-      var baseUri, response;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+    onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+      var response;
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            baseUri = GetBaseUrl();
-            _context5.next = 3;
+            _context6.next = 2;
             return apiService().post("/WhiteLabel/SetGlobalCSS", {
               companyId: companyId,
-              domain: baseUri,
+              domain: oEMDomain,
               value: cssEditorRef.current.getValue()
             });
-          case 3:
-            response = _context5.sent;
+          case 2:
+            response = _context6.sent;
             if (response != null && response.status == 200) {
               notification("CSS Saved!");
             }
-          case 5:
+          case 4:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5);
+      }, _callee6);
     }))
   }, "Save Changes"))), /*#__PURE__*/_react["default"].createElement(_Box["default"], {
     sx: {
@@ -2632,8 +2726,8 @@ function OEMEditor(_ref) {
     onMount: handleCSSEditorDidMount,
     defaultLanguage: "css",
     theme: "vs-dark",
-    defaultValue: data.prettyCSS == null ? "" : data.prettyCSS
-  }), data.prettyCSS)), value == 3 && /*#__PURE__*/_react["default"].createElement(_Box["default"], {
+    defaultValue: data == null || data.prettyCSS == null ? "" : data.prettyCSS
+  }))), value == 3 && /*#__PURE__*/_react["default"].createElement(_Box["default"], {
     value: value,
     index: 3
   }, /*#__PURE__*/_react["default"].createElement(_material.Grid, {
@@ -2658,39 +2752,38 @@ function OEMEditor(_ref) {
       marginTop: 4
     },
     variant: "contained",
-    onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-      var baseUri, response;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+    onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+      var response;
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            baseUri = GetBaseUrl();
-            _context6.next = 3;
+            _context7.next = 2;
             return apiService().post("/WhiteLabel/SetGlobalHTML", {
               companyId: companyId,
-              domain: baseUri,
+              domain: oEMDomain,
               value: htmlEditorRef.current.getValue()
             });
-          case 3:
-            response = _context6.sent;
+          case 2:
+            response = _context7.sent;
             if (response != null && response.status == 200) {
               notification("HTML saved!");
             }
-          case 5:
+          case 4:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6);
+      }, _callee7);
     }))
   }, "Save Changes"))), /*#__PURE__*/_react["default"].createElement(_Box["default"], {
     sx: {
       paddingTop: 1
     }
-  }, /*#__PURE__*/_react["default"].createElement(_react2["default"], {
+  }, data != null && /*#__PURE__*/_react["default"].createElement(_react2["default"], {
     height: "70vh",
     onMount: handleHtmlEditorDidMount,
     defaultLanguage: "html",
     theme: "vs-dark",
-    defaultValue: data.prettyHTML == null ? "" : data.prettyHTML
+    defaultValue: data == null || data.prettyHTML == null ? "" : data.prettyHTML
   })))))));
 }
 "use strict";
@@ -2937,6 +3030,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var CheckoutForm = function CheckoutForm(_ref) {
   var payButtonText = _ref.payButtonText,
+    invoiceId = _ref.invoiceId,
     clientSecret = _ref.clientSecret,
     currentUser = _ref.currentUser,
     paymentMethodType = _ref.paymentMethodType,
@@ -2955,7 +3049,7 @@ var CheckoutForm = function CheckoutForm(_ref) {
     setErrorMessage = _useState4[1];
   var handleSubmit = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(event) {
-      var _yield$stripe$confirm, error, response, setupIntent, addPaymentMethodResponse, _response, _yield$stripe$confirm2, _error, _response2, paymentIntent;
+      var _yield$stripe$confirm, error, response, setupIntent, addPaymentMethodResponse, _response, _response2, _yield$stripe$confirm2, _error, _response3, paymentIntent;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -2971,7 +3065,7 @@ var CheckoutForm = function CheckoutForm(_ref) {
             return _context.abrupt("return");
           case 4:
             if (!(amount == null || currentUser != null)) {
-              _context.next = 47;
+              _context.next = 54;
               break;
             }
             _context.next = 7;
@@ -2995,7 +3089,7 @@ var CheckoutForm = function CheckoutForm(_ref) {
             // details incomplete)
             setIsPaymentProcessing(false);
             setErrorMessage(error.message);
-            _context.next = 45;
+            _context.next = 52;
             break;
           case 14:
             // Your customer will be redirected to your `return_url`. For some payment
@@ -3009,7 +3103,7 @@ var CheckoutForm = function CheckoutForm(_ref) {
             response = _context.sent;
             setupIntent = response.setupIntent;
             _context.t0 = setupIntent.status;
-            _context.next = _context.t0 === 'succeeded' ? 22 : _context.t0 === 'processing' ? 36 : _context.t0 === 'requires_payment_method' ? 39 : 42;
+            _context.next = _context.t0 === 'succeeded' ? 22 : _context.t0 === 'processing' ? 43 : _context.t0 === 'requires_payment_method' ? 46 : 49;
             break;
           case 22:
             _context.next = 24;
@@ -3021,51 +3115,70 @@ var CheckoutForm = function CheckoutForm(_ref) {
           case 24:
             addPaymentMethodResponse = _context.sent;
             if (!(addPaymentMethodResponse != null && addPaymentMethodResponse.status == 200)) {
-              _context.next = 34;
+              _context.next = 41;
               break;
             }
             onResponse("succeeded", setupIntent.id, setupIntent.payment_method);
             if (!(amount != null)) {
-              _context.next = 32;
+              _context.next = 39;
+              break;
+            }
+            if (!(invoiceId != null)) {
+              _context.next = 35;
               break;
             }
-            _context.next = 30;
+            _context.next = 31;
+            return apiService().post("/Invoices/PayInvoice", {
+              invoiceId: invoiceId,
+              walletPaymentMethodId: addPaymentMethodResponse.data
+            });
+          case 31:
+            _response = _context.sent;
+            if (_response != null && _response.status == 200) {
+              onResponse("paid", null);
+            } else {
+              onResponse("failed", null);
+            }
+            _context.next = 39;
+            break;
+          case 35:
+            _context.next = 37;
             return apiService().post("/Payment/Charge", {
               paymentMethodType: paymentMethodType,
               walletPaymentMethodId: addPaymentMethodResponse.data,
               amount: amount
             });
-          case 30:
-            _response = _context.sent;
-            if (_response != null && _response.status == 200) {
-              onResponse("paid", _response.data.stripePaymentIntentId);
+          case 37:
+            _response2 = _context.sent;
+            if (_response2 != null && _response2.status == 200) {
+              onResponse("paid", _response2.data.stripePaymentIntentId);
             } else {
               onResponse("failed", null);
             }
-          case 32:
-            _context.next = 35;
+          case 39:
+            _context.next = 42;
             break;
-          case 34:
+          case 41:
             onResponse("failed", null);
-          case 35:
-            return _context.abrupt("break", 45);
-          case 36:
+          case 42:
+            return _context.abrupt("break", 52);
+          case 43:
             onResponse("processing", setupIntent.id, setupIntent.payment_method);
             setIsPaymentProcessing(false);
-            return _context.abrupt("break", 45);
-          case 39:
+            return _context.abrupt("break", 52);
+          case 46:
             onResponse("requires_payment_method", null);
             setIsPaymentProcessing(false);
-            return _context.abrupt("break", 45);
-          case 42:
+            return _context.abrupt("break", 52);
+          case 49:
             onResponse("failed", null);
             setIsPaymentProcessing(false);
-            return _context.abrupt("break", 45);
-          case 45:
-            _context.next = 81;
+            return _context.abrupt("break", 52);
+          case 52:
+            _context.next = 88;
             break;
-          case 47:
-            _context.next = 49;
+          case 54:
+            _context.next = 56;
             return stripe.confirmPayment({
               //`Elements` instance that was used to create the Payment Element
               elements: elements,
@@ -3074,11 +3187,11 @@ var CheckoutForm = function CheckoutForm(_ref) {
                 return_url: process.env.websiteBaseUri + '/confirmPayment?redirectUrl=' + encodeURIComponent(window.location.search)
               }
             });
-          case 49:
+          case 56:
             _yield$stripe$confirm2 = _context.sent;
             _error = _yield$stripe$confirm2.error;
             if (!_error) {
-              _context.next = 56;
+              _context.next = 63;
               break;
             }
             // This point will only be reached if there is an immediate error when
@@ -3086,50 +3199,50 @@ var CheckoutForm = function CheckoutForm(_ref) {
             // details incomplete)
             setIsPaymentProcessing(false);
             setErrorMessage(_error.message);
-            _context.next = 81;
+            _context.next = 88;
             break;
-          case 56:
+          case 63:
             // Your customer will be redirected to your `return_url`. For some payment
             // methods like iDEAL, your customer will be redirected to an intermediate
             // site first to authorize the payment, then redirected to the `return_url`.
-            _response2 = null;
+            _response3 = null;
             if (!(amount == null)) {
-              _context.next = 63;
+              _context.next = 70;
               break;
             }
-            _context.next = 60;
+            _context.next = 67;
             return stripe.retrieveSetupIntent(clientSecret);
-          case 60:
-            _response2 = _context.sent;
-            _context.next = 66;
+          case 67:
+            _response3 = _context.sent;
+            _context.next = 73;
             break;
-          case 63:
-            _context.next = 65;
+          case 70:
+            _context.next = 72;
             return stripe.retrievePaymentIntent(clientSecret);
-          case 65:
-            _response2 = _context.sent;
-          case 66:
-            paymentIntent = _response2.paymentIntent;
+          case 72:
+            _response3 = _context.sent;
+          case 73:
+            paymentIntent = _response3.paymentIntent;
             _context.t1 = paymentIntent.status;
-            _context.next = _context.t1 === 'succeeded' ? 70 : _context.t1 === 'processing' ? 72 : _context.t1 === 'requires_payment_method' ? 75 : 78;
+            _context.next = _context.t1 === 'succeeded' ? 77 : _context.t1 === 'processing' ? 79 : _context.t1 === 'requires_payment_method' ? 82 : 85;
             break;
-          case 70:
+          case 77:
             // need to store the payment intent with the customer if they are logged in... currentUser
             onResponse("succeeded", paymentIntent.id);
-            return _context.abrupt("break", 81);
-          case 72:
+            return _context.abrupt("break", 88);
+          case 79:
             onResponse("processing", paymentIntent.id);
             setIsPaymentProcessing(false);
-            return _context.abrupt("break", 81);
-          case 75:
+            return _context.abrupt("break", 88);
+          case 82:
             onResponse("requires_payment_method", null);
             setIsPaymentProcessing(false);
-            return _context.abrupt("break", 81);
-          case 78:
+            return _context.abrupt("break", 88);
+          case 85:
             onResponse("failed", null);
             setIsPaymentProcessing(false);
-            return _context.abrupt("break", 81);
-          case 81:
+            return _context.abrupt("break", 88);
+          case 88:
           case "end":
             return _context.stop();
         }
@@ -3404,6 +3517,7 @@ function StripePayment(_ref3) {
       options: options
     }, /*#__PURE__*/_react["default"].createElement(CheckoutForm, {
       payButtonText: payButtonText,
+      invoiceId: invoiceId,
       clientSecret: options != null ? options.clientSecret : null,
       onResponse: onResponse,
       paymentMethodType: paymentMethodType,
@@ -3457,7 +3571,7 @@ function StripePayment(_ref3) {
         marginTop: 2
       },
       onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var response, _response3;
+        var response, _response4;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -3485,9 +3599,9 @@ function StripePayment(_ref3) {
                 amount: amount
               });
             case 9:
-              _response3 = _context3.sent;
-              if (_response3 != null && _response3.status == 200) {
-                onResponse("paid", _response3.data.stripePaymentIntentId);
+              _response4 = _context3.sent;
+              if (_response4 != null && _response4.status == 200) {
+                onResponse("paid", _response4.data.stripePaymentIntentId);
               }
             case 11:
             case "end":
@@ -3505,6 +3619,7 @@ function StripePayment(_ref3) {
       options: options
     }, /*#__PURE__*/_react["default"].createElement(CheckoutForm, {
       payButtonText: payButtonText,
+      invoiceId: invoiceId,
       clientSecret: options != null ? options.clientSecret : null,
       onResponse: onResponse,
       paymentMethodType: paymentMethodType,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.334",
+  "version": "1.0.338",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/components/OEMEditor.js

@@ -10,8 +10,15 @@ import { Grid } from "@mui/material";
 import { DataGrid } from "@mui/x-data-grid";
 import PublishRoundedIcon from '@mui/icons-material/PublishRounded';
 import Image from "next/image";
+import InputLabel from '@mui/material/InputLabel';
+import MenuItem from '@mui/material/MenuItem';
+import FormControl from '@mui/material/FormControl';
+import Select from '@mui/material/Select';
 
-export function OEMEditor({loadedUser, notification, companyId = null}) {
+// remove after NPM
+// import {FileUploader, apiService, ColorPicker} from 'authscape';
+
+export function OEMEditor({loadedUser, notification, showAllDomains = false, companyId = null}) {
 
     const monaco = useMonaco();
 
@@ -21,10 +28,13 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
     const [data, setData] = useState('');
     const [value, setValue] = useState(0);
     const [fonts, setFonts] = useState([]);
+    const [oEMDomainList, setOEMDomainList] = useState([]);
     const [dnsFields, setDnsFields] = useState([]);
     const [selectedFont, setSelectedFont] = useState(null);
     const [fontUri, setFontUri] = useState(null);
 
+    const [oEMDomain, setOEMDomain] = useState(null);
+
     const [stateBaseUri, setBaseUri] = useState('');
 
     const handleChange = (event, newValue) => {
@@ -35,6 +45,35 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
       return window.location.protocol + "//" + window.location.host;
     }
 
+    const loadDNSFields = async (_domain = null) => {
+        
+        var domain = null;
+        if (_domain != null)
+        {
+            domain = _domain;
+        }
+        else
+        {
+            domain = GetBaseUrl();
+        }
+
+        let responseFields = await apiService().get("/WhiteLabel/GetFields?domain=" + domain + (companyId != null ? ("&companyId=" + companyId) : ""));
+        if (responseFields != null && responseFields.status == 200)
+        {
+          setDnsFields(responseFields.data);
+        }
+    }
+
+    useEffect(() => {
+
+        // if (oEMDomain != null)
+        // {
+            loadDNSFields(oEMDomain);
+        // }
+
+    }, [oEMDomain]);
+
+
     useEffect(() => {
 
       if (loadedUser)
@@ -47,11 +86,28 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
             setFonts(response.data);
           }
 
-          var domain = GetBaseUrl();
-          let responseFields = await apiService().get("/WhiteLabel/GetFields?domain=" + domain + (companyId != null ? ("&companyId=" + companyId) : ""));
-          if (responseFields != null && responseFields.status == 200)
+          await loadDNSFields();
+
+          if (showAllDomains)
           {
-            setDnsFields(responseFields.data);
+            let response = await apiService().get("/WhiteLabel/GetAllDomains");
+            if (response != null && response.status == 200)
+            {
+                setOEMDomainList(response.data);
+            }
+          }
+          else
+          {
+            let response = await apiService().get("/WhiteLabel/GetAllDomainsUser");
+            if (response != null && response.status == 200)
+            {
+                setOEMDomainList(response.data);
+
+                if (response.data.length > 0)
+                {
+                    setOEMDomain(response.data[0].name);
+                }
+            }
           }
 
         }
@@ -105,10 +161,9 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
             //     //console.log("here is the monaco instance:", monaco);
             // }
 
-            var baseUri = GetBaseUrl();
-            setBaseUri(baseUri);
+            setData(null);
 
-            let response = await apiService().get("/WhiteLabel/GetEditorData?domain=" + baseUri + (companyId != null ? ("&companyId=" + companyId) : ""));
+            let response = await apiService().get("/WhiteLabel/GetEditorData?domain=" + oEMDomain + (companyId != null ? ("&companyId=" + companyId) : ""));
             if (response.status == 200)
             {
                 setData(response.data);
@@ -118,7 +173,7 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
         }
         fetchData();
 
-    }, [monaco]);
+    }, [monaco, oEMDomain]);
 
     return (
         <>
@@ -127,8 +182,30 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
             {(selectedFont != null && fontUri == null) &&
             <link href={"https://fonts.googleapis.com/css2?family=" + selectedFont} rel="stylesheet"></link>
             }
+
+            {oEMDomain != null &&
+            <Box sx={{paddingTop:6}}>
+                <FormControl fullWidth>
+                    <InputLabel id="demo-simple-select-label">Website Domain</InputLabel>
+                    <Select
+                        labelId="demo-simple-select-label"
+                        id="demo-simple-select"
+                        defaultValue={oEMDomain}
+                        label="Website Domain"
+                        onChange={(val) => {
+                            setOEMDomain(val.target.value)
+                        }}>
+                            {oEMDomainList.map((dns) => {
+                                return (
+                                    <MenuItem value={dns.name}>{dns.name}</MenuItem>
+                                )
+                            })}
+                    </Select>
+                </FormControl>
+            </Box>
+            }
         
-            <Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
+            <Box sx={{ borderBottom: 1, borderColor: 'divider', paddingTop:2 }}>
                 <Tabs value={value} onChange={handleChange} aria-label="basic tabs example">
                 <Tab label="General" />
                 <Tab label="Fonts" />
@@ -141,134 +218,132 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
             <Box sx={{padding:2}}>
                 {value == 0 &&
                 <Box>
-
-                    <Box sx={{paddingBottom:4}}>
-
-                        {data.appIconUrl == null &&
-                            <Image src={"/DefaultNoImage.svg"} width={200} height={200} />
-                        }
+                    {data != null &&
+                    <Box>
+                        <Box sx={{paddingBottom:4}}>
                         
-                        {data.appIconUrl != null &&
-                            <Image src={data.appIconUrl} width={200} height={200} />
-                        }
-
-                        <FileUploader url={"/WhiteLabel/UploadAppIcon"} accept={".jpg,.jpeg,.png,.gif"} params={{
-                            domain: stateBaseUri
-                        }} multiple={true} variant='custom' onUploadCompleted={() => {
-                            window.location.reload();
-                            }}>
-
-                            <Button color="primary" variant="contained" startIcon={<PublishRoundedIcon/>}>Upload App Icon</Button>
-
-                        </FileUploader>
-
-                    </Box>
+                            {(data != null && data.appIconUrl != null && data.appIconUrl.trim() != "") ?
+                                <Image src={data.appIconUrl} width={200} height={200} /> : <Image src={"/DefaultNoImage.svg"} width={200} height={200} />
+                            }
 
+                            <FileUploader url={"/WhiteLabel/UploadAppIcon"} accept={".jpg,.jpeg,.png,.gif"} params={{
+                                domain: stateBaseUri
+                            }} multiple={true} variant='custom' onUploadCompleted={() => {
+                                window.location.reload();
+                                }}>
 
+                                <Button color="primary" variant="contained" startIcon={<PublishRoundedIcon/>}>Upload App Icon</Button>
 
-                    {dnsFields != null && dnsFields.map((dnsField, index) => {
-                    
-                    return (
-                        <Box key={index}>
-                            <Grid container spacing={2}>
-                                <Grid item xs={3}>
-                                    {dnsField.name}
-                                </Grid>
-                                <Grid item xs={9}>
+                            </FileUploader>
 
-                                <ColorPicker name={dnsField.name} defaultColor={dnsField.value} onColorChanged={async (name, hex) => {
-
-                                    await apiService().post("/WhiteLabel/SetFieldValue", {
-                                    id: dnsField.id,
-                                    fieldId: dnsField.fieldId,
-                                    value: hex
-                                    });
-
-                                    notification(dnsField.name + " Saved");
+                        </Box>
 
-                                }} />
+                        {dnsFields != null && dnsFields.map((dnsField, index) => {
+                        
+                        return (
+                            <Box key={index}>
+                                <Grid container spacing={2}>
+                                    <Grid item xs={3}>
+                                        {dnsField.name}
+                                    </Grid>
+                                    <Grid item xs={9}>
+
+                                    <ColorPicker name={dnsField.name} defaultColor={dnsField.value} onColorChanged={async (name, hex) => {
+
+                                        await apiService().post("/WhiteLabel/SetFieldValue", {
+                                        id: dnsField.id,
+                                        fieldId: dnsField.fieldId,
+                                        value: hex
+                                        });
+
+                                        notification(dnsField.name + " Saved");
+
+                                    }} />
+                                    </Grid>
                                 </Grid>
-                            </Grid>
-                        </Box>
-                    )
+                            </Box>
+                        )
 
-                    
+                        
 
-                    })}
+                        })}
+                    </Box>
+                    }
                 </Box>
                 }
                 
                 {value == 1 &&
                 <Box value={value} index={1}>
+                    {data != null &&
+                    <Box>
+                        <Grid container spacing={2}>
+                            <Grid item xs={6}>
+
+                            {loadedUser == true &&
+
+                                <Box>
+                                    <DataGrid
+                                        rows={fonts}
+                                        columns={columns}
+                                        sx={{height:"80vh", width:"100%"}}
+                                        pagination
+                                        disableSelectionOnClick={true}
+                                        onPaginationModelChange={setPaginationModel}
+                                        paginationModel={paginationModel}
+                                        //pageSizeOptions={[5]}
+                                        // rowCount={100}
+                                        // rowSelectionModel={selectedFont}
+                                        onRowClick={async (params) => {
+
+                                            let response = await apiService().post("/WhiteLabel/SetFont", {
+                                                companyId: companyId,
+                                                domain: oEMDomain,
+                                                value: params.row.label
+                                            });
+                                            if (response != null && response.status == 200)
+                                            {
+                                                setSelectedFont(params.row.label);
+                                                setFontUri(null);
+                                                notification("Font saved!");
+                                            }
+                                        }}
+                                    />
+                                </Box>
+                            }
 
-                <Grid container spacing={2}>
-                    <Grid item xs={6}>
-
-                    {loadedUser == true &&
-
-                        <Box>
-                            <DataGrid
-                                rows={fonts}
-                                columns={columns}
-                                sx={{height:"80vh", width:"100%"}}
-                                pagination
-                                disableSelectionOnClick={true}
-                                onPaginationModelChange={setPaginationModel}
-                                paginationModel={paginationModel}
-                                //pageSizeOptions={[5]}
-                                // rowCount={100}
-                                // rowSelectionModel={selectedFont}
-                                onRowClick={async (params) => {
-
-                                    var baseUri = GetBaseUrl();
-                                    let response = await apiService().post("/WhiteLabel/SetFont", {
-                                        companyId: companyId,
-                                        domain: baseUri,
-                                        value: params.row.label
-                                    });
-                                    if (response != null && response.status == 200)
-                                    {
-                                        setSelectedFont(params.row.label);
-                                        setFontUri(null);
-                                        notification("Font saved!");
-                                    }
-                                }}
-                            />
-                        </Box>
-                    }
-
-                    
-                    </Grid>
-                    <Grid item xs={6} >
-
-                        <FileUploader url={"/WhiteLabel/UploadCustomFont"} accept={".otf,.ttf,.woff"} params={{
-                            domain: stateBaseUri
-                        }} multiple={true} variant='custom' onUploadCompleted={() => {
-                            window.location.reload();
-                            }}>
-
-                            <Button color="primary" variant="contained" fullWidth={true} sx={{height:50}} startIcon={<PublishRoundedIcon/>}><Box>Upload Font</Box>&nbsp;<Box sx={{textAlign:"center"}}><small>(.OTF, .TTF, OR .WOFF)</small></Box></Button>
-
-                        </FileUploader>
-                        
-
-                    <Box sx={{marginTop:4}}>Font Selected:</Box>
-                    <Box sx={{marginBottom:2, fontWeight:"bold", fontSize:20}}> {selectedFont}</Box>
-                    <hr />
-                    <Box sx={{fontFamily: selectedFont}}>
-                        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed ut ultricies odio. Nunc ut quam turpis. In hac habitasse platea dictumst. 
-                        Suspendisse potenti. Nullam malesuada, purus id sagittis vestibulum, massa tellus gravida elit, vitae ultrices tortor nulla ac nunc. 
-                        Aenean tempus semper est vel convallis. Sed feugiat, risus eu tincidunt eleifend, purus metus vulputate nulla, et condimentum sapien erat in nisi. 
-                        Nunc non malesuada libero. Donec tempus tincidunt mi at vulputate. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; 
-                        Suspendisse potenti. Etiam nec eleifend orci. Suspendisse in est vel nunc rhoncus bibendum vitae id felis. 
-                        Integer bibendum dolor elit, at tincidunt lacus tempor ac. Maecenas lobortis, mauris at condimentum feugiat, nulla orci condimentum massa, sed facilisis tellus ligula vitae metus. 
-                        Aliquam erat volutpat. Quisque dignissim felis augue, at semper nisl posuere ut. Proin fringilla diam vitae faucibus finibus.
-                        <br/><br/>
-                        Aenean tempus semper est vel convallis. Sed feugiat, risus eu tincidunt eleifend, purus metus vulputate nulla, et condimentum sapien erat in nisi. Nunc non malesuada libero. Donec tempus tincidunt mi at vulputate. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Suspendisse potenti
+                            
+                            </Grid>
+                            <Grid item xs={6} >
+
+                                <FileUploader url={"/WhiteLabel/UploadCustomFont"} accept={".otf,.ttf,.woff"} params={{
+                                    domain: stateBaseUri
+                                }} multiple={true} variant='custom' onUploadCompleted={() => {
+                                    window.location.reload();
+                                    }}>
+
+                                    <Button color="primary" variant="contained" fullWidth={true} sx={{height:50}} startIcon={<PublishRoundedIcon/>}><Box>Upload Font</Box>&nbsp;<Box sx={{textAlign:"center"}}><small>(.OTF, .TTF, OR .WOFF)</small></Box></Button>
+
+                                </FileUploader>
+                                
+
+                            <Box sx={{marginTop:4}}>Font Selected:</Box>
+                            <Box sx={{marginBottom:2, fontWeight:"bold", fontSize:20}}> {selectedFont}</Box>
+                            <hr />
+                            <Box sx={{fontFamily: selectedFont}}>
+                                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed ut ultricies odio. Nunc ut quam turpis. In hac habitasse platea dictumst. 
+                                Suspendisse potenti. Nullam malesuada, purus id sagittis vestibulum, massa tellus gravida elit, vitae ultrices tortor nulla ac nunc. 
+                                Aenean tempus semper est vel convallis. Sed feugiat, risus eu tincidunt eleifend, purus metus vulputate nulla, et condimentum sapien erat in nisi. 
+                                Nunc non malesuada libero. Donec tempus tincidunt mi at vulputate. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; 
+                                Suspendisse potenti. Etiam nec eleifend orci. Suspendisse in est vel nunc rhoncus bibendum vitae id felis. 
+                                Integer bibendum dolor elit, at tincidunt lacus tempor ac. Maecenas lobortis, mauris at condimentum feugiat, nulla orci condimentum massa, sed facilisis tellus ligula vitae metus. 
+                                Aliquam erat volutpat. Quisque dignissim felis augue, at semper nisl posuere ut. Proin fringilla diam vitae faucibus finibus.
+                                <br/><br/>
+                                Aenean tempus semper est vel convallis. Sed feugiat, risus eu tincidunt eleifend, purus metus vulputate nulla, et condimentum sapien erat in nisi. Nunc non malesuada libero. Donec tempus tincidunt mi at vulputate. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Suspendisse potenti
+                            </Box>
+                            </Grid>
+                        </Grid>
                     </Box>
-                    </Grid>
-                </Grid>
-
+                    }
                 </Box>
                 }
 
@@ -283,10 +358,9 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
                     <Grid item xs={6} sx={{textAlign:"right"}}>
                         <Button startIcon={<CheckIcon/>} sx={{marginTop:4}} variant="contained" onClick={async () => { 
 
-                            var baseUri = GetBaseUrl();
                             let response = await apiService().post("/WhiteLabel/SetGlobalCSS", {
                             companyId: companyId,
-                            domain: baseUri,
+                            domain: oEMDomain,
                             value: cssEditorRef.current.getValue()
                             });
                             if (response != null && response.status == 200)
@@ -306,10 +380,9 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
                             onMount={handleCSSEditorDidMount}
                             defaultLanguage="css"
                             theme="vs-dark" 
-                            defaultValue={data.prettyCSS == null ? "" : data.prettyCSS}
+                            defaultValue={(data == null || data.prettyCSS == null) ? "" : data.prettyCSS}
                         />
                     }
-                    {data.prettyCSS}
                 </Box>
 
                 </Box>
@@ -327,10 +400,9 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
                         <Grid item xs={6} sx={{textAlign:"right"}}>
                             <Button startIcon={<CheckIcon/>} sx={{marginTop:4}} variant="contained" onClick={async () => {
 
-                                var baseUri = GetBaseUrl();
                                 let response = await apiService().post("/WhiteLabel/SetGlobalHTML", {
                                     companyId: companyId,
-                                    domain: baseUri,
+                                    domain: oEMDomain,
                                     value: htmlEditorRef.current.getValue()
                                 });
 
@@ -344,13 +416,15 @@ export function OEMEditor({loadedUser, notification, companyId = null}) {
                     </Grid>
                     
                     <Box sx={{paddingTop:1}}>
-                        <Editor
-                            height="70vh"
-                            onMount={handleHtmlEditorDidMount}
-                            defaultLanguage="html"
-                            theme="vs-dark"
-                            defaultValue={data.prettyHTML == null ? "" : data.prettyHTML}
-                        />
+                        {data != null &&
+                            <Editor
+                                height="70vh"
+                                onMount={handleHtmlEditorDidMount}
+                                defaultLanguage="html"
+                                theme="vs-dark"
+                                defaultValue={(data == null || data.prettyHTML == null) ? "" : data.prettyHTML}
+                            />
+                        }
                     </Box>
 
 

package/src/components/stripe/StripePayment.js

@@ -5,7 +5,7 @@ import PaymentRoundedIcon from '@mui/icons-material/PaymentRounded';
 import Typography from '@mui/material/Typography';
 import { Select, Grid, MenuItem, Box, Button, Tab, Tabs, TextField } from '@mui/material';
 
-  const CheckoutForm = ({payButtonText, clientSecret, currentUser, paymentMethodType, walletId, onResponse, amount}) => {
+  const CheckoutForm = ({payButtonText, invoiceId, clientSecret, currentUser, paymentMethodType, walletId, onResponse, amount}) => {
 
     const [isPaymentProcessing, setIsPaymentProcessing] = useState(false);
 
@@ -79,21 +79,38 @@ import { Select, Grid, MenuItem, Box, Button, Tab, Tabs, TextField } from '@mui/
 
                 if (amount != null)
                 {
-                  // charge the customer
-                  let response = await apiService().post("/Payment/Charge", {
-
-                      paymentMethodType: paymentMethodType,
-                      walletPaymentMethodId: addPaymentMethodResponse.data,
-                      amount: amount
-                  });
-                  
-                  if (response != null && response.status == 200)
+                  if (invoiceId != null)
                   {
-                      onResponse("paid", response.data.stripePaymentIntentId);
+                    let response = await apiService().post("/Invoices/PayInvoice", {
+                        invoiceId: invoiceId,
+                        walletPaymentMethodId: addPaymentMethodResponse.data
+                    });
+                    if (response != null && response.status == 200)
+                    {
+                      onResponse("paid", null);
+                    }
+                    else
+                    {
+                      onResponse("failed", null);
+                    }
                   }
                   else
                   {
-                    onResponse("failed", null);
+                    // charge the customer
+                    let response = await apiService().post("/Payment/Charge", {
+                        paymentMethodType: paymentMethodType,
+                        walletPaymentMethodId: addPaymentMethodResponse.data,
+                        amount: amount
+                    });
+                    
+                    if (response != null && response.status == 200)
+                    {
+                        onResponse("paid", response.data.stripePaymentIntentId);
+                    }
+                    else
+                    {
+                      onResponse("failed", null);
+                    }
                   }
                 }
                 
@@ -341,7 +358,7 @@ import { Select, Grid, MenuItem, Box, Button, Tab, Tabs, TextField } from '@mui/
 
                         {(options != null && process.env.stripePublicKey != null) &&
                             <Elements stripe={stripePromise} options={options}>
-                                <CheckoutForm payButtonText={payButtonText} clientSecret={options != null ? options.clientSecret : null} onResponse={onResponse} paymentMethodType={paymentMethodType} currentUser={currentUser} walletId={walletId} amount={amount} />
+                                <CheckoutForm payButtonText={payButtonText} invoiceId={invoiceId} clientSecret={options != null ? options.clientSecret : null} onResponse={onResponse} paymentMethodType={paymentMethodType} currentUser={currentUser} walletId={walletId} amount={amount} />
                             </Elements>
                         }
                     </Box>
@@ -417,7 +434,7 @@ import { Select, Grid, MenuItem, Box, Button, Tab, Tabs, TextField } from '@mui/
 
                                 {(options != null && process.env.stripePublicKey != null) &&
                                     <Elements stripe={stripePromise} options={options}>
-                                        <CheckoutForm payButtonText={payButtonText} clientSecret={options != null ? options.clientSecret : null} onResponse={onResponse} paymentMethodType={paymentMethodType} walletId={walletId} currentUser={currentUser} amount={amount} />
+                                        <CheckoutForm payButtonText={payButtonText} invoiceId={invoiceId} clientSecret={options != null ? options.clientSecret : null} onResponse={onResponse} paymentMethodType={paymentMethodType} walletId={walletId} currentUser={currentUser} amount={amount} />
                                     </Elements>
                                 }
                             </Box>