mirror of
https://github.com/urosran/cally.git
synced 2025-11-26 16:34:54 +00:00
Auth logic rework
This commit is contained in:
@ -1,18 +1,19 @@
|
|||||||
import React, {useEffect, useState} from "react";
|
import React, {useEffect, useState} from "react";
|
||||||
import { Text, Button, TextInput } from "react-native";
|
import {Button, Text, TextInput} from "react-native";
|
||||||
import { View, TextField, Picker, Checkbox } from "react-native-ui-lib";
|
import {Checkbox, Picker, TextField, View} from "react-native-ui-lib";
|
||||||
import useAuth from "@/hooks/firebase/useAuth";
|
import useAuth from "@/hooks/firebase/useAuth";
|
||||||
import useChildren from "@/hooks/firebase/useChildren";
|
import useChildren from "@/hooks/firebase/useChildren";
|
||||||
import useCaregivers from "@/hooks/firebase/useCaregivers";
|
import useCaregivers from "@/hooks/firebase/useCaregivers";
|
||||||
import {useCreateSubUser} from "@/hooks/firebase/useCreateSubUser";
|
import {useCreateSubUser} from "@/hooks/firebase/useCreateSubUser";
|
||||||
import {email} from "@sideway/address";
|
|
||||||
import {UserProfile} from "@/hooks/firebase/types/profileTypes";
|
import {UserProfile} from "@/hooks/firebase/types/profileTypes";
|
||||||
import {uuidv4} from "@firebase/util";
|
import {uuidv4} from "@firebase/util";
|
||||||
|
import {useGetChildrenByParentId} from "@/hooks/firebase/useGetChildrenByParentId";
|
||||||
|
import {ProfileType, useAuthContext} from "@/contexts/AuthContext";
|
||||||
|
|
||||||
const Screen: React.FC = () => {
|
const Screen: React.FC = () => {
|
||||||
|
const {user, profileType, profileData} = useAuthContext()
|
||||||
|
|
||||||
const {
|
const {
|
||||||
user,
|
|
||||||
profileType,
|
|
||||||
email,
|
email,
|
||||||
setEmail,
|
setEmail,
|
||||||
password,
|
password,
|
||||||
@ -21,17 +22,17 @@ const Screen: React.FC = () => {
|
|||||||
handleSignOut,
|
handleSignOut,
|
||||||
handleProfileTypeSelection,
|
handleProfileTypeSelection,
|
||||||
handleRegister,
|
handleRegister,
|
||||||
|
|
||||||
} = useAuth();
|
} = useAuth();
|
||||||
|
|
||||||
const {
|
const {
|
||||||
children,
|
children,
|
||||||
child,
|
child,
|
||||||
setChild,
|
setChild,
|
||||||
fetchChildren,
|
|
||||||
handleNewChild,
|
handleNewChild,
|
||||||
} = useChildren(user);
|
} = useChildren(user);
|
||||||
|
|
||||||
|
const {data: childrenByParentId} = useGetChildrenByParentId()
|
||||||
|
|
||||||
const {
|
const {
|
||||||
caregivers,
|
caregivers,
|
||||||
caregiver,
|
caregiver,
|
||||||
@ -52,13 +53,11 @@ const Screen: React.FC = () => {
|
|||||||
// contact: "+381628334",
|
// contact: "+381628334",
|
||||||
// ...child
|
// ...child
|
||||||
// })
|
// })
|
||||||
await fetchChildren();
|
|
||||||
await fetchCaregivers();
|
await fetchCaregivers();
|
||||||
}
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (user) {
|
if (user) {
|
||||||
fetchChildren();
|
|
||||||
fetchCaregivers();
|
fetchCaregivers();
|
||||||
}
|
}
|
||||||
}, [user]);
|
}, [user]);
|
||||||
@ -126,9 +125,9 @@ const Screen: React.FC = () => {
|
|||||||
<View>
|
<View>
|
||||||
{user ? (
|
{user ? (
|
||||||
<View paddingH-20>
|
<View paddingH-20>
|
||||||
{profileType === "parent" && <Text>Parent</Text>}
|
{profileType === ProfileType.parent && <Text>Parent</Text>}
|
||||||
{profileType === "child" && <Text>Child</Text>}
|
{profileType === ProfileType.child && <Text>Child</Text>}
|
||||||
{profileType === "caregiver" && <Text>Caregiver</Text>}
|
{profileType === ProfileType.caregiver && <Text>Caregiver</Text>}
|
||||||
<Button title="Sign Out" onPress={handleSignOut}/>
|
<Button title="Sign Out" onPress={handleSignOut}/>
|
||||||
<TextField
|
<TextField
|
||||||
placeholder={"Child Name"}
|
placeholder={"Child Name"}
|
||||||
|
|||||||
@ -5,7 +5,7 @@ import {useRouter} from "expo-router";
|
|||||||
import firestore from "@react-native-firebase/firestore";
|
import firestore from "@react-native-firebase/firestore";
|
||||||
import {UserProfile} from "@/hooks/firebase/types/profileTypes";
|
import {UserProfile} from "@/hooks/firebase/types/profileTypes";
|
||||||
|
|
||||||
type ProfileType = "parent" | "child" | "caregiver" | null;
|
export enum ProfileType { "parent", "child", "caregiver" }
|
||||||
|
|
||||||
interface IAuthContext {
|
interface IAuthContext {
|
||||||
user: FirebaseAuthTypes.User | null,
|
user: FirebaseAuthTypes.User | null,
|
||||||
@ -28,6 +28,8 @@ export const AuthContextProvider: FC<{ children: ReactNode }> = ({children}) =>
|
|||||||
const onAuthStateChanged = async (user: FirebaseAuthTypes.User | null) => {
|
const onAuthStateChanged = async (user: FirebaseAuthTypes.User | null) => {
|
||||||
setUser(user);
|
setUser(user);
|
||||||
|
|
||||||
|
console.log(user)
|
||||||
|
|
||||||
if (user) {
|
if (user) {
|
||||||
try {
|
try {
|
||||||
const documentSnapshot = await firestore()
|
const documentSnapshot = await firestore()
|
||||||
@ -41,7 +43,7 @@ export const AuthContextProvider: FC<{ children: ReactNode }> = ({children}) =>
|
|||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error fetching user profile type:", error);
|
console.error("Error fetching user profile type:", error);
|
||||||
setProfileType(null);
|
setProfileType(undefined);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -3,6 +3,7 @@ import {useMutation} from "react-query";
|
|||||||
import auth from "@react-native-firebase/auth";
|
import auth from "@react-native-firebase/auth";
|
||||||
import firestore from "@react-native-firebase/firestore";
|
import firestore from "@react-native-firebase/firestore";
|
||||||
import {User,} from "./types/profileTypes";
|
import {User,} from "./types/profileTypes";
|
||||||
|
import {useSignUp} from "@/hooks/firebase/useSignUp";
|
||||||
|
|
||||||
type ProfileType = "parent" | "child" | "caregiver" | null;
|
type ProfileType = "parent" | "child" | "caregiver" | null;
|
||||||
|
|
||||||
@ -17,6 +18,8 @@ const useAuth = () => {
|
|||||||
auth().signInWithEmailAndPassword(email, password)
|
auth().signInWithEmailAndPassword(email, password)
|
||||||
);
|
);
|
||||||
const signOutMutation = useMutation(() => auth().signOut());
|
const signOutMutation = useMutation(() => auth().signOut());
|
||||||
|
const {mutateAsync: signUp } = useSignUp()
|
||||||
|
|
||||||
/*const setProfileDataMutation = useMutation((profileData) => {
|
/*const setProfileDataMutation = useMutation((profileData) => {
|
||||||
const currentUser = auth().currentUser;
|
const currentUser = auth().currentUser;
|
||||||
if (currentUser) {
|
if (currentUser) {
|
||||||
@ -35,11 +38,12 @@ const useAuth = () => {
|
|||||||
const handleRegister = async () => {
|
const handleRegister = async () => {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
await createUserMutation.mutateAsync();
|
await signUp({email, password})
|
||||||
|
// await createUserMutation.mutateAsync();
|
||||||
console.log("User registered!");
|
console.log("User registered!");
|
||||||
|
|
||||||
await signInMutation.mutateAsync();
|
// await signInMutation.mutateAsync();
|
||||||
console.log("User signed in!");
|
// console.log("User signed in!");
|
||||||
|
|
||||||
/*let profileData: ParentProfile | ChildProfile | CaregiverProfile;
|
/*let profileData: ParentProfile | ChildProfile | CaregiverProfile;
|
||||||
switch (profileType) {
|
switch (profileType) {
|
||||||
|
|||||||
@ -1,12 +1,23 @@
|
|||||||
import {useMutation} from "react-query";
|
import {useMutation, useQueryClient} from "react-query";
|
||||||
import {UserProfile} from "@/hooks/firebase/types/profileTypes";
|
import {UserProfile} from "@/hooks/firebase/types/profileTypes";
|
||||||
import functions from '@react-native-firebase/functions';
|
import functions from '@react-native-firebase/functions';
|
||||||
|
import {ProfileType, useAuthContext} from "@/contexts/AuthContext";
|
||||||
|
|
||||||
export const useCreateSubUser = () => {
|
export const useCreateSubUser = () => {
|
||||||
|
const queryClient = useQueryClient()
|
||||||
|
const { profileType } = useAuthContext()
|
||||||
|
|
||||||
return useMutation({
|
return useMutation({
|
||||||
mutationKey: ["createSubUser"],
|
mutationKey: ["createSubUser"],
|
||||||
mutationFn: async ({email, password, ...userProfile}: { email: string, password: string } & UserProfile) => {
|
mutationFn: async ({email, password, ...userProfile}: { email: string, password: string } & UserProfile) => {
|
||||||
|
if(profileType === ProfileType.parent) {
|
||||||
return await functions().httpsCallable("createSubUser")({email, password, ...userProfile})
|
return await functions().httpsCallable("createSubUser")({email, password, ...userProfile})
|
||||||
|
} else {
|
||||||
|
throw Error("Can't create sub-users as a non-parent.")
|
||||||
|
}
|
||||||
|
},
|
||||||
|
onSuccess: () => {
|
||||||
|
queryClient.invalidateQueries({queryKey: ["getChildrenByParentId"]})
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
34
hooks/firebase/useGetChildrenByParentId.ts
Normal file
34
hooks/firebase/useGetChildrenByParentId.ts
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
import {useQuery} from "react-query";
|
||||||
|
import {ChildProfile} from "@/hooks/firebase/types/profileTypes";
|
||||||
|
import firestore from "@react-native-firebase/firestore";
|
||||||
|
import {useAuthContext} from "@/contexts/AuthContext";
|
||||||
|
|
||||||
|
export const useGetChildrenByParentId = () => {
|
||||||
|
const {user} = useAuthContext()
|
||||||
|
|
||||||
|
return useQuery({
|
||||||
|
queryKey: ["getChildrenByParentId", user?.uid],
|
||||||
|
queryFn: async (): Promise<ChildProfile[]> => {
|
||||||
|
try {
|
||||||
|
const snapshot = await firestore()
|
||||||
|
.collection("Profiles")
|
||||||
|
.where("userType", "==", "child")
|
||||||
|
.where("parentId", "==", user?.uid!)
|
||||||
|
.get();
|
||||||
|
|
||||||
|
return snapshot.docs.map((doc) => {
|
||||||
|
const data = doc.data();
|
||||||
|
return {
|
||||||
|
...data,
|
||||||
|
birthday: data.birthday.toDate(),
|
||||||
|
} as ChildProfile;
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error retrieving child users:", error);
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
},
|
||||||
|
enabled: !!user?.uid
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
@ -1,11 +1,15 @@
|
|||||||
import {useMutation} from "react-query";
|
import {useMutation} from "react-query";
|
||||||
import auth from "@react-native-firebase/auth";
|
import auth from "@react-native-firebase/auth";
|
||||||
|
import {useUpdateUserData} from "@/hooks/firebase/useUpdateUserData";
|
||||||
|
|
||||||
export const useSignUp = () => {
|
export const useSignUp = () => {
|
||||||
|
const { mutateAsync: updateUserData } = useUpdateUserData()
|
||||||
|
|
||||||
return useMutation({
|
return useMutation({
|
||||||
mutationKey: ["signUp"],
|
mutationKey: ["signUp"],
|
||||||
mutationFn: async ({email, password}: { email: string, password: string }) => {
|
mutationFn: async ({email, password}: { email: string, password: string }) => {
|
||||||
await auth().createUserWithEmailAndPassword(email, password)
|
await auth().createUserWithEmailAndPassword(email, password)
|
||||||
|
await updateUserData({userType: "parent", email, password})
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user