- Merge and update

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/redux/user/user.sagas.js

@@ -43,6 +43,9 @@ import {
   validatePasswordResetSuccess,
 } from "./user.actions";
 import UserActionTypes from "./user.types";
+import client from "../../utils/GraphQLClient";
+import {QUERY_EULA} from "../../graphql/bodyshop.queries";
+import day from "../../utils/day";
 
 const fpPromise = FingerprintJS.load();
 
@@ -73,6 +76,8 @@ export function* signInWithEmail({ payload: { email, password } }) {
 export function* onCheckUserSession() {
   yield takeLatest(UserActionTypes.CHECK_USER_SESSION, isUserAuthenticated);
 }
+
+
 export function* isUserAuthenticated() {
   try {
     logImEXEvent("redux_auth_check");
@@ -85,6 +90,15 @@ export function* isUserAuthenticated() {
 
     LogRocket.identify(user.email);
 
+    const eulaQuery = yield client.query({
+      query: QUERY_EULA,
+      variables: {
+       now: day()
+      },
+    });
+
+    const eulaIsAccepted = eulaQuery.data.eulas.length > 0 && eulaQuery.data.eulas[0].eula_acceptances.length > 0;
+
     yield put(
       signInSuccess({
         uid: user.uid,
@@ -92,6 +106,8 @@ export function* isUserAuthenticated() {
         displayName: user.displayName,
         photoURL: user.photoURL,
         authorized: true,
+        eulaIsAccepted,
+        currentEula: eulaIsAccepted ? null : eulaQuery.data.eulas[0],
       })
     );
   } catch (error) {