multi tenancy stuff

app/core/hooks/use-current-customer.ts

@@ -1,13 +0,0 @@
-import { useSession, useQuery } from "blitz";
-
-import getCurrentCustomer from "../../customers/queries/get-current-customer";
-
-export default function useCurrentCustomer() {
-	const session = useSession();
-	const [customer] = useQuery(getCurrentCustomer, null, { enabled: Boolean(session.userId) });
-	return {
-		customer,
-		hasFilledTwilioCredentials: Boolean(customer && customer.accountSid && customer.authToken),
-		hasCompletedOnboarding: session.hasCompletedOnboarding,
-	};
-}

app/core/hooks/use-current-phone-number.ts

@@ -0,0 +1,11 @@
+import { useQuery } from "blitz";
+
+import getCurrentPhoneNumber from "../../phone-numbers/queries/get-current-phone-number";
+import useCurrentUser from "./use-current-user";
+
+export default function useUserPhoneNumber() {
+	const { hasFilledTwilioCredentials } = useCurrentUser();
+	const [phoneNumber] = useQuery(getCurrentPhoneNumber, {}, { enabled: hasFilledTwilioCredentials });
+
+	return phoneNumber;
+}

app/core/hooks/use-current-user.ts

@@ -0,0 +1,15 @@
+import { useSession, useQuery } from "blitz";
+
+import getCurrentUser from "../../users/queries/get-current-user";
+
+export default function useCurrentUser() {
+	const session = useSession();
+	const [user] = useQuery(getCurrentUser, null, { enabled: Boolean(session.userId) });
+	const organization = user?.memberships[0]!.organization;
+	return {
+		user,
+		organization,
+		hasFilledTwilioCredentials: Boolean(user && organization?.twilioAccountSid && organization?.twilioAuthToken),
+		hasCompletedOnboarding: session.hasCompletedOnboarding,
+	};
+}

app/core/hooks/use-customer-phone-number.ts

@@ -1,12 +0,0 @@
-import { useQuery } from "blitz";
-
-import getCurrentCustomerPhoneNumber from "../../phone-numbers/queries/get-current-customer-phone-number";
-import useCurrentCustomer from "./use-current-customer";
-
-export default function useCustomerPhoneNumber() {
-	const { customer } = useCurrentCustomer();
-	const hasFilledTwilioCredentials = Boolean(customer && customer.accountSid && customer.authToken);
-	const [customerPhoneNumber] = useQuery(getCurrentCustomerPhoneNumber, {}, { enabled: hasFilledTwilioCredentials });
-
-	return customerPhoneNumber;
-}

app/core/hooks/use-notifications.ts

@@ -2,6 +2,7 @@ import { getConfig, useMutation } from "blitz";
 import { useEffect, useState } from "react";
 
 import setNotificationSubscription from "../mutations/set-notification-subscription";
+import useCurrentPhoneNumber from "./use-current-phone-number";
 
 const { publicRuntimeConfig } = getConfig();
 
@@ -9,6 +10,7 @@ export default function useNotifications() {
 	const isServiceWorkerSupported = "serviceWorker" in navigator;
 	const [subscription, setSubscription] = useState<PushSubscription | null>(null);
 	const [setNotificationSubscriptionMutation] = useMutation(setNotificationSubscription);
+	const phoneNumber = useCurrentPhoneNumber();
 
 	useEffect(() => {
 		(async () => {
@@ -23,7 +25,7 @@ export default function useNotifications() {
 	}, [isServiceWorkerSupported]);
 
 	async function subscribe() {
-		if (!isServiceWorkerSupported) {
+		if (!isServiceWorkerSupported || !phoneNumber) {
 			return;
 		}
 
@@ -33,7 +35,10 @@ export default function useNotifications() {
 			applicationServerKey: urlBase64ToUint8Array(publicRuntimeConfig.webPush.publicKey),
 		});
 		setSubscription(subscription);
-		await setNotificationSubscriptionMutation({ subscription: subscription.toJSON() as any }); // TODO remove as any
+		await setNotificationSubscriptionMutation({
+			phoneNumberId: phoneNumber.id,
+			subscription: subscription.toJSON() as any,
+		}); // TODO remove as any
 	}
 
 	async function unsubscribe() {

app/core/hooks/use-require-onboarding.ts

@@ -1,12 +1,12 @@
 import { Routes, useRouter } from "blitz";
 
-import useCurrentCustomer from "./use-current-customer";
-import useCustomerPhoneNumber from "./use-customer-phone-number";
+import useCurrentUser from "./use-current-user";
+import useCurrentPhoneNumber from "./use-current-phone-number";
 
 export default function useRequireOnboarding() {
 	const router = useRouter();
-	const { hasFilledTwilioCredentials, hasCompletedOnboarding } = useCurrentCustomer();
-	const customerPhoneNumber = useCustomerPhoneNumber();
+	const { hasFilledTwilioCredentials, hasCompletedOnboarding } = useCurrentUser();
+	const phoneNumber = useCurrentPhoneNumber();
 
 	if (hasCompletedOnboarding) {
 		return;
@@ -16,12 +16,12 @@ export default function useRequireOnboarding() {
 		throw router.push(Routes.StepTwo());
 	}
 
-	/*if (!customer.paddleCustomerId || !customer.paddleSubscriptionId) {
+	/*if (!user.paddleCustomerId || !user.paddleSubscriptionId) {
 		throw router.push(Routes.StepTwo());
 		return;
 	}*/
 
-	if (!customerPhoneNumber) {
+	if (!phoneNumber) {
 		throw router.push(Routes.StepThree());
 	}
 }