authscape 1.0.291 → 1.0.294

package/index.js

@@ -12,6 +12,7 @@ var _reactToastify = require("react-toastify");
 var _router = require("next/router");
 var _styles = require("@mui/material/styles");
 var _material = require("@mui/material");
+var _head = _interopRequireDefault(require("next/head"));
 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; }
@@ -22,6 +23,8 @@ 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; }
+// import { apiService, setupOEMProps, OEMStyleSheet, AuthorizationComponent, authService, logEvent, init, signInValidator } from 'authscape';
+
 function AuthScapeApp(_ref) {
   var Component = _ref.Component,
     pageProps = _ref.pageProps,
@@ -35,7 +38,7 @@ function AuthScapeApp(_ref) {
     onAuthenticationLoaded = _ref$onAuthentication === void 0 ? null : _ref$onAuthentication,
     _ref$children = _ref.children,
     children = _ref$children === void 0 ? null : _ref$children;
-  var _useState = (0, _react.useState)(process.env.enableOEMClient ? true : false),
+  var _useState = (0, _react.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
     isLoading = _useState2[0],
     setIsLoading = _useState2[1];
@@ -54,37 +57,34 @@ function AuthScapeApp(_ref) {
   var router = (0, _router.useRouter)();
   (0, _react.useEffect)(function () {}, [loadedUser]);
   (0, _react.useEffect)(function () {
-    if (!router.isReady) return;
-
-    // analytics
-    if (loadedUser) {
+    if (loadedUser && router.isReady) {
       if (process.env.googleAnalytics4 != null) {
         init(process.env.googleAnalytics4);
       }
       if (router.query.r != null) {
         localStorage.setItem("ref", router.query.r);
       }
-    }
 
-    // ensure login is hit
-    if (loadedUser && router.isReady && enforceLoggedIn) {
-      if (currentUser == null && router.pathname.indexOf("/login") == -1 && router.pathname.indexOf("404") == -1 && router.pathname.indexOf("/logout") == -1 && router.pathname.indexOf("/signin-oidc") == -1 && router.pathname.indexOf("/signout-oidc") == -1) {
-        window.location.href = "/login";
-      } else if (currentUser != null && router.pathname.indexOf("/signin-oidc") != -1) {
-        window.location.href = "/login";
+      // sign in validation
+      if (router.query.code != null) {
+        setLoadingLogin(true);
+        signInValidator(router.query.code);
+      } else {
+        if (enforceLoggedIn) {
+          if (currentUser == null) {
+            authService().login();
+          }
+        }
       }
     }
-
-    // sign in validation
-    if (router.query.code != null) {
-      setLoadingLogin(true);
-      signInValidator(router.query.code);
-    } else if (router.query.signupPass != null) {
-      setLoadingLogin(true);
-      authService().login();
-    }
   }, [loadedUser, router.isReady]);
-  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_styles.ThemeProvider, {
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_head["default"], null, /*#__PURE__*/_react["default"].createElement("meta", {
+    name: "viewport",
+    content: "width=device-width, initial-scale=1"
+  }), pageProps != null && pageProps.host != null && /*#__PURE__*/_react["default"].createElement("link", {
+    href: process.env.apiUri + "/api/WhiteLabel/GetDataFromRecord?domain=" + pageProps.host,
+    rel: "stylesheet"
+  })), /*#__PURE__*/_react["default"].createElement(_styles.ThemeProvider, {
     theme: muiTheme
   }, loadingLogin && /*#__PURE__*/_react["default"].createElement(_material.Box, null, "Please wait. Loading..."), !loadingLogin && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(AuthorizationComponent, {
     setCurrentUser: setCurrentUser,
@@ -4277,7 +4277,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 var setupOEMProps = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var Component, ctx, pageProps, host;
+    var Component, ctx, pageProps, host, response;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -4298,8 +4298,17 @@ var setupOEMProps = /*#__PURE__*/function () {
           } else {
             pageProps.host = "https://" + ctx.req.headers.host;
           }
+
+          // get the companyId
+          _context.next = 10;
+          return apiService().get(process.env.apiUri + "/api/WhiteLabel/GetCompanyIdFromDomain?domain=" + pageProps.host);
+        case 10:
+          response = _context.sent;
+          if (response != null && response.status == 200) {
+            pageProps.oemCompanyId = response.data;
+          }
           return _context.abrupt("return", pageProps);
-        case 9:
+        case 13:
         case "end":
           return _context.stop();
       }

package/package.json

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

package/src/components/AuthScapeApp.js

@@ -5,10 +5,13 @@ import { ToastContainer, toast } from 'react-toastify';
 import { useRouter } from 'next/router';
 import { ThemeProvider } from '@mui/material/styles';
 import { Box } from '@mui/material';
+import Head from "next/head";
+// import { apiService, setupOEMProps, OEMStyleSheet, AuthorizationComponent, authService, logEvent, init, signInValidator } from 'authscape';
+
 
 export function AuthScapeApp({Component, pageProps, muiTheme = {}, enforceLoggedIn = false, enableAuth = true, onAuthenticationLoaded = null, children = null}) {
 
-    const [isLoading, setIsLoading] = useState(process.env.enableOEMClient ? true : false);
+    const [isLoading, setIsLoading] = useState(false);
     const [loadedUser, setLoadedUser] = useState(false);
     const [currentUser, setCurrentUser] = useState(null);
     const [loadingLogin, setLoadingLogin] = useState(false);
@@ -21,54 +24,51 @@ export function AuthScapeApp({Component, pageProps, muiTheme = {}, enforceLogged
 
     useEffect(() => {
 
-        if(!router.isReady) return;
-
-        // analytics
-        if (loadedUser)
-        {
-          if (process.env.googleAnalytics4 != null)
-          {
-            init(process.env.googleAnalytics4);
-          }
-    
-          if (router.query.r != null)
-          {
-            localStorage.setItem("ref", router.query.r);
-          }
-        }
-
-
-        // ensure login is hit
-        if (loadedUser && router.isReady && enforceLoggedIn)
+        if (loadedUser && router.isReady)
         {
-          if (currentUser == null && router.pathname.indexOf("/login") == -1 && router.pathname.indexOf("404") == -1 && router.pathname.indexOf("/logout") == -1 && router.pathname.indexOf("/signin-oidc") == -1 && router.pathname.indexOf("/signout-oidc") == -1)
-          {
-            window.location.href = "/login";
-          }
-          else if (currentUser != null && router.pathname.indexOf("/signin-oidc") != -1)
-          {
-            window.location.href = "/login";
-          }
-        }
+            if (process.env.googleAnalytics4 != null)
+            {
+                init(process.env.googleAnalytics4);
+            }
+        
+            if (router.query.r != null)
+            {
+                localStorage.setItem("ref", router.query.r);
+            }
 
-        // sign in validation
-        if (router.query.code != null)
-        {
-            setLoadingLogin(true);
-            signInValidator(router.query.code);
-        }
-        else if (router.query.signupPass != null)
-        {
-            setLoadingLogin(true);
-            authService().login();
+            // sign in validation
+            if (router.query.code != null)
+            {
+                setLoadingLogin(true);
+                signInValidator(router.query.code);
+            }
+            else
+            {
+                if (enforceLoggedIn)
+                {
+                    if (currentUser == null)
+                    {
+                        authService().login();
+                    }
+                }
+            }
         }
-
     
     }, [loadedUser, router.isReady])
 
 
     return (
         <>
+            <Head>
+                <meta name="viewport" content="width=device-width, initial-scale=1" />
+                {(pageProps != null && pageProps.host != null) &&
+                    <link
+                        href={process.env.apiUri + "/api/WhiteLabel/GetDataFromRecord?domain=" + pageProps.host}
+                        rel="stylesheet"
+                    />
+                }
+            </Head>
+
             <ThemeProvider theme={muiTheme}>
 
                 {loadingLogin &&

package/src/services/setupOEMProps.js

@@ -18,6 +18,13 @@ export const setupOEMProps = async ({Component, ctx}) => {
         pageProps.host = "https://" + ctx.req.headers.host;
     }
 
+    // get the companyId
+    let response = await apiService().get(process.env.apiUri + "/api/WhiteLabel/GetCompanyIdFromDomain?domain=" + pageProps.host);
+    if (response != null && response.status == 200)
+    {
+        pageProps.oemCompanyId = response.data;
+    }
+
     return pageProps;
 }