RS-840 - update token fetch on app initialization (#740)

yulia-dnistrian · web-flow · commit 9213c120d221 · 2020-06-10T09:34:44.000-04:00
* update token fetch on app initialization

* update token fetch
diff --git a/src/components/src/AddPromotionContainer/add.promotion.container.tsx b/src/components/src/AddPromotionContainer/add.promotion.container.tsx
@@ -21,7 +21,7 @@
 
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { cortexFetch } from '../utils/Cortex';
 import Config from '../../../ep.config.json';
 
diff --git a/src/components/src/AddressForm/addressform.main.tsx b/src/components/src/AddressForm/addressform.main.tsx
@@ -21,7 +21,7 @@
 
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { cortexFetch } from '../utils/Cortex';
 import Config from '../../../ep.config.json';
 
diff --git a/src/components/src/AppHeader/appheader.main.tsx b/src/components/src/AppHeader/appheader.main.tsx
@@ -30,7 +30,7 @@ import AppHeaderNavigationMain from '../AppHeaderNavigation/appheadernavigation.
 import CountInfoPopUp from '../CountInfoPopUp/countinfopopup';
 import { useCountState } from '../cart-count-context';
 import { cortexFetch } from '../utils/Cortex';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import ImageContainer from '../ImageContainer/image.container';
 import Config from '../../../ep.config.json';
 
diff --git a/src/components/src/AppHeaderLogin/appheaderlogin.main.tsx b/src/components/src/AppHeaderLogin/appheaderlogin.main.tsx
@@ -27,9 +27,10 @@ import queryString from 'query-string';
 import AppModalLoginMain from '../AppModalLogin/appmodallogin.main';
 import CountInfoPopUp from '../CountInfoPopUp/countinfopopup';
 import AppModalCartSelectMain from '../AppModalCartSelect/appmodalcartselect.main';
+import { login } from '../../../hooks/store';
 import { useRequisitionListCountState } from '../requisition-list-count-context';
 import {
-  login, logout, logoutAccountManagementUser, getAccessToken,
+  logout, logoutAccountManagementUser, getAccessToken,
 } from '../utils/AuthService';
 import { cortexFetch, adminFetch } from '../utils/Cortex';
 import { ReactComponent as AccountIcon } from '../../../images/header-icons/account-icon.svg';
diff --git a/src/components/src/AppModalBundleConfiguration/appmodalbundleconfiguration.main.tsx b/src/components/src/AppModalBundleConfiguration/appmodalbundleconfiguration.main.tsx
@@ -25,7 +25,7 @@ import Modal from 'react-responsive-modal';
 import Config from '../../../ep.config.json';
 /* eslint-disable-next-line import/no-cycle */
 import CartLineItem from '../CartLineItem/cart.lineitem';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { cortexFetch } from '../utils/Cortex';
 import { ReactComponent as CloseIcon } from '../../../images/icons/ic_close.svg';
 
diff --git a/src/components/src/B2bAddProductsModal/b2b.add.products.modal.tsx b/src/components/src/B2bAddProductsModal/b2b.add.products.modal.tsx
@@ -22,7 +22,7 @@
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
 import Modal from 'react-responsive-modal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import QuickOrderForm from '../QuickOrderForm/quickorderform';
 import { cortexFetch } from '../utils/Cortex';
 import Config from '../../../ep.config.json';
diff --git a/src/components/src/B2bAddSubAccount/b2b.addsubaccount.tsx b/src/components/src/B2bAddSubAccount/b2b.addsubaccount.tsx
@@ -24,7 +24,7 @@ import React, { Component } from 'react';
 import intl from 'react-intl-universal';
 import Modal from 'react-responsive-modal';
 import { adminFetch } from '../utils/Cortex';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import Config from '../../../ep.config.json';
 import { ReactComponent as CloseIcon } from '../../../images/icons/ic_close.svg';
 
diff --git a/src/components/src/B2bEditAccount/b2b.editaccount.tsx b/src/components/src/B2bEditAccount/b2b.editaccount.tsx
@@ -23,7 +23,7 @@ import React, { Component } from 'react';
 import intl from 'react-intl-universal';
 import Modal from 'react-responsive-modal';
 import copy from 'copy-to-clipboard';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { adminFetch } from '../utils/Cortex';
 import Config from '../../../ep.config.json';
 
diff --git a/src/components/src/B2bSubAccountListItem/b2b.subaccountlistitem.tsx b/src/components/src/B2bSubAccountListItem/b2b.subaccountlistitem.tsx
@@ -24,7 +24,7 @@ import React, { Component } from 'react';
 import intl from 'react-intl-universal';
 // eslint-disable-next-line import/no-cycle
 import SubAccountList from '../B2bSubAccountList/b2b.subaccountlist';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { adminFetch } from '../utils/Cortex';
 import Config from '../../../ep.config.json';
 
diff --git a/src/components/src/BulkOrder/bulkorder.main.tsx b/src/components/src/BulkOrder/bulkorder.main.tsx
@@ -21,12 +21,12 @@
 
 import React, { Component, lazy, Suspense } from 'react';
 import intl from 'react-intl-universal';
-import { login } from '../utils/AuthService';
 import { cortexFetchItemLookupForm, itemLookup, searchLookup } from '../utils/CortexLookup';
 import QuickOrderForm from '../QuickOrderForm/quickorderform';
 import { cortexFetch } from '../utils/Cortex';
 import Config from '../../../ep.config.json';
 import './bulkorder.main.scss';
+import { login } from '../../../hooks/store';
 import { useCountDispatch } from '../cart-count-context';
 import DropdownCartSelection from '../DropdownCartSelection/dropdown.cart.selection.main';
 
diff --git a/src/components/src/CartClear/cartclear.tsx b/src/components/src/CartClear/cartclear.tsx
@@ -21,7 +21,7 @@
 
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { cortexFetch } from '../utils/Cortex';
 import Config from '../../../ep.config.json';
 
diff --git a/src/components/src/CartCreate/cart.create.tsx b/src/components/src/CartCreate/cart.create.tsx
@@ -22,7 +22,7 @@
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
 import Modal from 'react-responsive-modal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { cortexFetch } from '../utils/Cortex';
 import Config from '../../../ep.config.json';
 import { ReactComponent as CloseIcon } from '../../../images/icons/ic_close.svg';
diff --git a/src/components/src/CartLineItem/cart.lineitem.tsx b/src/components/src/CartLineItem/cart.lineitem.tsx
@@ -22,7 +22,7 @@
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
 import { Link } from 'react-router-dom';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { cortexFetch } from '../utils/Cortex';
 /* eslint-disable-next-line import/no-cycle */
 import AppModalBundleConfigurationMain from '../AppModalBundleConfiguration/appmodalbundleconfiguration.main';
diff --git a/src/components/src/CartMain/cart.main.tsx b/src/components/src/CartMain/cart.main.tsx
@@ -24,7 +24,7 @@ import intl from 'react-intl-universal';
 import Modal from 'react-responsive-modal';
 import CartLineItem from '../CartLineItem/cart.lineitem';
 import { cortexFetch } from '../utils/Cortex';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import Config from '../../../ep.config.json';
 import { ReactComponent as CloseIcon } from '../../../images/icons/ic_close.svg';
 
diff --git a/src/components/src/CategoryItems/categoryitems.main.tsx b/src/components/src/CategoryItems/categoryitems.main.tsx
@@ -21,7 +21,7 @@
 
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { navigationLookup, cortexFetchNavigationLookupForm } from '../utils/CortexLookup';
 import { cortexFetch } from '../utils/Cortex';
 import ProductListMain from '../ProductList/productlist.main';
diff --git a/src/components/src/CheckoutSummaryList/checkout.summarylist.tsx b/src/components/src/CheckoutSummaryList/checkout.summarylist.tsx
@@ -21,7 +21,7 @@
 
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { cortexFetch } from '../utils/Cortex';
 import Config from '../../../ep.config.json';
 
diff --git a/src/components/src/ComplianceSupport/compliancesupport.main.tsx b/src/components/src/ComplianceSupport/compliancesupport.main.tsx
@@ -23,7 +23,7 @@ import React, { Component } from 'react';
 import intl from 'react-intl-universal';
 import { Link } from 'react-router-dom';
 import Modal from 'react-responsive-modal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { cortexFetch } from '../utils/Cortex';
 import Config from '../../../ep.config.json';
 import { ReactComponent as CloseIcon } from '../../../images/icons/ic_close.svg';
diff --git a/src/components/src/GiftCertificateForm/giftcertificateform.main.tsx b/src/components/src/GiftCertificateForm/giftcertificateform.main.tsx
@@ -22,7 +22,7 @@
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
 import Modal from 'react-responsive-modal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { cortexFetch } from '../utils/Cortex';
 import Config from '../../../ep.config.json';
 import { ReactComponent as CloseIcon } from '../../../images/icons/ic_close.svg';
diff --git a/src/components/src/PaymentForm/paymentform.main.tsx b/src/components/src/PaymentForm/paymentform.main.tsx
@@ -21,7 +21,7 @@
 
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { cortexFetch } from '../utils/Cortex';
 import Config from '../../../ep.config.json';
 
diff --git a/src/components/src/PaymentSelectorMain/paymentselector.main.tsx b/src/components/src/PaymentSelectorMain/paymentselector.main.tsx
@@ -22,7 +22,7 @@
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
 import Modal from 'react-responsive-modal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { cortexFetch } from '../utils/Cortex';
 import PaymentFormMain from '../PaymentForm/paymentform.main';
 import PaymentMethodContainer from '../PaymentMethodContainer/paymentmethod.container';
diff --git a/src/components/src/ProductDisplayItem/productdisplayitem.main.tsx b/src/components/src/ProductDisplayItem/productdisplayitem.main.tsx
@@ -22,7 +22,7 @@
 import React, { Component, Suspense, lazy } from 'react';
 import intl from 'react-intl-universal';
 import Slider from 'react-slick';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { itemLookup, cortexFetchItemLookupForm } from '../utils/CortexLookup';
 import transparentImg from '../../../images/icons/transparent.png';
 import ProductRecommendationsDisplayMain from '../ProductRecommendations/productrecommendations.main';
diff --git a/src/components/src/ProductDisplayItemDetails/productdisplayitem.details.tsx b/src/components/src/ProductDisplayItemDetails/productdisplayitem.details.tsx
@@ -21,7 +21,8 @@
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
 import Config from '../../../ep.config.json';
-import { login, isLoggedIn } from '../utils/AuthService';
+import { isLoggedIn } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { cortexFetch } from '../utils/Cortex';
 import PowerReview from '../PowerReview/powerreview.main';
 import DropdownCartSelection from '../DropdownCartSelection/dropdown.cart.selection.main';
diff --git a/src/components/src/ProductListItem/productlistitem.main.tsx b/src/components/src/ProductListItem/productlistitem.main.tsx
@@ -22,7 +22,7 @@
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
 import { Link } from 'react-router-dom';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { itemLookup, cortexFetchItemLookupForm } from '../utils/CortexLookup';
 import ImageContainer from '../ImageContainer/image.container';
 import Config from '../../../ep.config.json';
diff --git a/src/components/src/ProductListLoadmore/productlistloadmore.tsx b/src/components/src/ProductListLoadmore/productlistloadmore.tsx
@@ -20,7 +20,7 @@
  */
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 
 import './productlistloadmore.scss';
 
diff --git a/src/components/src/ProfileAddresses/profileaddresses.main.tsx b/src/components/src/ProfileAddresses/profileaddresses.main.tsx
@@ -22,7 +22,7 @@
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
 import Modal from 'react-responsive-modal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { cortexFetch } from '../utils/Cortex';
 import Config from '../../../ep.config.json';
 
diff --git a/src/components/src/ProfileCompliance/profilecompliance.main.tsx b/src/components/src/ProfileCompliance/profilecompliance.main.tsx
@@ -21,7 +21,7 @@
 
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { cortexFetch } from '../utils/Cortex';
 import Config from '../../../ep.config.json';
 
diff --git a/src/components/src/ProfileEmailInfo/profileemailinfo.main.tsx b/src/components/src/ProfileEmailInfo/profileemailinfo.main.tsx
@@ -21,7 +21,7 @@
 
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { cortexFetch } from '../utils/Cortex';
 import Config from '../../../ep.config.json';
 
diff --git a/src/components/src/ProfileInfo/profileInfo.main.tsx b/src/components/src/ProfileInfo/profileInfo.main.tsx
@@ -21,7 +21,7 @@
 
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { cortexFetch } from '../utils/Cortex';
 import Config from '../../../ep.config.json';
 
diff --git a/src/components/src/QuickOrder/quickorder.main.tsx b/src/components/src/QuickOrder/quickorder.main.tsx
@@ -23,7 +23,7 @@ import React, { Component } from 'react';
 import intl from 'react-intl-universal';
 import Modal from 'react-responsive-modal';
 import CartLineItem from '../CartLineItem/cart.lineitem';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { itemLookup, cortexFetchItemLookupForm } from '../utils/CortexLookup';
 import './quickorder.main.scss';
 import { ReactComponent as CloseIcon } from '../../../images/icons/ic_close.svg';
diff --git a/src/components/src/QuickOrderForm/quickorderform.tsx b/src/components/src/QuickOrderForm/quickorderform.tsx
@@ -22,7 +22,7 @@
 
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { cortexFetchItemLookupForm, itemLookup } from '../utils/CortexLookup';
 import ImageContainer from '../ImageContainer/image.container';
 import Config from '../../../ep.config.json';
diff --git a/src/components/src/RegistrationForm/registrationform.main.tsx b/src/components/src/RegistrationForm/registrationform.main.tsx
@@ -22,8 +22,9 @@
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
 import {
-  login, loginRegistered, registerUser, getRegistrationForm,
+  loginRegistered, registerUser, getRegistrationForm,
 } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import Config from '../../../ep.config.json';
 
 import './registrationform.main.scss';
diff --git a/src/components/src/Reorder/reorder.main.tsx b/src/components/src/Reorder/reorder.main.tsx
@@ -24,7 +24,7 @@ import intl from 'react-intl-universal';
 import Modal from 'react-responsive-modal';
 import CartLineItem from '../CartLineItem/cart.lineitem';
 import { cortexFetch } from '../utils/Cortex';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import Config from '../../../ep.config.json';
 import { ReactComponent as CloseIcon } from '../../../images/icons/ic_close.svg';
 
diff --git a/src/components/src/SearchFacetNavigation/searchfacetnavigation.main.tsx b/src/components/src/SearchFacetNavigation/searchfacetnavigation.main.tsx
@@ -21,7 +21,7 @@
 
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { cortexFetch } from '../utils/Cortex';
 import Config from '../../../ep.config.json';
 
diff --git a/src/components/src/SearchResultsItems/searchresultsitems.main.tsx b/src/components/src/SearchResultsItems/searchresultsitems.main.tsx
@@ -21,7 +21,7 @@
 
 import React, { Component } from 'react';
 import intl from 'react-intl-universal';
-import { login } from '../utils/AuthService';
+import { login } from '../../../hooks/store';
 import { searchLookup } from '../utils/CortexLookup';
 import { cortexFetch } from '../utils/Cortex';
 import ProductListMain from '../ProductList/productlist.main';
diff --git a/src/components/src/utils/AuthService.ts b/src/components/src/utils/AuthService.ts
@@ -46,49 +46,6 @@ function generateFormBody(userDetails) {
   userFormBodyString = userFormBody.join('&');
 }
 
-export function login() {
-  return new Promise(((resolve, reject) => {
-    if (localStorage.getItem(`${Config.cortexApi.scope}_oAuthToken`) === null) {
-      userFormBodyString = '';
-      userFormBody = [];
-      let publicUserDetails:PublicUserDetailsInterface = {};
-      publicUserDetails = {
-        username: '',
-        password: '',
-        grant_type: 'password',
-        role: 'PUBLIC',
-        scope: Config.cortexApi.scope,
-      };
-
-      generateFormBody(publicUserDetails);
-      cortexFetch('/oauth2/tokens', {
-        method: 'post',
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8',
-        },
-        body: userFormBodyString,
-      }).then(res => res.json())
-        .then((res) => {
-          if (localStorage.getItem(`${Config.cortexApi.scope}_oAuthTokenAuthService`) === null) {
-            localStorage.setItem(`${Config.cortexApi.scope}_oAuthRole`, res.role);
-          }
-          localStorage.setItem(`${Config.cortexApi.scope}_oAuthScope`, res.scope);
-          localStorage.setItem(`${Config.cortexApi.scope}_oAuthToken`, `Bearer ${res.access_token}`);
-          window.dispatchEvent(new CustomEvent('authHeaderChanged', { detail: { authHeader: `Bearer ${res.access_token}`, file: 'AuthService.1' } }));
-          localStorage.setItem(`${Config.cortexApi.scope}_oAuthUserName`, publicUserDetails.username);
-          resolve(res);
-        })
-        .catch((error) => {
-          // eslint-disable-next-line no-console
-          console.error(error.message);
-          reject(error);
-        });
-    } else {
-      resolve(userFormBodyString);
-    }
-  }));
-}
-
 export function loginRegistered(username, password) {
   return new Promise(((resolve, reject) => {
     if (localStorage.getItem(`${Config.cortexApi.scope}_oAuthToken`) != null) {
diff --git a/src/containers/AddPaymentMethod.tsx b/src/containers/AddPaymentMethod.tsx
@@ -23,7 +23,7 @@ import React from 'react';
 import ReactRouterPropTypes from 'react-router-prop-types';
 import intl from 'react-intl-universal';
 import { cortexFetch } from '../components/src/utils/Cortex';
-import { login } from '../components/src/utils/AuthService';
+import { login } from '../hooks/store';
 
 import * as Config from '../ep.config.json';
 
diff --git a/src/containers/CartPage.tsx b/src/containers/CartPage.tsx
@@ -31,7 +31,7 @@ import CheckoutSummaryList from '../components/src/CheckoutSummaryList/checkout.
 import CartMain from '../components/src/CartMain/cart.main';
 
 import Config from '../ep.config.json';
-import { login } from '../components/src/utils/AuthService';
+import { login } from '../hooks/store';
 import { cortexFetch } from '../components/src/utils/Cortex';
 import './CartPage.scss';
 
diff --git a/src/containers/ChangePasswordPage.tsx b/src/containers/ChangePasswordPage.tsx
@@ -22,7 +22,7 @@
 import React from 'react';
 import intl from 'react-intl-universal';
 import { RouteComponentProps } from 'react-router-dom';
-import { login } from '../components/src/utils/AuthService';
+import { login } from '../hooks/store';
 import { cortexFetch } from '../components/src/utils/Cortex';
 import Config from '../ep.config.json';
 
diff --git a/src/containers/CheckoutAuthPage.tsx b/src/containers/CheckoutAuthPage.tsx
diff --git a/src/containers/CheckoutPage.tsx b/src/containers/CheckoutPage.tsx
diff --git a/src/containers/OrderHistoryPage.tsx b/src/containers/OrderHistoryPage.tsx
diff --git a/src/containers/OrderReviewPage.tsx b/src/containers/OrderReviewPage.tsx
diff --git a/src/containers/ProfilePage.tsx b/src/containers/ProfilePage.tsx
diff --git a/src/containers/ResetPasswordPage.tsx b/src/containers/ResetPasswordPage.tsx
diff --git a/src/containers/WishListsPage.tsx b/src/containers/WishListsPage.tsx
diff --git a/src/containers/b2b/AccountMain.tsx b/src/containers/b2b/AccountMain.tsx
diff --git a/src/containers/b2b/Accounts.tsx b/src/containers/b2b/Accounts.tsx
diff --git a/src/containers/b2b/AddressBookPage.tsx b/src/containers/b2b/AddressBookPage.tsx
diff --git a/src/containers/b2b/PurchaseHistoryPage.tsx b/src/containers/b2b/PurchaseHistoryPage.tsx
diff --git a/src/containers/b2b/RequisitionList.tsx b/src/containers/b2b/RequisitionList.tsx
diff --git a/src/containers/b2b/RequisitionPageMain.tsx b/src/containers/b2b/RequisitionPageMain.tsx
diff --git a/src/hooks/store.tsx b/src/hooks/store.tsx
