gib/Wavelength
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Login now works. User is created in database as well

Browse Source
This commit is contained in:
Gabriel Brown
2024-10-10 03:50:09 -05:00
parent 6e01a31e76
commit 00e0bcd929
6 changed files with 102 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
components/auth/SignInScreen.tsx
View File

@ -35,44 +35,82 @@ export default function SignInScreen({ onSignIn }: { onSignIn: () => void }) {
projectId: projectId
});
console.log(credential.user, credential.email, credential.fullName, credential.fullName?.givenName, credential.fullName?.familyName, pushToken);
console.log(credential.user, credential.email, credential.fullName?.givenName, credential.fullName?.familyName, pushToken);
const response = await fetch(`${process.env.EXPO_PUBLIC_API_URL}/users/createUser`, {
method: 'POST',
const checkUserResponse = await
fetch(`${process.env.EXPO_PUBLIC_API_URL}/users/getUserByAppleId?appleId=${credential.user}`, {
method: 'GET',
headers: {
'Content-Type': 'application/json',
'x-api-key': process.env.EXPO_PUBLIC_API_KEY ?? '',
},
body: JSON.stringify({
appleId: credential.user,
appleEmail: credential.email,
fullName: `${credential.fullName?.givenName} ${credential.fullName?.familyName}`,
pushToken: pushToken.data,
}),
});
if (!response.ok) {
throw new Error('Failed to create user');
if (checkUserResponse.status === 404) {
if (!credential.user || !credential.email || !credential.fullName?.givenName
|| !credential.fullName?.familyName) {
Alert.alert('Sign In Error', 'Unable to create account. Please try again or contact support.');
throw new Error('Incomplete user data for new account creation');
}
const response = await fetch(`${process.env.EXPO_PUBLIC_API_URL}/users/createUser`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'x-api-key': process.env.EXPO_PUBLIC_API_KEY ?? '',
},
body: JSON.stringify({
appleId: credential.user,
appleEmail: credential.email,
fullName: `${credential.fullName?.givenName} ${credential.fullName?.familyName}`,
pushToken: pushToken.data,
}),
});
if (!response.ok) {
const errorBody = await response.text();
console.error('API Error:', response.status, errorBody);
throw new Error(`Failed to create user: ${response.status} ${errorBody}`);
}
const userData = await response.json();
await saveUserData(userData);
} else if (checkUserResponse.ok) {
const userData = await checkUserResponse.json();
console.log('Existing user found:', JSON.stringify(userData));
// check if push token should be updated
if (userData.pushToken !== pushToken.data) {
const updatePushTokenResponse =
await fetch(`${process.env.EXPO_PUBLIC_API_URL}/users/updatePushTokenByAppleId`, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'x-api-key': process.env.EXPO_PUBLIC_API_KEY ?? '',
},
body: JSON.stringify({
appleId: credential.user,
pushToken: pushToken.data,
}),
});
if (!updatePushTokenResponse.ok) {
throw new Error('Failed to update push token');
}
} else {
console.log('Push token is up to date');
}
userData.pushToken = pushToken.data;
await saveUserData(userData);
}
const userData = await response.json();
await saveUserData(userData);
onSignIn();
} catch (error) {
console.error('Error signing in:', error);
if (error.code === 'ERR_REQUEST_CANCELLED') {
// Handle when user cancels sign in
console.error('User canceled sign in', error);
Alert.alert('An error occurred', 'User canceled sign in');
Alert.alert('Sign In Cancelled', 'It seems like you canceled the sign in process.');
} else {
console.error('An unknown error occurred', error);
Alert.alert('Unknown error', 'An unknown error occurred');
Alert.alert('Sign In Error', 'An error occurred while signing in. Please try again or contact support.');
}
}
};
return (
<ThemedView style={styles.container}>
<AppleAuthentication.AppleAuthenticationButton