Package updates and firebase refactor to SDK 9.

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

@@ -1,12 +1,20 @@
 import Fingerprint2 from "@fingerprintjs/fingerprintjs";
+import * as Sentry from "@sentry/browser";
 import { notification } from "antd";
+import { auth, analytics, firestore } from "../../firebase/firebase.utils";
+import { setUserId, setUserProperties } from "firebase/analytics";
+import {
+  checkActionCode,
+  confirmPasswordReset,
+  signInWithEmailAndPassword,
+  signOut,
+} from "firebase/auth";
+import { doc } from "firebase/firestore";
 import i18next from "i18next";
 import LogRocket from "logrocket";
 import { all, call, delay, put, select, takeLatest } from "redux-saga/effects";
+import { tracker } from "../../App/App.container";
 import {
-  analytics,
-  auth,
-  firestore,
   getCurrentUser,
   logImEXEvent,
   updateCurrentUser,
@@ -28,8 +36,6 @@ import {
   validatePasswordResetSuccess,
 } from "./user.actions";
 import UserActionTypes from "./user.types";
-import * as Sentry from "@sentry/browser";
-import { tracker } from "../../App/App.container";
 
 export function* onEmailSignInStart() {
   yield takeLatest(UserActionTypes.EMAIL_SIGN_IN_START, signInWithEmail);
@@ -38,7 +44,7 @@ export function* signInWithEmail({ payload: { email, password } }) {
   try {
     logImEXEvent("redux_sign_in_attempt", { user: email });
 
-    const { user } = yield auth.signInWithEmailAndPassword(email, password);
+    const { user } = yield signInWithEmailAndPassword(auth, email, password);
 
     yield put(
       signInSuccess({
@@ -90,7 +96,7 @@ export function* signOutStart() {
   try {
     logImEXEvent("redux_sign_out");
 
-    yield auth.signOut();
+    yield signOut(auth);
     yield put(signOutSuccess());
     localStorage.removeItem("token");
   } catch (error) {
@@ -104,10 +110,7 @@ export function* onUpdateUserDetails() {
 export function* updateUserDetails(userDetails) {
   try {
     const updatedDetails = yield updateCurrentUser(userDetails.payload);
-    console.log(
-      "🚀  ~ file: user.sagas.js  ~ line 104  ~ updatedDetails",
-      updatedDetails
-    );
+
     yield put(updateUserDetailsSuccess(updatedDetails));
     notification.open({
       type: "success",
@@ -122,7 +125,7 @@ export function* onSetInstanceId() {
 }
 export function* setInstanceIdSaga({ payload: uid }) {
   try {
-    const userInstanceRef = firestore.doc(`userInstance/${uid}`);
+    const userInstanceRef = doc(firestore, `userInstance/${uid}`);
 
     const fingerprint = Fingerprint2.x64hash128(
       (yield Fingerprint2.getPromise({})).map((c) => c.value).join(""),
@@ -147,7 +150,7 @@ export function* onCheckInstanceId() {
 }
 export function* checkInstanceIdSaga({ payload: uid }) {
   try {
-    const userInstanceRef = firestore.doc(`userInstance/${uid}`);
+    const userInstanceRef = doc(firestore, `userInstance/${uid}`);
 
     const snapshot = yield userInstanceRef.get();
     let fingerprint = yield select((state) => state.user.fingerprint);
@@ -193,8 +196,8 @@ export function* signInSuccessSaga({ payload }) {
   }
 
   // if (!payload.email.includes("@imex.")) yield put(setInstanceId(payload.uid));
-  analytics.setUserId(payload.email);
-  analytics.setUserProperties(payload);
+  setUserId(analytics, payload.email);
+  setUserProperties(analytics, payload);
   yield logImEXEvent("redux_sign_in_success");
 }
 
@@ -210,7 +213,7 @@ export function* onSendPasswordResetStart() {
 }
 export function* sendPasswordResetEmail({ payload }) {
   try {
-    yield auth.sendPasswordResetEmail(payload, {
+    yield sendPasswordResetEmail(payload, {
       url: "https://imex.online/passwordreset",
     });
 
@@ -228,8 +231,8 @@ export function* onValidatePasswordResetStart() {
 }
 export function* validatePasswordResetStart({ payload: { password, code } }) {
   try {
-    auth.checkActionCode(code);
-    yield auth.confirmPasswordReset(code, password);
+    checkActionCode(auth, code);
+    yield confirmPasswordReset(auth, code, password);
     yield put(validatePasswordResetSuccess());
   } catch (error) {
     console.log("function*validatePasswordResetStart -> error", error);