session thingy for onboarding checks
This commit is contained in:
@ -1,11 +1,13 @@
|
||||
import { useQuery } from "blitz";
|
||||
import { useAuthenticatedSession, useQuery } from "blitz";
|
||||
|
||||
import getCurrentCustomer from "../../customers/queries/get-current-customer";
|
||||
|
||||
export default function useCurrentCustomer() {
|
||||
const session = useAuthenticatedSession();
|
||||
const [customer] = useQuery(getCurrentCustomer, null);
|
||||
return {
|
||||
customer,
|
||||
hasCompletedOnboarding: Boolean(!!customer && customer.accountSid && customer.authToken),
|
||||
hasFilledTwilioCredentials: Boolean(customer && customer.accountSid && customer.authToken),
|
||||
hasCompletedOnboarding: session.hasCompletedOnboarding,
|
||||
};
|
||||
}
|
||||
|
@ -4,12 +4,9 @@ import getCurrentCustomerPhoneNumber from "../../phone-numbers/queries/get-curre
|
||||
import useCurrentCustomer from "./use-current-customer";
|
||||
|
||||
export default function useCustomerPhoneNumber() {
|
||||
const { hasCompletedOnboarding } = useCurrentCustomer();
|
||||
const [customerPhoneNumber] = useQuery(
|
||||
getCurrentCustomerPhoneNumber,
|
||||
{},
|
||||
{ enabled: hasCompletedOnboarding },
|
||||
);
|
||||
const { customer } = useCurrentCustomer();
|
||||
const hasFilledTwilioCredentials = Boolean(customer && customer.accountSid && customer.authToken);
|
||||
const [customerPhoneNumber] = useQuery(getCurrentCustomerPhoneNumber, {}, { enabled: hasFilledTwilioCredentials });
|
||||
|
||||
return customerPhoneNumber;
|
||||
}
|
||||
|
@ -5,10 +5,14 @@ import useCustomerPhoneNumber from "./use-customer-phone-number";
|
||||
|
||||
export default function useRequireOnboarding() {
|
||||
const router = useRouter();
|
||||
const { customer, hasCompletedOnboarding } = useCurrentCustomer();
|
||||
const { hasFilledTwilioCredentials, hasCompletedOnboarding } = useCurrentCustomer();
|
||||
const customerPhoneNumber = useCustomerPhoneNumber();
|
||||
|
||||
if (!hasCompletedOnboarding) {
|
||||
if (hasCompletedOnboarding) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!hasFilledTwilioCredentials) {
|
||||
throw router.push(Routes.StepTwo());
|
||||
}
|
||||
|
||||
@ -17,7 +21,6 @@ export default function useRequireOnboarding() {
|
||||
return;
|
||||
}*/
|
||||
|
||||
console.log("customerPhoneNumber", customerPhoneNumber);
|
||||
if (!customerPhoneNumber) {
|
||||
throw router.push(Routes.StepThree());
|
||||
}
|
||||
|
Reference in New Issue
Block a user