authscape 1.0.300 → 1.0.304

package/index.js

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

package/package.json

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

package/src/services/setupOEMProps.js

@@ -1,6 +1,6 @@
 import React, { useEffect, useState, useRef } from 'react';
 
-export const setupOEMProps = async ({Component, ctx}) => {
+export const setupOEMProps = async ({Component, ctx, apiUrl}) => {
 
     let pageProps = {};
   
@@ -21,11 +21,8 @@ export const setupOEMProps = async ({Component, ctx}) => {
       }
   
       // 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;
-      }
+      const response = await fetch(apiUrl + "/api/WhiteLabel/GetCompanyIdFromDomain?domain=" + pageProps.host);
+      pageProps.oemCompanyId = await response.json();
     }
   
     return pageProps;