diff --git a/src/components/AuthPages/SignUp/VerifySignup/index.jsx b/src/components/AuthPages/SignUp/VerifySignup/index.jsx index 32341e9..61915d1 100644 --- a/src/components/AuthPages/SignUp/VerifySignup/index.jsx +++ b/src/components/AuthPages/SignUp/VerifySignup/index.jsx @@ -1,5 +1,4 @@ import React, {useState} from "react"; -// import titleShape from "../../../../assets/images/shape/text-shape-three.svg"; import titleShape from "../../../../assets/images/shape/title_shape_3.svg"; import AuthLayout from "../../AuthLayout"; import Otp from "./Otp"; @@ -68,18 +67,14 @@ export default function VerifyYou() { } let apiInput = { - username: 'anumuduchukwuebuka@gmail.com', - pend_uid: 'ec497517-ddb5-4830-a2c4-b7e2a68627de', + username: localStorage.getItem('username'), + pend_uid: localStorage.getItem('uuid'), random_text: otpCode, mode: 'VERIFY', - // loc: 'Desktop', - // sessionid: 'ec497517-ddb5-4830-a2c4-b7e2a68627de', - // code: otpCode, } try { - const res = await verifyOTP.signupOTPVerify(apiInput); - console.log(res) + const res = await verifyOTP.signupUser(apiInput) if(res.status != 200){ setLoading(false) setErrorMessage({ @@ -88,15 +83,33 @@ export default function VerifyYou() { }) return } - // if status code is 200 proceed - setErrorMessage({ - success: true, - message: 'verification successfully' - }) - setTimeout(()=>{ - setLoading(false) - navigate('/complete-signup', { replace: true }) - }, 1000) + + if(res.status == 200){ + if(res.data.status < 0) { // when resquest is successful but status is not 100 + setLoading(false) + setErrorMessage({ + success: false, + message: res.data.error_msg + }) + return + } + + // if request is successful and status is 100 proceed + setErrorMessage({ + success: true, + message: 'verification successfully' + }) + + //clears the temporary uuid and email in tge local storage + localStorage.removeItem('uuid') + localStorage.removeItem('username') + + setTimeout(()=>{ + setLoading(false) + navigate('/complete-signup', { replace: true }) + }, 1000) + } + } catch (error) { setLoading(false) setErrorMessage({ diff --git a/src/components/AuthPages/SignUp/index.jsx b/src/components/AuthPages/SignUp/index.jsx index af9c4ca..3f0cc31 100755 --- a/src/components/AuthPages/SignUp/index.jsx +++ b/src/components/AuthPages/SignUp/index.jsx @@ -102,7 +102,7 @@ export default function SignUp() { try { const res = await userSignup.signupUser(userInfo); - if(res.status != 200 || res.data.status < 1){ + if(res.status != 200){ setLoading(false) setErrorMessage({ success: false, @@ -110,15 +110,31 @@ export default function SignUp() { }) return } - // if status code is 200 proceed - setErrorMessage({ - success: true, - message: 'Account created successfully' - }) - setTimeout(()=>{ - setLoading(false) - navigate("/verify-signup", { replace: true }) - }, 1000) + + if(res.status == 200){ + if(res.data.status < 0) { // when resquest is successful but status is not 1 + setLoading(false) + setErrorMessage({ + success: false, + message: 'unable to create account' + }) + return + } + + // if request is successful and status is 1 proceed + setErrorMessage({ + success: true, + message: 'Account created successfully' + }) + + localStorage.setItem('uuid', res.data.uuid) // Stores the user UUID to localstorage + localStorage.setItem('username', email) // Stores the user UUID to localstorage + + setTimeout(()=>{ + setLoading(false) + navigate("/verify-signup", { replace: true }) + }, 1000) + } } catch (error) { setLoading(false) setErrorMessage({ diff --git a/src/services/UsersService.js b/src/services/UsersService.js index 624cf5d..e517681 100644 --- a/src/services/UsersService.js +++ b/src/services/UsersService.js @@ -25,11 +25,6 @@ class usersService { return this.postAuxEnd("/account", reqData); } - //SIGNUP OTP VERIFICATION AUTH - signupOTPVerify(reqData){ - return this.postAuxEnd("/signup-code", reqData); - } - getUserReminders(){ var reqData = { member_id: localStorage.getItem("member_id")