diff --git a/src/app/actions/action.ts b/src/app/actions/action.ts index d38bf5b..a4967e7 100644 --- a/src/app/actions/action.ts +++ b/src/app/actions/action.ts @@ -23,8 +23,6 @@ export async function getUserData() { } }); - console.log(response); - if (response.ok) { return await response.json(); } else { @@ -46,12 +44,12 @@ export async function getUserFilesInfo() { msg_id: 20005, message_body: { action: 'user_files_info', - token: token } }), headers: { '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, message_body: { action: 'get', - user_token: token, tariff_term: tariffTerm } }), headers: { '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() { + const token = await getSessionData('token'); try { const response = await fetch(`${API_BASE_URL}/api/v1/data`, { @@ -124,7 +123,8 @@ export async function fetchTokensBundle() { }), headers: { '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() { + const token = await getSessionData('token'); try { const response = await fetch(`${API_BASE_URL}/check/api/build`, { @@ -152,6 +153,7 @@ export async function getBuildData() { headers: { 'Content-Type': 'application/json', 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); diff --git a/src/app/actions/auth.ts b/src/app/actions/auth.ts index 61e26b5..106ef86 100644 --- a/src/app/actions/auth.ts +++ b/src/app/actions/auth.ts @@ -89,6 +89,8 @@ export async function authorization( }); if (response.ok) { let parsed = await response.json(); + console.log('login'); + console.log(parsed); if (parsed.message_code === 0) { await createSession(parsed.message_body.token, email); } else { diff --git a/src/app/actions/fileUpload.ts b/src/app/actions/fileUpload.ts index 88e8d75..1af9094 100644 --- a/src/app/actions/fileUpload.ts +++ b/src/app/actions/fileUpload.ts @@ -66,6 +66,8 @@ export async function fileUpload(messageBody: initMessageBody, convertTo?: strin } export async function cancelUpload(udloadId: string) { + const token = await getSessionData('token'); + try { const response = await fetch(`${API_BASE_URL}/api/v1/data`, { method: 'POST', @@ -79,7 +81,8 @@ export async function cancelUpload(udloadId: string) { }), headers: { '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) { + const token = await getSessionData('token'); + try { const response = await fetch(`${API_BASE_URL}/api/v1/data`, { method: 'POST', @@ -183,7 +188,8 @@ export async function checkChunkStatus(upload_id: string) { }), headers: { '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) { + const token = await getSessionData('token'); + try { const response = await fetch(`${API_BASE_URL}/api/v1/data`, { method: 'POST', @@ -218,7 +226,8 @@ export async function getAllowedFilesExtensions(type: string) { }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); diff --git a/src/app/actions/referralsActions.ts b/src/app/actions/referralsActions.ts index 3e0335b..bccee95 100644 --- a/src/app/actions/referralsActions.ts +++ b/src/app/actions/referralsActions.ts @@ -359,8 +359,8 @@ export async function createPayoutRequest( const response = await fetch(`${API_BASE_URL}/api/payouts/create-request`, { method: 'POST', body: JSON.stringify({ - "amount": amount, - "payoutMethodId": payoutMethodId + 'amount': amount, + 'payoutMethodId': payoutMethodId }), headers: { 'Content-Type': 'application/json', diff --git a/src/app/actions/searchActions.ts b/src/app/actions/searchActions.ts index 959f1e2..ce66a51 100644 --- a/src/app/actions/searchActions.ts +++ b/src/app/actions/searchActions.ts @@ -43,8 +43,6 @@ export async function searchUserFiles(fileId: string) { export async function searchGlobalFiles(fileId: string, currentPage: number) { const token = await getSessionData('token'); - //удалить когда поиск будет нормально работать - try { const response = await fetch(`${API_BASE_URL}/api/v1/data`, { method: 'POST', @@ -59,7 +57,8 @@ export async function searchGlobalFiles(fileId: string, currentPage: number) { }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -115,6 +114,7 @@ export async function getSearchStats() { if (response.ok) { let parsed = await response.json(); + return parsed; } else { return null; diff --git a/src/app/actions/trackingActions.ts b/src/app/actions/trackingActions.ts index 533142c..46be0ea 100644 --- a/src/app/actions/trackingActions.ts +++ b/src/app/actions/trackingActions.ts @@ -250,9 +250,14 @@ export async function fetchTrackingStats() { } export async function downloadTrackingFile(fileId: string, fileName?: string) { + const token = await getSessionData('token'); + try { const response = await fetch(`${API_BASE_URL}/api/v1/files/public-download/${fileId}`, { - method: 'GET' + method: 'GET', + headers: { + 'Authorization': `Bearer ${token}` + } }); if (!response.ok) { diff --git a/src/app/ui/forms/register-form.tsx b/src/app/ui/forms/register-form.tsx index 5e79bad..7db04d4 100644 --- a/src/app/ui/forms/register-form.tsx +++ b/src/app/ui/forms/register-form.tsx @@ -256,9 +256,12 @@ export default function RegisterForm() { { setShowMailConfirmWindow(false) }} /> )} -
{ - formAction(e); - }}> + { + formAction(e); + }} + autoComplete="off" + >