Merge branch 'dev' into 'staging'

--

See merge request frontend/marketplace!106

src/pages/QuizPayment/QuizPayment.tsx

@@ -2,8 +2,8 @@ import { useEffect, useState } from "react"
 import axios, { AxiosResponse } from "axios"
 import { ApologyPage } from "../ApologyPage"
 import { useNavigate } from "react-router-dom"
-import { clearAuthToken, getMessageFromFetchError, setAuthToken, useUserFetcher } from "@frontend/kitui";
+import { clearAuthToken, getMessageFromFetchError, setAuthToken, useUserAccountFetcher, useUserFetcher } from "@frontend/kitui";
-import { clearUserData, setUser, useUserStore } from "@root/stores/user";
+import { clearUserData, setUser, setUserAccount, useUserStore } from "@root/stores/user";
 
 
 function refresh(token: string) {
@@ -20,12 +20,12 @@ const params = new URLSearchParams(window.location.search)
 const action = params.get("action")
 const dif = params.get("dif")
 const token = params.get("data")
+const userId = params.get("userid")
 
 let first = true
 
 export default function QuizPayment() {
 	const navigate = useNavigate()
-	const userId = useUserStore((state) => state.userId)
 	const [message, setMessage] = useState("Идёт загрузка")
 
 	console.log("Я начал работать")
@@ -35,14 +35,20 @@ export default function QuizPayment() {
 		if (action && dif && token) {
 			(async () => {
 				try {
-					const data = await refresh(token)
+					// const data = await refresh(token)
-					console.log(data.data.accessToken)
+					console.log(token)
-					setAuthToken(data.data.accessToken)
+					setAuthToken(token)
+					// setAuthToken(data.data.accessToken)
+					console.log("делаем юзера")
 
-					useUserFetcher({
+					useUserAccountFetcher({
-						url: process.env.REACT_APP_DOMAIN + `/user/${userId}`,
+						url: process.env.REACT_APP_DOMAIN + "/customer/account",
 						userId,
-						onNewUser: setUser,
+						onNewUserAccount: (user) => {
+							setUserAccount(user)
+							navigate(`/payment?action=${action}&dif=${dif}`, { replace: true })
+
+						},
 						onError: (error) => {
 							const errorMessage = getMessageFromFetchError(error)
 							if (errorMessage) {
@@ -52,21 +58,17 @@ export default function QuizPayment() {
 						},
 					})
 
-					navigate(`/payment?action=${action}&dif=${dif}`, { replace: true })
 					return
 
 				} catch (e) {
 					setMessage("Произошла ошибка")
 				}
 			})()
-
+		}
-		} else {
-
 		var link = document.createElement("a");
 		link.href = "https://quiz.pena.digitaltariffs";
 		document.body.appendChild(link);
 		link.click();
-		}
 
 	}