react-redux-django-auth 1.3.9 → 1.4.0

package/dist/index.d.mts

@@ -42,7 +42,6 @@ interface AuthHookReturn {
     clearErrors: () => void;
     refreshUser: () => void;
     refreshAuth: () => Promise<void>;
-    isLoading: boolean;
 }
 declare const useAuthicatedUser: (apiURL: string, location: any) => AuthHookReturn;
 

package/dist/index.d.ts

@@ -42,7 +42,6 @@ interface AuthHookReturn {
     clearErrors: () => void;
     refreshUser: () => void;
     refreshAuth: () => Promise<void>;
-    isLoading: boolean;
 }
 declare const useAuthicatedUser: (apiURL: string, location: any) => AuthHookReturn;
 

package/dist/index.js

@@ -1300,8 +1300,6 @@ 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), 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;
     });
@@ -1312,27 +1310,7 @@ var useAuthicatedUser = function(apiURL, location) {
         return state.auth.user;
     });
     (0, import_react5.useEffect)(function() {
-        var runAuthCheck = function() {
-            return _async_to_generator(function() {
-                return _ts_generator(this, function(_state) {
-                    switch(_state.label){
-                        case 0:
-                            setIsAuthLoading(true);
-                            return [
-                                4,
-                                dispatch(checkAuthenticated(apiURL))
-                            ];
-                        case 1:
-                            _state.sent();
-                            setIsAuthLoading(false);
-                            return [
-                                2
-                            ];
-                    }
-                });
-            })();
-        };
-        runAuthCheck();
+        dispatch(checkAuthenticated(apiURL));
     }, [
         dispatch,
         apiURL,
@@ -1340,55 +1318,15 @@ var useAuthicatedUser = function(apiURL, location) {
     ]);
     (0, import_react5.useEffect)(function() {
         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(load_user(apiURL));
         }
     }, [
         dispatch,
-        apiURL,
-        isAuthenticated
+        isAuthenticated,
+        apiURL
     ]);
     var refreshUser = (0, import_react5.useCallback)(function() {
-        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();
-                            setIsUserLoading(false);
-                            return [
-                                2
-                            ];
-                    }
-                });
-            })();
-        };
-        loadAndFinish();
+        dispatch(load_user(apiURL));
     }, [
         dispatch,
         apiURL
@@ -1398,14 +1336,13 @@ var useAuthicatedUser = function(apiURL, location) {
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
-                        setIsAuthLoading(true);
                         return [
                             4,
                             dispatch(checkAuthenticated(apiURL))
                         ];
                     case 1:
                         _state.sent();
-                        setIsAuthLoading(false);
+                        dispatch(load_user(apiURL));
                         return [
                             2
                         ];
@@ -1421,15 +1358,13 @@ var useAuthicatedUser = function(apiURL, location) {
     }, [
         dispatch
     ]);
-    var isLoading = isAuthLoading || isUserLoading;
     return {
         error: error,
         isAuthenticated: isAuthenticated,
         currentUser: currentUser,
         clearErrors: clearErrorsWrapper,
         refreshUser: refreshUser,
-        refreshAuth: refreshAuth,
-        isLoading: isLoading
+        refreshAuth: refreshAuth
     };
 };
 var useLoadUser_default = useAuthicatedUser;

package/dist/index.mjs

@@ -458,71 +458,51 @@ var useSignup = (initialFields, apiUrl) => {
 var useSignup_default = useSignup;
 
 // src/hooks/useLoadUser.tsx
-import { useCallback as useCallback5, useEffect as useEffect4, useState as useState4 } from "react";
+import { useCallback as useCallback5, useEffect as useEffect4 } from "react";
 import { useDispatch as useDispatch5, useSelector as useSelector4 } from "react-redux";
 var useAuthicatedUser = (apiURL, location) => {
   const dispatch = useDispatch5();
-  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 runAuthCheck = async () => {
-      setIsAuthLoading(true);
-      await dispatch(checkAuthenticated(apiURL));
-      setIsAuthLoading(false);
-    };
-    runAuthCheck();
+    dispatch(checkAuthenticated(apiURL));
   }, [dispatch, apiURL, location]);
   useEffect4(() => {
     if (isAuthenticated) {
-      const loadUserData = async () => {
-        setIsUserLoading(true);
-        await dispatch(load_user(apiURL));
-        setIsUserLoading(false);
-      };
-      loadUserData();
+      dispatch(load_user(apiURL));
     }
-  }, [dispatch, apiURL, isAuthenticated]);
+  }, [dispatch, isAuthenticated, apiURL]);
   const refreshUser = useCallback5(() => {
-    const loadAndFinish = async () => {
-      setIsUserLoading(true);
-      await dispatch(load_user(apiURL));
-      setIsUserLoading(false);
-    };
-    loadAndFinish();
+    dispatch(load_user(apiURL));
   }, [dispatch, apiURL]);
   const refreshAuth = useCallback5(async () => {
-    setIsAuthLoading(true);
     await dispatch(checkAuthenticated(apiURL));
-    setIsAuthLoading(false);
+    dispatch(load_user(apiURL));
   }, [dispatch, apiURL]);
   const clearErrorsWrapper = useCallback5(() => {
     dispatch(clearErrors());
   }, [dispatch]);
-  const isLoading = isAuthLoading || isUserLoading;
   return {
     error,
     isAuthenticated,
     currentUser,
     clearErrors: clearErrorsWrapper,
     refreshUser,
-    refreshAuth,
-    isLoading
+    refreshAuth
   };
 };
 var useLoadUser_default = useAuthicatedUser;
 
 // src/hooks/useResetPassword.tsx
-import { useState as useState5, useCallback as useCallback6, useEffect as useEffect5 } from "react";
+import { useState as useState4, useCallback as useCallback6, useEffect as useEffect5 } from "react";
 import { useDispatch as useDispatch6, useSelector as useSelector5 } from "react-redux";
 var useResetPassword = (apiUrl) => {
   const dispatch = useDispatch6();
-  const [loading, setLoading] = useState5(false);
-  const [email, setEmail] = useState5("");
+  const [loading, setLoading] = useState4(false);
+  const [email, setEmail] = useState4("");
   const status = useSelector5((state) => state.auth.status);
   const error = useSelector5((state) => state.auth.error);
   const isStatus204 = status === 204;
@@ -561,12 +541,12 @@ var useResetPassword = (apiUrl) => {
 var useResetPassword_default = useResetPassword;
 
 // src/hooks/usePasswordConfirm.tsx
-import { useState as useState6, useCallback as useCallback7, useEffect as useEffect6 } from "react";
+import { useState as useState5, useCallback as useCallback7, useEffect as useEffect6 } from "react";
 import { useDispatch as useDispatch7, useSelector as useSelector6 } from "react-redux";
 var usePasswordConfirm = (initialFields, apiUrl) => {
   const dispatch = useDispatch7();
-  const [loading, setLoading] = useState6(false);
-  const [formData, setFormData] = useState6(initialFields);
+  const [loading, setLoading] = useState5(false);
+  const [formData, setFormData] = useState5(initialFields);
   const error = useSelector6((state) => state.auth.error);
   const status = useSelector6((state) => state.auth.status);
   const isStatus204 = status === 204;
@@ -606,13 +586,13 @@ var usePasswordConfirm = (initialFields, apiUrl) => {
 var usePasswordConfirm_default = usePasswordConfirm;
 
 // src/hooks/useChangePassword.tsx
-import { useState as useState7, useCallback as useCallback8, useEffect as useEffect7 } from "react";
+import { useState as useState6, useCallback as useCallback8, useEffect as useEffect7 } from "react";
 import { useDispatch as useDispatch8, useSelector as useSelector7 } from "react-redux";
 var useChangeAuthenticatedUserPassword = (initialFields, apiUrl) => {
   const dispatch = useDispatch8();
-  const [loading, setLoading] = useState7(false);
-  const [formData, setFormData] = useState7(initialFields);
-  const [error, setError] = useState7(null);
+  const [loading, setLoading] = useState6(false);
+  const [formData, setFormData] = useState6(initialFields);
+  const [error, setError] = useState6(null);
   const authError = useSelector7((state) => state.auth.error);
   const status = useSelector7((state) => state.auth.status);
   useEffect7(() => {
@@ -657,7 +637,7 @@ var useChangePassword_default = useChangeAuthenticatedUserPassword;
 
 // src/hooks/useGoogleAuth.tsx
 import { useDispatch as useDispatch9, useSelector as useSelector8 } from "react-redux";
-import { useEffect as useEffect8, useCallback as useCallback9, useState as useState8 } from "react";
+import { useEffect as useEffect8, useCallback as useCallback9, useState as useState7 } from "react";
 import axios2 from "axios";
 var useGoogleAuth = (apiUrl) => {
   const dispatch = useDispatch9();
@@ -666,7 +646,7 @@ var useGoogleAuth = (apiUrl) => {
   );
   const error = useSelector8((state) => state.auth.error);
   const status = useSelector8((state) => state.auth.status);
-  const [loading, setLoading] = useState8(false);
+  const [loading, setLoading] = useState7(false);
   const isStatus201 = status === 201;
   const continueWithGoogle = useCallback9(async () => {
     setLoading(true);
@@ -715,7 +695,7 @@ var useGoogleAuth_default = useGoogleAuth;
 
 // src/hooks/useFacebookAuth.tsx
 import { useDispatch as useDispatch10, useSelector as useSelector9 } from "react-redux";
-import { useEffect as useEffect9, useCallback as useCallback10, useState as useState9 } from "react";
+import { useEffect as useEffect9, useCallback as useCallback10, useState as useState8 } from "react";
 import axios3 from "axios";
 var useFacebookAuth = (apiUrl) => {
   const dispatch = useDispatch10();
@@ -724,7 +704,7 @@ var useFacebookAuth = (apiUrl) => {
   );
   const error = useSelector9((state) => state.auth.error);
   const status = useSelector9((state) => state.auth.status);
-  const [loading, setLoading] = useState9(false);
+  const [loading, setLoading] = useState8(false);
   const isStatus201 = status === 201;
   const continueWithFacebook = useCallback10(async () => {
     setLoading(true);

package/package.json

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