PR: Store user's accountId on frontend, adjust to breaking changes fr…

…om backend #80  (#85)

app/auth/login.tsx

@@ -16,7 +16,7 @@ const Page = () => {
   const identity = useIdentity();
   const theme = useTheme();
   const { t } = useI18n();
-  const obtainToken = useMutation("post", "/api/v1/token");
+  const obtainToken = useMutation("post", "/api/v1/account/token");
 
   const [status, setStatus] = useState<"idle" | "pending" | "error">("idle");
 
@@ -30,7 +30,7 @@ const Page = () => {
     if (res.error) {
       setStatus("error");
     } else {
-      identity.logIn(res.data.token);
+      identity.logIn(res.data);
     }
   };
 

app/auth/register.tsx

@@ -31,7 +31,7 @@ const Page = () => {
   const theme = useTheme();
   const { t } = useI18n();
   const createAccount = useMutation("post", "/api/v1/account");
-  const obtainToken = useMutation("post", "/api/v1/token");
+  const obtainToken = useMutation("post", "/api/v1/account/token");
 
   const [status, setStatus] = useState<"idle" | "pending" | "error">("idle");
 
@@ -51,7 +51,7 @@ const Page = () => {
     if (accountRes.error || tokenRes.error) {
       setStatus("error");
     } else {
-      identity.logIn(tokenRes.data.token);
+      identity.logIn(tokenRes.data);
     }
   };
 

app/dashboard/index.tsx

@@ -1,6 +1,8 @@
+import { Redirect } from "expo-router";
 import { FlatList, View } from "react-native";
 
 import { actions } from "@/common/actions";
+import { AppRoutes } from "@/common/constants";
 import { useI18n } from "@/common/i18n";
 import { useIdentity, RedirectIfNoProfile } from "@/common/identity";
 import { sty } from "@/common/styles";
@@ -22,6 +24,11 @@ const Page = () => {
     return <LoadingScreen title={t("dashboard.view.pageTitle")} />;
   }
 
+  // Ensure backend's enum changes don't break the app
+  if (gadgets.some((action) => !(action in actions))) {
+    return <Redirect href={AppRoutes.EditDashboard} />;
+  }
+
   return (
     <View style={sty.full}>
       <Header left={actions.openMenu} title={t("dashboard.view.pageTitle")} />

app/games/wordle.tsx

@@ -273,6 +273,7 @@ const useStyles = sty.themedHook(({ colors }) => ({
     flexDirection: "row",
     justifyContent: "space-around",
     width: "100%",
+    padding: 16,
   },
 }));
 

app/medication/history.tsx

@@ -24,7 +24,7 @@ const Page = () => {
       <PaginatedScrollView
         renderer={(data) => <IntakeEntry intake={Intake.fromData(data)} />}
         query={{
-          url: "/api/v1/reminders/senior/{seniorId}/intakes",
+          url: "/api/v1/intakes/senior/{seniorId}",
           params: { path: { seniorId } },
         }}
         itemsPerPage={5}

app/profile/caretaker/scan-qr.tsx

@@ -16,7 +16,7 @@ export default function Page() {
   const identity = useIdentity();
   const createCaretakerProfile = useMutation(
     "post",
-    "/api/v1/account/profiles/caretaker",
+    "/api/v1/profiles/caretaker",
   );
 
   const [hasPermission, setHasPermission] = useState<boolean | null>(null);

app/profile/list.tsx

@@ -48,27 +48,21 @@ const ProfilesList = () => {
   const identity = useIdentity();
 
   const { data: profileData, mutate } = useQuery({
-    url: "/api/v1/account/profiles",
+    url: "/api/v1/profiles",
   });
   const { data: caretakersData, isLoading: caretakersLoading } = useQuery({
-    url: "/api/v1/account/profiles/senior/caretakers",
+    url: "/api/v1/profiles/senior/caretakers",
   });
-  const createSeniorProfile = useMutation(
-    "post",
-    "/api/v1/account/profiles/senior",
-  );
+  const createSeniorProfile = useMutation("post", "/api/v1/profiles/senior");
   const editCaretakerProfile = useMutation(
     "put",
-    "/api/v1/account/profiles/caretaker/{seniorId}",
+    "/api/v1/profiles/caretaker/{seniorId}",
   );
-  // const deleteCaretakerProfile = useMutation(
-  //   "delete",
-  //   "/api/v1/account/profiles/caretaker/{seniorId}/{caretakerId}",
-  // );
-  const deleteSeniorProfile = useMutation(
+  const deleteCaretakerProfile = useMutation(
     "delete",
-    "/api/v1/account/profiles/senior",
+    "/api/v1/profiles/caretaker/{seniorId}/{caretakerId}",
   );
+  const deleteSeniorProfile = useMutation("delete", "/api/v1/profiles/senior");
 
   const [isCreatingSeniorProfile, setIsCreatingSeniorProfile] = useState(false);
   const { dialogState, dismissDialog, showEditPrompt, showDeleteAlert } =
@@ -228,7 +222,11 @@ const ProfilesList = () => {
                     if (dialogState.profile.type === "senior") {
                       await deleteSeniorProfile({});
                     } else if (dialogState.profile.type === "caretaker") {
-                      // TODO: Fix after backend changes
+                      const seniorId = identity.accountId;
+                      const caretakerId = dialogState.profile.seniorId;
+                      await deleteCaretakerProfile({
+                        params: { path: { seniorId, caretakerId } },
+                      });
                     }
                     await mutate();
                   }}

app/profile/senior/caretakers.tsx

@@ -3,14 +3,20 @@ import { ScrollView, View } from "react-native";
 import { IconButton, List, Menu } from "react-native-paper";
 
 import { actions } from "@/common/actions";
-import { useMutation, useQuery, useQueryInvalidation } from "@/common/api";
+import {
+  useMutation,
+  useQuery,
+  useQueryInvalidation,
+  type MethodPath,
+} from "@/common/api";
 import { type Translator, useI18n } from "@/common/i18n";
 import { RedirectIfNoProfile, isSenior, useIdentity } from "@/common/identity";
 import type { IdentityProfileKnown } from "@/common/identity/types";
 import { useRefreshControl } from "@/common/refresh";
 import { CaretakerBanner, Header, LoadingScreen } from "@/components";
 
-const endpoint = "/api/v1/account/profiles/senior/caretakers";
+const endpoint =
+  "/api/v1/profiles/senior/caretakers" satisfies MethodPath<"get">;
 
 type ItemProps = {
   profile: {
@@ -29,7 +35,7 @@ const Item = ({ profile, invalidateProfiles, identity, t }: ItemProps) => {
 
   const unlink = useMutation(
     "delete",
-    "/api/v1/account/profiles/caretaker/{seniorId}/{caretakerId}",
+    "/api/v1/profiles/caretaker/{seniorId}/{caretakerId}",
   );
 
   return (

app/profile/senior/display-qr.tsx

@@ -15,7 +15,7 @@ import { Header, LoadingScreen } from "@/components";
 const CreateSeniorProfile = () => {
   const { t } = useI18n();
   const { data, isLoading, mutate } = useQuery({
-    url: "/api/v1/account/profiles/senior",
+    url: "/api/v1/profiles/senior/pairing",
   });
   const [secondsLeft, setSecondsLeft] = useState<number>(data?.validFor || 10);
 

assets/i18n.json

@@ -262,8 +262,8 @@
     "pl": "Gry"
   },
   "actions.playMemoryGame": {
-    "en": "Memory game",
-    "pl": "Gra Memory"
+    "en": "Memory",
+    "pl": "Memory"
   },
   "actions.playWordleGame": {
     "en": "Graydle",
@@ -470,8 +470,8 @@
     "pl_2,3,4": "{count} minuty temu"
   },
   "games.memory.pageTitle": {
-    "en": "Memory game",
-    "pl": "Gra Memory"
+    "en": "Memory",
+    "pl": "Memory"
   },
   "games.memory.startButton": {
     "en": "Start game",

common/api/index.tsx

@@ -1,3 +1,4 @@
+export type { MethodPath } from "./client";
 export { baseUrl } from "./consts";
 export { useQueryInvalidation } from "./invalidation";
 export { useQuery } from "./query";