Logout wiring

components/Authentication.js

@@ -1,7 +1,7 @@
 const { useEffect, useRef } = require('react');
 const { useMiddleEnd } = require('strange-middle-end');
 const { useSelector } = require('react-redux');
-const { useIsFocused, useNavigation } = require('@react-navigation/native');
+const { useIsFocused, useNavigation, useRoute } = require('@react-navigation/native');
 const LoadingOverlay = require('components/LoadingOverlay');
 
 exports.withAuthentication = function withAuthentication(Component) {
@@ -14,20 +14,27 @@ exports.withAuthentication = function withAuthentication(Component) {
         const isAuthenticationSettled = useSelector(m.selectors.auth.getHasAuthenticationSettled);
         const navigation = useNavigation();
         const isFocused = useIsFocused();
+        const route = useRoute();
 
         useEffect(() => {
 
             if (!isAuthenticated && isAuthenticationSettled && isFocused) { // not authenticated, force login
                 if (!attemptingRef.current) {
                     attemptingRef.current = true;
-                    navigation.navigate('/login');
+
+                    navigation.navigate(
+                        '/login',
+                        {
+                            prev: route.name
+                        }
+                    );
                 }
                 else {
                     attemptingRef.current = false;
                     navigation.canGoBack() ? navigation.goBack() : navigation.navigate('/home');
                 }
             }
-        }, [isAuthenticated, isAuthenticationSettled, isFocused, navigation]);
+        }, [isAuthenticated, isAuthenticationSettled, isFocused, navigation, route]);
 
         if (!isAuthenticationSettled  && !isAuthenticated) { // authenticating from unauthenticated (doesn't cover reauthorizing or fetchCurrentUser calls)
             return (<LoadingOverlay />);

routes/auth/containers/Login.js

@@ -28,7 +28,15 @@ module.exports = function LoginContainer(props) {
             }
         }
         else {
-            navigation.navigate('/demo');
+            const routes = navigation.getState().routes;
+            const loginRoute = routes.find(({ name }) => name === '/login');
+
+            if (loginRoute.params?.prev) {
+                navigation.navigate(loginRoute.params.prev);
+            }
+            else {
+                navigation.navigate('/demo');
+            }
         }
     };
 

routes/protected/components/Protected.js

@@ -5,23 +5,24 @@ const { Button, Text } = require('@ui-kitten/components');
 
 const internals = {};
 
-module.exports = function Protected({ navigation, ...props }) {
+module.exports = function Protected({ onPressLogout, onPressDemo, ...props }) {
 
     const { CenteredButton, BigText, Wrapper } = internals;
 
     return (
         <Wrapper {...props}>
             <View>
                 <BigText>This page is exclusive to logged-in users.</BigText>
-                <CenteredButton onPress={() => navigation.navigate('/demo')}>Go to Demo</CenteredButton>
-                <CenteredButton appearance='ghost' onPress={() => navigation.navigate('/login')}>Log Out</CenteredButton>
+                <CenteredButton onPress={onPressDemo}>Go to Demo</CenteredButton>
+                <CenteredButton appearance='ghost' onPress={onPressLogout}>Log Out</CenteredButton>
             </View>
         </Wrapper>
     );
 };
 
 module.exports.propTypes = {
-    navigation: T.object.isRequired
+    onPressLogout: T.func.isRequired,
+    onPressDemo: T.func.isRequired
 };
 
 internals.BigText = Styled(Text)`

routes/protected/containers/Protected.js

@@ -9,13 +9,9 @@ module.exports = function ProtectedContainer(props) {
 
     const onPressLogout = async () => {
 
-        try {
-            await m.dispatch.auth.logout();
-        }
-        finally {
-            navigation.navigate('login');
-        }
+        await m.dispatch.auth.logout();
+        navigation.navigate('/login');
     };
 
-    return (<Protected {...props} onPressLogout={onPressLogout} />);
+    return (<Protected {...props} onPressLogout={onPressLogout} onPressDemo={() => navigation.navigate('/demo')} />);
 };