NCBACK-168 #7

Merged
frontdev merged 4 commits from NCBACK-168 into main 2026-06-03 13:23:47 +08:00
7 changed files with 42 additions and 19 deletions
Showing only changes of commit 7d0fb265d4 - Show all commits
+9 -7
View File
@@ -23,8 +23,6 @@ export async function getUserData() {
} }
}); });
console.log(response);
if (response.ok) { if (response.ok) {
return await response.json(); return await response.json();
} else { } else {
@@ -46,12 +44,12 @@ export async function getUserFilesInfo() {
msg_id: 20005, msg_id: 20005,
message_body: { message_body: {
action: 'user_files_info', action: 'user_files_info',
token: token
} }
}), }),
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Accept': 'application/json' 'Accept': 'application/json',
'Authorization': `Bearer ${token}`
} }
}); });
@@ -83,13 +81,13 @@ export async function fetchTariffs(tariffTerm: 'MONTHLY' | 'YEAR') {
msg_id: 30001, msg_id: 30001,
message_body: { message_body: {
action: 'get', action: 'get',
user_token: token,
tariff_term: tariffTerm tariff_term: tariffTerm
} }
}), }),
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Accept': 'application/json' 'Accept': 'application/json',
'Authorization': `Bearer ${token}`
} }
}); });
@@ -110,6 +108,7 @@ export async function fetchTariffs(tariffTerm: 'MONTHLY' | 'YEAR') {
} }
export async function fetchTokensBundle() { export async function fetchTokensBundle() {
const token = await getSessionData('token');
try { try {
const response = await fetch(`${API_BASE_URL}/api/v1/data`, { const response = await fetch(`${API_BASE_URL}/api/v1/data`, {
@@ -124,7 +123,8 @@ export async function fetchTokensBundle() {
}), }),
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Accept': 'application/json' 'Accept': 'application/json',
'Authorization': `Bearer ${token}`
} }
}); });
@@ -145,6 +145,7 @@ export async function fetchTokensBundle() {
} }
export async function getBuildData() { export async function getBuildData() {
const token = await getSessionData('token');
try { try {
const response = await fetch(`${API_BASE_URL}/check/api/build`, { const response = await fetch(`${API_BASE_URL}/check/api/build`, {
@@ -152,6 +153,7 @@ export async function getBuildData() {
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Accept': 'application/json', 'Accept': 'application/json',
'Authorization': `Bearer ${token}`
} }
}); });
+2
View File
@@ -89,6 +89,8 @@ export async function authorization(
}); });
if (response.ok) { if (response.ok) {
let parsed = await response.json(); let parsed = await response.json();
console.log('login');
console.log(parsed);
if (parsed.message_code === 0) { if (parsed.message_code === 0) {
await createSession(parsed.message_body.token, email); await createSession(parsed.message_body.token, email);
} else { } else {
+12 -3
View File
@@ -66,6 +66,8 @@ export async function fileUpload(messageBody: initMessageBody, convertTo?: strin
} }
export async function cancelUpload(udloadId: string) { export async function cancelUpload(udloadId: string) {
const token = await getSessionData('token');
try { try {
const response = await fetch(`${API_BASE_URL}/api/v1/data`, { const response = await fetch(`${API_BASE_URL}/api/v1/data`, {
method: 'POST', method: 'POST',
@@ -79,7 +81,8 @@ export async function cancelUpload(udloadId: string) {
}), }),
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Accept': 'application/json' 'Accept': 'application/json',
'Authorization': `Bearer ${token}`
} }
}); });
@@ -170,6 +173,8 @@ export async function chunkUpload(formData: FormData, itPrivate?: boolean): Prom
} }
export async function checkChunkStatus(upload_id: string) { export async function checkChunkStatus(upload_id: string) {
const token = await getSessionData('token');
try { try {
const response = await fetch(`${API_BASE_URL}/api/v1/data`, { const response = await fetch(`${API_BASE_URL}/api/v1/data`, {
method: 'POST', method: 'POST',
@@ -183,7 +188,8 @@ export async function checkChunkStatus(upload_id: string) {
}), }),
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Accept': 'application/json' 'Accept': 'application/json',
'Authorization': `Bearer ${token}`
} }
}); });
@@ -205,6 +211,8 @@ export async function checkChunkStatus(upload_id: string) {
} }
export async function getAllowedFilesExtensions(type: string) { export async function getAllowedFilesExtensions(type: string) {
const token = await getSessionData('token');
try { try {
const response = await fetch(`${API_BASE_URL}/api/v1/data`, { const response = await fetch(`${API_BASE_URL}/api/v1/data`, {
method: 'POST', method: 'POST',
@@ -218,7 +226,8 @@ export async function getAllowedFilesExtensions(type: string) {
}), }),
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Accept': 'application/json' 'Accept': 'application/json',
'Authorization': `Bearer ${token}`
} }
}); });
+2 -2
View File
@@ -359,8 +359,8 @@ export async function createPayoutRequest(
const response = await fetch(`${API_BASE_URL}/api/payouts/create-request`, { const response = await fetch(`${API_BASE_URL}/api/payouts/create-request`, {
method: 'POST', method: 'POST',
body: JSON.stringify({ body: JSON.stringify({
"amount": amount, 'amount': amount,
"payoutMethodId": payoutMethodId 'payoutMethodId': payoutMethodId
}), }),
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
+3 -3
View File
@@ -43,8 +43,6 @@ export async function searchUserFiles(fileId: string) {
export async function searchGlobalFiles(fileId: string, currentPage: number) { export async function searchGlobalFiles(fileId: string, currentPage: number) {
const token = await getSessionData('token'); const token = await getSessionData('token');
//удалить когда поиск будет нормально работать
try { try {
const response = await fetch(`${API_BASE_URL}/api/v1/data`, { const response = await fetch(`${API_BASE_URL}/api/v1/data`, {
method: 'POST', method: 'POST',
@@ -59,7 +57,8 @@ export async function searchGlobalFiles(fileId: string, currentPage: number) {
}), }),
headers: { headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'Accept': 'application/json' 'Accept': 'application/json',
'Authorization': `Bearer ${token}`
} }
}); });
@@ -115,6 +114,7 @@ export async function getSearchStats() {
if (response.ok) { if (response.ok) {
let parsed = await response.json(); let parsed = await response.json();
return parsed; return parsed;
} else { } else {
return null; return null;
+6 -1
View File
@@ -250,9 +250,14 @@ export async function fetchTrackingStats() {
} }
export async function downloadTrackingFile(fileId: string, fileName?: string) { export async function downloadTrackingFile(fileId: string, fileName?: string) {
const token = await getSessionData('token');
try { try {
const response = await fetch(`${API_BASE_URL}/api/v1/files/public-download/${fileId}`, { const response = await fetch(`${API_BASE_URL}/api/v1/files/public-download/${fileId}`, {
method: 'GET' method: 'GET',
headers: {
'Authorization': `Bearer ${token}`
}
}); });
if (!response.ok) { if (!response.ok) {
+7 -2
View File
@@ -256,9 +256,12 @@ export default function RegisterForm() {
<ConfirmMailModalWindow userId={state?.userId} email={formState?.previousState?.email} onClose={() => { setShowMailConfirmWindow(false) }} /> <ConfirmMailModalWindow userId={state?.userId} email={formState?.previousState?.email} onClose={() => { setShowMailConfirmWindow(false) }} />
</div> </div>
)} )}
<form action={(e) => { <form
action={(e) => {
formAction(e); formAction(e);
}}> }}
autoComplete="off"
>
<div className={`${styles['form-switcher']}`}> <div className={`${styles['form-switcher']}`}>
<button <button
className={`${styles['form-switcher-button']} ${accountType === 'b2c' ? styles['active'] : ''}`} className={`${styles['form-switcher-button']} ${accountType === 'b2c' ? styles['active'] : ''}`}
@@ -432,6 +435,7 @@ export default function RegisterForm() {
e.target.value = e.target.value.toLocaleLowerCase(); e.target.value = e.target.value.toLocaleLowerCase();
onChangeHandler(e) onChangeHandler(e)
}} }}
autoComplete="off"
/> />
{formState?.error?.email && ( {formState?.error?.email && (
<p className="text-sm text-red-500"> <p className="text-sm text-red-500">
@@ -486,6 +490,7 @@ export default function RegisterForm() {
placeholder={t('password-placeholder')} placeholder={t('password-placeholder')}
defaultValue={formState?.previousState?.password ? formState?.previousState?.password : ''} defaultValue={formState?.previousState?.password ? formState?.previousState?.password : ''}
onChange={onChangeHandler} onChange={onChangeHandler}
autoComplete="off"
/> />
<button <button
onClick={() => { onClick={() => {