From dbb12311b4845b9ba5dbcfacc8fc433f6959b9b5 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Mon, 29 Jan 2024 21:29:49 -0600 Subject: [PATCH 1/3] more --- src/Components/SignupPage/SignupPage.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index 2df11ae..9c80144 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -267,7 +267,7 @@ const SignupPage = () => { const type = selectedPlan[0].value ? selectedPlan[0].value : null; try { - let response = await fetch(`${apiUrl}/create-subscription`, { + const response = await fetch(`${apiUrl}/create-subscription`, { method: "POST", headers: { "Content-Type": "application/json", @@ -284,14 +284,14 @@ const SignupPage = () => { }), }); - response = await response.json(); + const data = await response.json(); - subscriptionId = response.subscriptionId; - customerId = response.customerId; + console.log("data in stripe auth call -------------++++++++++++++", data); + //subscriptionId = response.subscriptionId; + //customerId = response.customerId; return { - subscriptionId, - //customerId, + data, }; } catch (error) { console.log(error); From 3b19b67fefb2a27ecb2d52b5d910a0970186d55a Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Tue, 30 Jan 2024 11:16:46 -0600 Subject: [PATCH 2/3] more --- src/Components/Login/Login.js | 2 +- src/Components/SignupPage/SignupPage.js | 28 +++++++++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/Components/Login/Login.js b/src/Components/Login/Login.js index 9a290e0..7a061e1 100644 --- a/src/Components/Login/Login.js +++ b/src/Components/Login/Login.js @@ -26,10 +26,10 @@ const Login = () => { email, password ); - // Signed in userCredential?.user && navigate("/dashboard"); } catch (error) { + console.log("error", error); if ( ["auth/invalid-login-credentials", "auth/invalid-email"].includes( error.code diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index 9c80144..f1d7f62 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -241,7 +241,6 @@ const SignupPage = () => { // ******************** STRIPE PAY API CALL ******************** // async function handleStripeAuthorization( - user, paymentDataValues, customerDataValues ) { @@ -326,16 +325,7 @@ const SignupPage = () => { setIsBusy(true); if (paymentDataValues && dataValues) { try { - const userCredential = await createUserWithEmailAndPassword( - auth, - dataValues.email, - dataValues.password - ); - - const user = userCredential.user; - const paymentResponse = await handleStripeAuthorization( - user, paymentDataValues, dataValues ); @@ -343,14 +333,30 @@ const SignupPage = () => { "----------------------------->>>>>>>>>>>>>>>>>paymentResponse", paymentResponse ); + const customerId = data.customerId; + const subscriptionId = data.subscriptionId; + if (paymentResponse === false) { setIsBusy(false); setNotice("Sorry, something went wrong. Please try again."); return; } else { + const userCredential = await createUserWithEmailAndPassword( + auth, + dataValues.email, + dataValues.password + ); + + const user = userCredential.user; dataValues = { ...dataValues, ...paymentResponse }; + if (subscriptionId) { + dataValues.subscriptionId = subscriptionId; + } + if (customerId) { + dataValues.customerId = customerId; + } await saveUserData(user.uid, dataValues); - navigate("/"); + navigate("/dashboard"); } } catch (error) { setIsBusy(false); From 173f21462162ea75839825b2af087aa1ca0553a1 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Tue, 30 Jan 2024 11:40:03 -0600 Subject: [PATCH 3/3] more --- src/Components/SignupPage/SignupPage.js | 43 ++++++++++++------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index f1d7f62..c27f5fe 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -146,7 +146,7 @@ const SignupPage = () => { } } - async function saveUserData(authId, dataValues) { + async function saveUserData(authId, dataValues, customerId, subscriptionId) { const appUserId = uuidv4(); const firmId = uuidv4(); const fbAuthUid = authId; @@ -167,10 +167,11 @@ const SignupPage = () => { practiceArea, email, } = dataValues; - - const subscriptionId = dataValues?.subscriptionId; - const customerId = dataValues?.customerId; - + console.log( + "customerId, subscriptionId in saveUserData", + customerId, + subscriptionId + ); const userData = { docsAllowed, docsGenerated, @@ -188,8 +189,8 @@ const SignupPage = () => { barNumber, practiceArea, email, - //subscriptionId, - //customerId, + customerId: customerId, + subscriptionId: subscriptionId, }; try { @@ -325,18 +326,15 @@ const SignupPage = () => { setIsBusy(true); if (paymentDataValues && dataValues) { try { - const paymentResponse = await handleStripeAuthorization( + const data = await handleStripeAuthorization( paymentDataValues, dataValues ); - console.log( - "----------------------------->>>>>>>>>>>>>>>>>paymentResponse", - paymentResponse - ); - const customerId = data.customerId; - const subscriptionId = data.subscriptionId; + console.log("----------------------------->>>>>>>>>>>>>>>>>data", data); + const customerId = data.data.customerId; + const subscriptionId = data.data.subscriptionId; - if (paymentResponse === false) { + if (data === undefined) { setIsBusy(false); setNotice("Sorry, something went wrong. Please try again."); return; @@ -348,14 +346,13 @@ const SignupPage = () => { ); const user = userCredential.user; - dataValues = { ...dataValues, ...paymentResponse }; - if (subscriptionId) { - dataValues.subscriptionId = subscriptionId; - } - if (customerId) { - dataValues.customerId = customerId; - } - await saveUserData(user.uid, dataValues); + 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) {