authscape 1.0.298 → 1.0.300

package/index.js

@@ -23,8 +23,6 @@ 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,
@@ -4277,11 +4275,11 @@ 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 apiUri, Component, ctx, pageProps, host, response;
+    var Component, ctx, pageProps, host, response;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          apiUri = _ref.apiUri, Component = _ref.Component, ctx = _ref.ctx;
+          Component = _ref.Component, ctx = _ref.ctx;
           pageProps = {};
           if (!Component.getInitialProps) {
             _context.next = 6;
@@ -4292,6 +4290,10 @@ var setupOEMProps = /*#__PURE__*/function () {
         case 5:
           pageProps = _context.sent;
         case 6:
+          if (!(ctx.req != null)) {
+            _context.next = 13;
+            break;
+          }
           host = ctx.req.headers.host;
           if (host.includes("localhost")) {
             pageProps.host = "http://" + ctx.req.headers.host;
@@ -4300,15 +4302,16 @@ var setupOEMProps = /*#__PURE__*/function () {
           }
 
           // get the companyId
-          _context.next = 10;
-          return apiService().get(apiUri + "/api/WhiteLabel/GetCompanyIdFromDomain?domain=" + pageProps.host);
-        case 10:
+          _context.next = 11;
+          return apiService().get(process.env.apiUri + "/api/WhiteLabel/GetCompanyIdFromDomain?domain=" + pageProps.host);
+        case 11:
           response = _context.sent;
           if (response != null && response.status == 200) {
             pageProps.oemCompanyId = response.data;
           }
-          return _context.abrupt("return", pageProps);
         case 13:
+          return _context.abrupt("return", pageProps);
+        case 14:
         case "end":
           return _context.stop();
       }

package/package.json

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

package/src/components/AuthScapeApp.js

@@ -6,8 +6,6 @@ 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}) {
 

package/src/services/setupOEMProps.js

@@ -1,30 +1,33 @@
 import React, { useEffect, useState, useRef } from 'react';
 
-export const setupOEMProps = async ({apiUri, Component, ctx}) => {
+export const setupOEMProps = async ({Component, ctx}) => {
 
     let pageProps = {};
-
+  
     if (Component.getInitialProps) {
         pageProps = await Component.getInitialProps(ctx);
     }
-
-    let host = ctx.req.headers.host;
-    if (host.includes("localhost"))
-    {
-        pageProps.host = "http://" + ctx.req.headers.host;
-    }
-    else
+  
+    if (ctx.req != null)
     {
-        pageProps.host = "https://" + ctx.req.headers.host;
+      let host = ctx.req.headers.host;
+      if (host.includes("localhost"))
+      {
+          pageProps.host = "http://" + ctx.req.headers.host;
+      }
+      else
+      {
+          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;
+      }
     }
-
-    // get the companyId
-    let response = await apiService().get(apiUri + "/api/WhiteLabel/GetCompanyIdFromDomain?domain=" + pageProps.host);
-    if (response != null && response.status == 200)
-    {
-        pageProps.oemCompanyId = response.data;
-    }
-
+  
     return pageProps;
 }