feat: add FixitUser type, add 'handle' to User+Contact

src/hooks/useAuthToken.ts

@@ -16,8 +16,10 @@ export const useAuthToken = () => {
     // prettier-ignore
     const {
       id,
+      handle,
       email,
       phone,
+      profile,
       stripeCustomerID,
       stripeConnectAccount,
       subscription
@@ -37,8 +39,10 @@ export const useAuthToken = () => {
         user: {
           __typename: "User",
           id,
+          handle,
           email,
           phone,
+          profile,
           stripeCustomerID,
           stripeConnectAccount: {
             __typename: "StripeConnectAccount",

src/types/AuthToken.types.ts

@@ -3,6 +3,7 @@ import type { UserSubscription } from "./UserSubscription.types";
 
 export type AuthTokenPayload = {
   id: User["id"];
+  handle: User["handle"];
   email: User["email"];
   phone: User["phone"];
   profile: User["profile"];

src/types/Contact.types.ts

@@ -2,9 +2,11 @@ import type { User } from "./User.types";
 
 export type Contact = {
   id: string;
+  handle: User["handle"];
   email: User["email"];
   phone: User["phone"];
   profile: User["profile"];
-  createdAt: Date;
-  updatedAt: Date;
+  // These two are not currently available via the GQL API:
+  // createdAt: Date;
+  // updatedAt: Date;
 };

src/types/FixitUser.types.ts

@@ -0,0 +1,4 @@
+import type { User } from "./User.types";
+import type { Contact } from "./Contact.types";
+
+export type FixitUser = User | Contact;

src/types/Invoice.types.ts

@@ -1,13 +1,13 @@
-import type { User } from "./User.types";
+import type { FixitUser } from "./FixitUser.types";
 
 export const INVOICE_CONSTANTS = {
   STATUSES: ["OPEN", "CLOSED", "DISPUTED"]
 } as const;
 
 export type Invoice = {
   id: string;
-  createdBy: User;
-  assignedTo: User;
+  createdBy: FixitUser;
+  assignedTo: FixitUser;
   amount: number;
   status: typeof INVOICE_CONSTANTS.STATUSES[number];
   stripePaymentIntentID?: string;

src/types/User.types.ts

@@ -5,6 +5,7 @@ import type { UserStripeConnectAccount } from "./UserStripeConnectAccount.types"
 
 export type User = {
   id: string;
+  handle: string;
   email: string;
   phone: string;
   expoPushToken?: string;

src/types/WorkOrder.types.ts

@@ -1,4 +1,4 @@
-import type { User } from "./User.types";
+import type { FixitUser } from "./FixitUser.types";
 import type { WorkOrderChecklist } from "./WorkOrderChecklist.types";
 
 // prettier-ignore
@@ -13,8 +13,8 @@ export const WORK_ORDER_CONSTANTS = {
 
 export type WorkOrder = {
   id: string;
-  createdBy: User;
-  assignedTo?: User;
+  createdBy: FixitUser;
+  assignedTo?: FixitUser;
   location: Location;
   status: typeof WORK_ORDER_CONSTANTS.STATUSES[number];
   priority: typeof WORK_ORDER_CONSTANTS.PRIORITIES[number];

src/types/index.ts

@@ -12,6 +12,7 @@ export const CONSTANTS = {
 // Export all API types:
 export * from "./AuthToken.types";
 export * from "./Contact.types";
+export * from "./FixitUser.types";
 export * from "./Invoice.types";
 export * from "./User.types";
 export * from "./UserLogin.types";