kjannette/ax3Client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #61 from kjannette/trini

Browse Source 
Trini
This commit is contained in:
S Jannette
2024-01-30 11:40:57 -06:00
committed by GitHub
parent acb1daece6 173f214621
commit 3e6026069a
2 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Components/Login/Login.js
View File

@@ -26,10 +26,10 @@ const Login = () => {
email, email,
password password
); );
// Signed in // Signed in
userCredential?.user && navigate("/dashboard"); userCredential?.user && navigate("/dashboard");
} catch (error) { } catch (error) {
console.log("error", error);
if ( if (
["auth/invalid-login-credentials", "auth/invalid-email"].includes( ["auth/invalid-login-credentials", "auth/invalid-email"].includes(
error.code error.code

67
src/Components/SignupPage/SignupPage.js
View File

@@ -146,7 +146,7 @@ const SignupPage = () => {
} }
} }
async function saveUserData(authId, dataValues) { async function saveUserData(authId, dataValues, customerId, subscriptionId) {
const appUserId = uuidv4(); const appUserId = uuidv4();
const firmId = uuidv4(); const firmId = uuidv4();
const fbAuthUid = authId; const fbAuthUid = authId;
@@ -167,10 +167,11 @@ const SignupPage = () => {
practiceArea, practiceArea,
email, email,
} = dataValues; } = dataValues;
console.log(
const subscriptionId = dataValues?.subscriptionId; "customerId, subscriptionId in saveUserData",
const customerId = dataValues?.customerId; customerId,
subscriptionId
);
const userData = { const userData = {
docsAllowed, docsAllowed,
docsGenerated, docsGenerated,
@@ -188,8 +189,8 @@ const SignupPage = () => {
barNumber, barNumber,
practiceArea, practiceArea,
email, email,
//subscriptionId, customerId: customerId,
//customerId, subscriptionId: subscriptionId,
}; };
try { try {
@@ -241,7 +242,6 @@ const SignupPage = () => {
// ******************** STRIPE PAY API CALL ******************** // // ******************** STRIPE PAY API CALL ******************** //
async function handleStripeAuthorization( async function handleStripeAuthorization(
user,
paymentDataValues, paymentDataValues,
customerDataValues customerDataValues
) { ) {
@@ -267,7 +267,7 @@ const SignupPage = () => {
const type = selectedPlan[0].value ? selectedPlan[0].value : null; const type = selectedPlan[0].value ? selectedPlan[0].value : null;
try { try {
let response = await fetch(`${apiUrl}/create-subscription`, { const response = await fetch(`${apiUrl}/create-subscription`, {
method: "POST", method: "POST",
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
@@ -284,14 +284,14 @@ const SignupPage = () => {
}), }),
}); });
response = await response.json(); const data = await response.json();
subscriptionId = response.subscriptionId; console.log("data in stripe auth call -------------++++++++++++++", data);
customerId = response.customerId; //subscriptionId = response.subscriptionId;
//customerId = response.customerId;
return { return {
subscriptionId, data,
//customerId,
}; };
} catch (error) { } catch (error) {
console.log(error); console.log(error);
@@ -326,31 +326,34 @@ const SignupPage = () => {
setIsBusy(true); setIsBusy(true);
if (paymentDataValues && dataValues) { if (paymentDataValues && dataValues) {
try { try {
const userCredential = await createUserWithEmailAndPassword( const data = await handleStripeAuthorization(
auth,
dataValues.email,
dataValues.password
);
const user = userCredential.user;
const paymentResponse = await handleStripeAuthorization(
user,
paymentDataValues, paymentDataValues,
dataValues dataValues
); );
console.log( console.log("----------------------------->>>>>>>>>>>>>>>>>data", data);
"----------------------------->>>>>>>>>>>>>>>>>paymentResponse", const customerId = data.data.customerId;
paymentResponse const subscriptionId = data.data.subscriptionId;
);
if (paymentResponse === false) { if (data === undefined) {
setIsBusy(false); setIsBusy(false);
setNotice("Sorry, something went wrong. Please try again."); setNotice("Sorry, something went wrong. Please try again.");
return; return;
} else { } else {
dataValues = { ...dataValues, ...paymentResponse }; const userCredential = await createUserWithEmailAndPassword(
await saveUserData(user.uid, dataValues); auth,
navigate("/"); dataValues.email,
dataValues.password
);
const user = userCredential.user;
dataValues = { ...dataValues, ...data };
console.log(
"customerId, subscriptionId in handleSignup right before saveUserData",
customerId,
subscriptionId
);
await saveUserData(user.uid, dataValues, customerId, subscriptionId);
navigate("/dashboard");
} }
} catch (error) { } catch (error) {
setIsBusy(false); setIsBusy(false);