authscape 1.0.299 → 1.0.302

package/index.js

@@ -4274,21 +4274,26 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 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 _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(apiUri, Component, ctx) {
-    var pageProps, host, response;
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+    var Component, ctx, pageProps, host, response;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          Component = _ref.Component, ctx = _ref.ctx;
           pageProps = {};
           if (!Component.getInitialProps) {
-            _context.next = 5;
+            _context.next = 6;
             break;
           }
-          _context.next = 4;
+          _context.next = 5;
           return Component.getInitialProps(ctx);
-        case 4:
-          pageProps = _context.sent;
         case 5:
+          pageProps = _context.sent;
+        case 6:
+          if (!(ctx.req != null)) {
+            _context.next = 15;
+            break;
+          }
           host = ctx.req.headers.host;
           if (host.includes("localhost")) {
             pageProps.host = "http://" + ctx.req.headers.host;
@@ -4297,27 +4302,29 @@ var setupOEMProps = /*#__PURE__*/function () {
           }
 
           // get the companyId
-          _context.next = 9;
-          return apiService().get(apiUri + "/api/WhiteLabel/GetCompanyIdFromDomain?domain=" + pageProps.host);
-        case 9:
+          _context.next = 11;
+          return fetch(process.env.apiUri + "/api/WhiteLabel/GetCompanyIdFromDomain?domain=" + pageProps.host);
+        case 11:
           response = _context.sent;
-          if (response != null && response.status == 200) {
-            pageProps.oemCompanyId = response.data;
-          }
+          _context.next = 14;
+          return response.json();
+        case 14:
+          pageProps.oemCompanyId = _context.sent;
+        case 15:
           return _context.abrupt("return", pageProps);
-        case 12:
+        case 16:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
-  return function setupOEMProps(_x, _x2, _x3) {
-    return _ref.apply(this, arguments);
+  return function setupOEMProps(_x) {
+    return _ref2.apply(this, arguments);
   };
 }();
 exports.setupOEMProps = setupOEMProps;
-function HeaderRecords(_ref2) {
-  var pageProps = _ref2.pageProps;
+function HeaderRecords(_ref3) {
+  var pageProps = _ref3.pageProps;
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, pageProps != null && pageProps.host != null && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("link", {
     href: process.env.apiUri + "/api/WhiteLabel/GetDataFromRecord?domain=" + pageProps.host,
     rel: "stylesheet"

package/package.json

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

package/src/services/setupOEMProps.js

@@ -1,30 +1,30 @@
 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
+      const response = await fetch(process.env.apiUri + "/api/WhiteLabel/GetCompanyIdFromDomain?domain=" + pageProps.host);
+      pageProps.oemCompanyId = await response.json();
     }
-
-    // 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;
 }