npm - react-redux-django-auth - Versions diffs - 1.3.8 → 1.3.9 - Mend

react-redux-django-auth 1.3.8 → 1.3.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/index.js CHANGED Viewed

@@ -1300,7 +1300,8 @@ var import_react5 = require("react");
 var import_react_redux5 = require("react-redux");
 var useAuthicatedUser = function(apiURL, location) {
     var dispatch = (0, import_react_redux5.useDispatch)();
-    var _ref = _sliced_to_array((0, import_react5.useState)(true), 2), isLoading = _ref[0], setIsLoading = _ref[1];
+    var _ref = _sliced_to_array((0, import_react5.useState)(true), 2), isAuthLoading = _ref[0], setIsAuthLoading = _ref[1];
+    var _ref1 = _sliced_to_array((0, import_react5.useState)(false), 2), isUserLoading = _ref1[0], setIsUserLoading = _ref1[1];
     var isAuthenticated = (0, import_react_redux5.useSelector)(function(state) {
         return state.auth.isAuthenticated;
     });
@@ -1311,35 +1312,19 @@ var useAuthicatedUser = function(apiURL, location) {
         return state.auth.user;
     });
     (0, import_react5.useEffect)(function() {
-        var fetchAuthData = function() {
+        var runAuthCheck = function() {
             return _async_to_generator(function() {
                 return _ts_generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
-                            setIsLoading(true);
-                            _state.label = 1;
-                        case 1:
-                            _state.trys.push([
-                                1,
-                                ,
-                                3,
-                                4
-                            ]);
+                            setIsAuthLoading(true);
                             return [
                                 4,
                                 dispatch(checkAuthenticated(apiURL))
                             ];
-                        case 2:
+                        case 1:
                             _state.sent();
-                            return [
-                                3,
-                                4
-                            ];
-                        case 3:
-                            return [
-                                7
-                            ];
-                        case 4:
+                            setIsAuthLoading(false);
                             return [
                                 2
                             ];
@@ -1347,60 +1332,55 @@ var useAuthicatedUser = function(apiURL, location) {
                 });
             })();
         };
-        fetchAuthData();
+        runAuthCheck();
     }, [
         dispatch,
         apiURL,
         location
     ]);
     (0, import_react5.useEffect)(function() {
-        var fetchUserData = function() {
-            return _async_to_generator(function() {
-                return _ts_generator(this, function(_state) {
-                    switch(_state.label){
-                        case 0:
-                            if (!isAuthenticated) return [
-                                3,
-                                2
-                            ];
-                            return [
-                                4,
-                                dispatch(load_user(apiURL))
-                            ];
-                        case 1:
-                            _state.sent();
-                            _state.label = 2;
-                        case 2:
-                            setIsLoading(false);
-                            return [
-                                2
-                            ];
-                    }
-                });
-            })();
-        };
-        if (isAuthenticated !== null) {
-            fetchUserData();
+        if (isAuthenticated) {
+            var loadUserData = function() {
+                return _async_to_generator(function() {
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                setIsUserLoading(true);
+                                return [
+                                    4,
+                                    dispatch(load_user(apiURL))
+                                ];
+                            case 1:
+                                _state.sent();
+                                setIsUserLoading(false);
+                                return [
+                                    2
+                                ];
+                        }
+                    });
+                })();
+            };
+            loadUserData();
         }
     }, [
         dispatch,
-        isAuthenticated,
-        apiURL
+        apiURL,
+        isAuthenticated
     ]);
     var refreshUser = (0, import_react5.useCallback)(function() {
-        setIsLoading(true);
         var loadAndFinish = function() {
             return _async_to_generator(function() {
                 return _ts_generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
+                            setIsUserLoading(true);
                             return [
                                 4,
                                 dispatch(load_user(apiURL))
                             ];
                         case 1:
                             _state.sent();
-                            setIsLoading(false);
+                            setIsUserLoading(false);
                             return [
                                 2
                             ];
@@ -1418,37 +1398,14 @@ var useAuthicatedUser = function(apiURL, location) {
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
-                        setIsLoading(true);
-                        _state.label = 1;
-                    case 1:
-                        _state.trys.push([
-                            1,
-                            ,
-                            4,
-                            5
-                        ]);
+                        setIsAuthLoading(true);
                         return [
                             4,
                             dispatch(checkAuthenticated(apiURL))
                         ];
-                    case 2:
-                        _state.sent();
-                        return [
-                            4,
-                            dispatch(load_user(apiURL))
-                        ];
-                    case 3:
+                    case 1:
                         _state.sent();
-                        return [
-                            3,
-                            5
-                        ];
-                    case 4:
-                        setIsLoading(false);
-                        return [
-                            7
-                        ];
-                    case 5:
+                        setIsAuthLoading(false);
                         return [
                             2
                         ];
@@ -1464,6 +1421,7 @@ var useAuthicatedUser = function(apiURL, location) {
     }, [
         dispatch
     ]);
+    var isLoading = isAuthLoading || isUserLoading;
     return {
         error: error,
         isAuthenticated: isAuthenticated,

package/dist/index.mjs CHANGED Viewed

@@ -462,53 +462,48 @@ import { useCallback as useCallback5, useEffect as useEffect4, useState as useSt
 import { useDispatch as useDispatch5, useSelector as useSelector4 } from "react-redux";
 var useAuthicatedUser = (apiURL, location) => {
   const dispatch = useDispatch5();
-  const [isLoading, setIsLoading] = useState4(true);
+  const [isAuthLoading, setIsAuthLoading] = useState4(true);
+  const [isUserLoading, setIsUserLoading] = useState4(false);
   const isAuthenticated = useSelector4(
     (state) => state.auth.isAuthenticated
   );
   const error = useSelector4((state) => state.auth.error);
   const currentUser = useSelector4((state) => state.auth.user);
   useEffect4(() => {
-    const fetchAuthData = async () => {
-      setIsLoading(true);
-      try {
-        await dispatch(checkAuthenticated(apiURL));
-      } finally {
-      }
+    const runAuthCheck = async () => {
+      setIsAuthLoading(true);
+      await dispatch(checkAuthenticated(apiURL));
+      setIsAuthLoading(false);
     };
-    fetchAuthData();
+    runAuthCheck();
   }, [dispatch, apiURL, location]);
   useEffect4(() => {
-    const fetchUserData = async () => {
-      if (isAuthenticated) {
+    if (isAuthenticated) {
+      const loadUserData = async () => {
+        setIsUserLoading(true);
         await dispatch(load_user(apiURL));
-      }
-      setIsLoading(false);
-    };
-    if (isAuthenticated !== null) {
-      fetchUserData();
+        setIsUserLoading(false);
+      };
+      loadUserData();
     }
-  }, [dispatch, isAuthenticated, apiURL]);
+  }, [dispatch, apiURL, isAuthenticated]);
   const refreshUser = useCallback5(() => {
-    setIsLoading(true);
     const loadAndFinish = async () => {
+      setIsUserLoading(true);
       await dispatch(load_user(apiURL));
-      setIsLoading(false);
+      setIsUserLoading(false);
     };
     loadAndFinish();
   }, [dispatch, apiURL]);
   const refreshAuth = useCallback5(async () => {
-    setIsLoading(true);
-    try {
-      await dispatch(checkAuthenticated(apiURL));
-      await dispatch(load_user(apiURL));
-    } finally {
-      setIsLoading(false);
-    }
+    setIsAuthLoading(true);
+    await dispatch(checkAuthenticated(apiURL));
+    setIsAuthLoading(false);
   }, [dispatch, apiURL]);
   const clearErrorsWrapper = useCallback5(() => {
     dispatch(clearErrors());
   }, [dispatch]);
+  const isLoading = isAuthLoading || isUserLoading;
   return {
     error,
     isAuthenticated,

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "react-redux-django-auth",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "description": "A React Redux Authentication system for django app built with TypeScript.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",