Align with the other PR

app/dashboard.tsx

@@ -1,6 +1,8 @@
-import { Text } from "react-native";
+import { Button } from "react-native-paper";
 
 import { useIdentity, RedirectIfNoProfile } from "@/common/identity";
+import { MonoText } from "@/components/StyledText";
+import { View } from "@/components/Themed";
 
 const Page = () => {
   const identity = useIdentity();
@@ -9,7 +11,13 @@ const Page = () => {
     return <RedirectIfNoProfile identity={identity} />;
   }
 
-  return <Text>Dashboard</Text>;
+  return (
+    <View>
+      {/* TODO: This shouldn't be here */}
+      <MonoText>{JSON.stringify(identity.profile, null, 2)}</MonoText>
+      <Button onPress={() => identity.logOut()}>LOG OUT</Button>
+    </View>
+  );
 };
 
 export default Page;

app/profile/list.tsx

@@ -1,27 +1,39 @@
-import { Link, Stack } from "expo-router";
+import { Link, Stack, router } from "expo-router";
 import { ScrollView, StyleSheet, View } from "react-native";
 import { Avatar, Button, List } from "react-native-paper";
 
-import { IProfile } from "./interfaces";
-
 import { useI18n } from "@/common/i18n";
+import {
+  Profile,
+  isSenior,
+  isCaretaker,
+  useIdentity,
+  RedirectIfLoggedOut,
+} from "@/common/identity";
 
 const mockApiResponse = {
   profiles: [
-    { type: "caretaker", seniorId: "2137", seniorAlias: "Jan Kowalski" },
-    { type: "caretaker", seniorId: "123", seniorAlias: "Grzegorz Floryda" },
-    { type: "senior", seniorId: "789" },
-  ] as IProfile[],
+    { type: "caretaker", seniorId: 2137, seniorAlias: "Jan Kowalski" },
+    { type: "caretaker", seniorId: 123, seniorAlias: "Grzegorz Floryda" },
+    { type: "senior", seniorId: 789 },
+  ] as Profile[],
 };
 
 const ProfilesList = () => {
   const { t } = useI18n();
+  const identity = useIdentity();
+
+  if (!identity.isLoggedIn) {
+    return <RedirectIfLoggedOut identity={identity} />;
+  }
+
   const profiles = mockApiResponse.profiles;
-  const seniorProfile = profiles.find(({ type }) => type === "senior");
-  const caretakerProfiles = profiles.filter(({ type }) => type === "caretaker");
+  const seniorProfile = profiles.find(isSenior);
+  const caretakerProfiles = profiles.filter(isCaretaker);
 
-  const handleItemPress = (seniorId: string) => {
-    console.log(seniorId); // TODO: navigate to profile
+  const handleItemPress = (profile: Profile) => {
+    identity.selectProfile(profile);
+    router.push("/dashboard");
   };
 
   return (
@@ -34,13 +46,13 @@ const ProfilesList = () => {
           </List.Subheader>
         )}
         <ScrollView style={styles.scrollView}>
-          {caretakerProfiles.map(({ seniorId, seniorAlias }) => {
+          {caretakerProfiles.map((p) => {
             return (
               <List.Item
-                key={seniorId}
+                key={p.seniorId}
                 title={t("profileList.caretakerNameFallback")}
-                description={`Senior: ${seniorAlias || seniorId}`}
-                onPress={() => handleItemPress(seniorId)}
+                description={`Senior: ${p.seniorAlias}`}
+                onPress={() => handleItemPress(p)}
                 style={styles.listItem}
                 titleStyle={styles.listItemTitle}
                 descriptionStyle={styles.listItemDescription}
@@ -63,7 +75,7 @@ const ProfilesList = () => {
             <List.Item
               title={t("profileList.seniorNameFallback")}
               description={t("profileList.seniorDescription")}
-              onPress={() => handleItemPress(seniorProfile.seniorId)}
+              onPress={() => handleItemPress(seniorProfile)}
               style={styles.listItem}
               titleStyle={styles.listItemTitle}
               descriptionStyle={styles.listItemDescription}

common/identity/guards.ts

@@ -0,0 +1,5 @@
+import { Profile, SeniorProfile, CaretakerProfile } from "./types";
+
+export const isSenior = (p: Profile): p is SeniorProfile => p.type === "senior";
+export const isCaretaker = (p: Profile): p is CaretakerProfile =>
+  p.type === "caretaker";

common/identity/index.ts

@@ -4,4 +4,10 @@ export {
   RedirectIfLoggedOut,
   RedirectIfLoggedIn,
 } from "./redirects";
-export type { Identity, Profile } from "./types";
+export type {
+  Identity,
+  Profile,
+  SeniorProfile,
+  CaretakerProfile,
+} from "./types";
+export { isSenior, isCaretaker } from "./guards";

common/identity/redirects.tsx

@@ -31,7 +31,7 @@ export const RedirectIfNoProfile = ({ identity }: RedirectProps) => {
     return <Redirect href="/auth/login" />;
   }
   if (!identity.hasProfile) {
-    return <Redirect href="/profiles/list" />;
+    return <Redirect href="/profile/list" />;
   }
   throw new InvalidRedirectUsageError(RedirectIfNoProfile);
 };
@@ -76,7 +76,7 @@ export const RedirectIfLoggedIn = ({ identity }: RedirectProps) => {
     return <Redirect href="/dashboard" />;
   }
   if (identity.isLoggedIn) {
-    return <Redirect href="/profiles/list" />;
+    return <Redirect href="/profile/list" />;
   }
   throw new InvalidRedirectUsageError(RedirectIfLoggedIn);
 };

common/identity/types.ts

@@ -1,16 +1,18 @@
-export type Profile =
-  | {
-      type: "senior";
-      /** For `type` `"senior"`, this is the account ID of the current user. */
-      seniorId: number;
-    }
-  | {
-      type: "caretaker";
-      /** For `type` `"caretaker"`, this is the account ID of the senior which is taken care of (another user). */
-      seniorId: number;
-      /** Custom alias for a given senior's account, set by the current caretaker. */
-      seniorAlias: string;
-    };
+export type SeniorProfile = {
+  type: "senior";
+  /** For `type` `"senior"`, this is the account ID of the current user. */
+  seniorId: number;
+};
+
+export type CaretakerProfile = {
+  type: "caretaker";
+  /** For `type` `"caretaker"`, this is the account ID of the senior which is taken care of (another user). */
+  seniorId: number;
+  /** Custom alias for a given senior's account, set by the current caretaker. */
+  seniorAlias: string;
+};
+
+export type Profile = SeniorProfile | CaretakerProfile;
 
 /**
  * State machine representing the current state of the user's identity.

tests/common/identity.test.tsx

@@ -42,7 +42,7 @@ const testRedirect = async (
   redirect: ReactNode,
   targetRoute: string,
 ) => {
-  const routes = ["/dashboard", "/auth/login", "/profiles/list"];
+  const routes = ["/dashboard", "/auth/login", "/profile/list"];
 
   render(
     <MockRouter
@@ -117,7 +117,7 @@ describe("Identity", () => {
         testRedirect(
           "/dashboard",
           <RedirectIfNoProfile identity={mockIdentityLoggedIn} />,
-          "/profiles/list",
+          "/profile/list",
         ));
     });
 
@@ -142,7 +142,7 @@ describe("Identity", () => {
         testRedirect(
           "/auth/login",
           <RedirectIfLoggedIn identity={mockIdentityLoggedIn} />,
-          "/profiles/list",
+          "/profile/list",
         ));
     });
   });