From 743db57bb3b0e05a797ac82dab5f09b25fe92782 Mon Sep 17 00:00:00 2001 From: smanylov Date: Mon, 1 Jun 2026 14:48:13 +0700 Subject: [PATCH 1/4] refactor tokens --- src/app/actions/action.ts | 4 +- src/app/actions/auth.ts | 17 ++++---- src/app/actions/companyActions.ts | 12 +----- src/app/actions/fileEntity.ts | 18 ++++---- src/app/actions/fileUpload.ts | 25 ++++++----- src/app/actions/monitoringActions.ts | 26 +++++------- src/app/actions/notificationActions.ts | 19 ++++----- src/app/actions/referralsActions.ts | 23 ++++------- src/app/actions/searchActions.ts | 7 +++- src/app/actions/trackingActions.ts | 24 +++++------ src/app/actions/violationActions.ts | 57 ++++++++++++-------------- 11 files changed, 105 insertions(+), 127 deletions(-) diff --git a/src/app/actions/action.ts b/src/app/actions/action.ts index 75f6f3a..d38bf5b 100644 --- a/src/app/actions/action.ts +++ b/src/app/actions/action.ts @@ -23,6 +23,8 @@ export async function getUserData() { } }); + console.log(response); + if (response.ok) { return await response.json(); } else { @@ -165,7 +167,7 @@ export async function getBuildData() { export async function fetchINN(inn: string) { try { - const response = await fetch(`${API_BASE_URL}/api/v1/data`, { + const response = await fetch(`${API_BASE_URL}/api/auth`, { method: 'POST', body: JSON.stringify({ version: 1, diff --git a/src/app/actions/auth.ts b/src/app/actions/auth.ts index f1deae4..61e26b5 100644 --- a/src/app/actions/auth.ts +++ b/src/app/actions/auth.ts @@ -72,7 +72,7 @@ export async function authorization( try { const { email, password } = validatedFields.data; - const response = await fetch(`${API_BASE_URL}/api/v1/data`, { + const response = await fetch(`${API_BASE_URL}/api/auth`, { method: 'POST', body: JSON.stringify({ version: 1, @@ -234,7 +234,7 @@ export async function registration( try { const { fullName, email, password, phone } = validatedFields.data; - const response = await fetch(`${API_BASE_URL}/api/v1/data`, { + const response = await fetch(`${API_BASE_URL}/api/auth`, { method: 'POST', body: JSON.stringify({ version: 1, @@ -400,13 +400,11 @@ export async function tokenLifeExtension() { headers: { 'Content-Type': 'application/json', 'Accept': 'application/json', + 'Authorization': `Bearer ${token}`, }, body: JSON.stringify({ version: 1, - msg_id: 20008, - message_body: { - token: token - } + msg_id: 20008 }), }); @@ -431,14 +429,14 @@ export async function confirmEmail(userId: number, verifyToken: string) { headers: { "Content-Type": "application/json", "Accept": "application/json", + 'Authorization': `Bearer ${verifyToken}`, }, body: JSON.stringify({ version: 1, msg_id: 20009, message_body: { resend: 0, - user_id: userId, - verify_token: verifyToken + user_id: userId } }), }); @@ -474,7 +472,6 @@ export async function confirmEmail(userId: number, verifyToken: string) { export async function resendConfirmEmail(userId: number) { console.log('resendConfirmEmail'); - try { const response = await fetch(`${API_BASE_URL}/api/v1/data`, { method: 'POST', @@ -611,6 +608,7 @@ export async function confirmPassword( headers: { 'Content-Type': 'application/json', 'Accept': 'application/json', + 'Authorization': `Bearer ${verifyToken}` }, body: JSON.stringify({ version: 1, @@ -618,7 +616,6 @@ export async function confirmPassword( message_body: { email: email, password: password, - verifyToken: verifyToken, action: "confirmVerification" } }), diff --git a/src/app/actions/companyActions.ts b/src/app/actions/companyActions.ts index 1e01939..9f1e8da 100644 --- a/src/app/actions/companyActions.ts +++ b/src/app/actions/companyActions.ts @@ -95,7 +95,6 @@ export async function companyUserRegistration( phone: phone, password, accountType: 'b2b', - authToken: token, mail_verified: false, ip: ip, user_agent: userAgent, @@ -103,7 +102,8 @@ export async function companyUserRegistration( }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -113,14 +113,6 @@ export async function companyUserRegistration( message_body: { token: string }, message_code: number }; - console.log({ - fullName: fullName, - email, - phone: phone, - password, - accountType: 'b2b', - authToken: token - }); if (parsed.message_code === 0) { console.log(`registration - ${email}`); diff --git a/src/app/actions/fileEntity.ts b/src/app/actions/fileEntity.ts index 0792a3d..1d0504c 100644 --- a/src/app/actions/fileEntity.ts +++ b/src/app/actions/fileEntity.ts @@ -31,7 +31,6 @@ export async function getUserFilesData({ msg_id: 20005, message_body: { action: 'search_files', - token: token, page: page, page_size: pageSize, query: query, @@ -43,7 +42,8 @@ export async function getUserFilesData({ }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -77,12 +77,12 @@ export async function removeUserFile(fileId: string, fullDelete: number) { action: 'delete_file', file_id: fileId, full_delete: fullDelete, - token: token } }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -114,13 +114,13 @@ export async function viewFileInfo(fileId: string) { msg_id: 20005, message_body: { action: 'file_info', - file_id: fileId, - token: token + file_id: fileId } }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -176,14 +176,14 @@ export async function FileAnAppeal(fileId: string, appealReason: string, additio message_body: { action: 'submit_appeal', file_id: fileId, - token: token, appeal_reason: appealReason, additional_info: additionalInfo } }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); diff --git a/src/app/actions/fileUpload.ts b/src/app/actions/fileUpload.ts index fb2d553..88e8d75 100644 --- a/src/app/actions/fileUpload.ts +++ b/src/app/actions/fileUpload.ts @@ -2,8 +2,6 @@ import { API_BASE_URL } from '@/app/actions/definitions'; import { getSessionData } from '@/app/actions/session'; -import { FormState } from '@/app/actions/auth'; -import { unknown } from 'zod'; interface initMessageBody { file_name: string, @@ -22,7 +20,6 @@ export async function fileUpload(messageBody: initMessageBody, convertTo?: strin } const message = messageBody; message.action = 'init'; - message.token = token; if (convertTo && convertTo !== 'reject') { message.convertTo = convertTo; @@ -38,7 +35,8 @@ export async function fileUpload(messageBody: initMessageBody, convertTo?: strin }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -114,7 +112,6 @@ export type ChunkResponse = { }; export async function chunkUpload(formData: FormData, itPrivate?: boolean): Promise { - console.log('chunkUpload'); const token = await getSessionData('token'); try { @@ -123,19 +120,21 @@ export async function chunkUpload(formData: FormData, itPrivate?: boolean): Prom : `${API_BASE_URL}/api/v1/files/chunk`; - if (token && itPrivate) { - formData.append('token', token); - } + /* if (token && itPrivate) { + formData.append('token', token); + } */ const response = await fetch(url, { method: 'POST', - body: formData + body: formData, + headers: { + 'Authorization': `Bearer ${token}` + } }); + /* ...(token && itPrivate && { 'Authorization': `Bearer ${token}` }) возможно нужно будет условно отправлять токен*/ if (response.ok) { let parsed = await response.json(); - console.log(formData); - console.log(parsed); if (parsed.message_code === 0) { return { @@ -250,7 +249,6 @@ export async function checkOperationPrice(action: string, filesCount: number, fi version: 1, msg_id: 30008, message_body: { - auth_token: token, action: action, file_type: fileType, count_files: filesCount @@ -258,7 +256,8 @@ export async function checkOperationPrice(action: string, filesCount: number, fi }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); diff --git a/src/app/actions/monitoringActions.ts b/src/app/actions/monitoringActions.ts index 9bbb40f..7c49efd 100644 --- a/src/app/actions/monitoringActions.ts +++ b/src/app/actions/monitoringActions.ts @@ -14,13 +14,13 @@ export async function setMonitoring(fileId: string, monitoringType: string) { msg_id: 30007, message_body: { monitoring_type: monitoringType, - file_id: fileId, - auth_token: token + file_id: fileId } }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -65,14 +65,12 @@ export async function fetchMonitoringStats(): Promise { method: 'POST', body: JSON.stringify({ version: 1, - msg_id: 30011, - message_body: { - token: token - } + msg_id: 30011 }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -99,13 +97,13 @@ export async function fetchLastMonitoringCheck() { version: 1, msg_id: 30011, message_body: { - token: token, limit: 1 } }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -131,14 +129,12 @@ export async function fetchMonitoringInfo() { method: 'POST', body: JSON.stringify({ version: 1, - msg_id: 30027, - message_body: { - authToken: token - } + msg_id: 30027 }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); diff --git a/src/app/actions/notificationActions.ts b/src/app/actions/notificationActions.ts index b96c0a2..c6f6213 100644 --- a/src/app/actions/notificationActions.ts +++ b/src/app/actions/notificationActions.ts @@ -22,13 +22,13 @@ export async function fetchActiveNotifications() { version: 1, msg_id: 30015, message_body: { - action: 'active', - authToken: token, + action: 'active' } }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -59,7 +59,6 @@ export async function fetchAllNotifications(page: number = 0, size: number = 10) msg_id: 30015, message_body: { action: 'list', - authToken: token, page: page, size: size, sortBy: "createdAt", @@ -70,7 +69,8 @@ export async function fetchAllNotifications(page: number = 0, size: number = 10) }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -101,13 +101,13 @@ export async function notificationsMarkAsRead(ids: number[]) { msg_id: 30015, message_body: { action: 'markRead', - authToken: token, notificationIds: ids } }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -132,7 +132,6 @@ export async function notificationsMarkAsRead(ids: number[]) { export async function notificationsDelete(ids: number[]) { const token = await getSessionData('token'); - console.log('notificationsDelete'); try { const response = await fetch(`${API_BASE_URL}/api/v1/data`, { @@ -142,13 +141,13 @@ export async function notificationsDelete(ids: number[]) { msg_id: 30015, message_body: { action: 'delete', - authToken: token, notificationIds: ids } }), 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 69c42dc..3e0335b 100644 --- a/src/app/actions/referralsActions.ts +++ b/src/app/actions/referralsActions.ts @@ -14,12 +14,12 @@ export async function fetchReferralsLevels() { msg_id: 30003, message_body: { action: 'levels', - token: token, } }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -57,12 +57,12 @@ export async function fetchReferralUserStats() { msg_id: 30003, message_body: { action: 'userStats', - token: token, } }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -96,14 +96,14 @@ export async function fetchReferralInvitees() { msg_id: 30003, message_body: { action: 'invitees', - token: token, pageSize: 100, pageNumber: 0 } }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -137,25 +137,18 @@ export async function referralRefill() { msg_id: 30003, message_body: { action: 'refill', - token: token, amount: 2000, } }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); if (response.ok) { - console.log('referralRefill'); - console.log({ - action: 'refill', - token: token, - amount: 2000, - }) let parsed = await response.json(); - console.log(parsed); if (parsed.message_code === 0) { return parsed.message_body; diff --git a/src/app/actions/searchActions.ts b/src/app/actions/searchActions.ts index c7191ce..959f1e2 100644 --- a/src/app/actions/searchActions.ts +++ b/src/app/actions/searchActions.ts @@ -7,8 +7,11 @@ export async function searchUserFiles(fileId: string) { const token = await getSessionData('token'); try { - const response = await fetch(`${API_BASE_URL}/api/v1/files/${fileId}/similar?similarityLevels=DUPLICATE,SIMILARITY&auth_token=${token}`, { - method: 'GET' + const response = await fetch(`${API_BASE_URL}/api/v1/files/${fileId}/similar?similarityLevels=DUPLICATE,SIMILARITY`, { + method: 'GET', + headers: { + 'Authorization': `Bearer ${token}` + } }); if (response.ok) { diff --git a/src/app/actions/trackingActions.ts b/src/app/actions/trackingActions.ts index 1af037f..533142c 100644 --- a/src/app/actions/trackingActions.ts +++ b/src/app/actions/trackingActions.ts @@ -17,12 +17,12 @@ export async function requestFileWithTracking(fileId: string) { method: 'POST', body: JSON.stringify({ file_id: fileId, - token: token, ip: ip, user_agent: userAgent }), headers: { - 'Content-Type': 'application/json' + 'Content-Type': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -57,12 +57,12 @@ export async function requestFileAsBuffer(fileId: string): Promise = { - token: token - }; + const body: Record = {}; if (page !== undefined) body.page = page; if (size !== undefined) body.size = size; @@ -106,6 +104,7 @@ export async function getViolationFilesArray(props: { headers: { 'Content-Type': 'application/json', 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` }, body: JSON.stringify(body), }); @@ -141,7 +140,6 @@ export async function getFileMatches(fileId: string, page: number, status?: stri page: (page > 0 ? page - 1 : 0), size: 5, sort_direction: 'desc', - token: token, status: status, ...(violationId && { action: 'getByViolationId' }), ...(violationId && { violation_id: violationId }), @@ -150,7 +148,8 @@ export async function getFileMatches(fileId: string, page: number, status?: stri }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -183,13 +182,13 @@ export async function fetchViolationAnalyticStatistic(group: 'domain' | 'tld') { message_body: { group_by: group, action: "group", - token: token, sort_direction: 'desc' } }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -219,13 +218,13 @@ export async function fetchViolationStatistic(id?: string) { version: 1, msg_id: 30010, message_body: { - token: token, ...(id && { file_id: id }) } }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -253,14 +252,12 @@ export async function fetchViolationFinalSummaryStatistic() { method: 'POST', body: JSON.stringify({ version: 1, - msg_id: 30023, - message_body: { - token: token, - } + msg_id: 30023 }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -328,7 +325,6 @@ export async function createComplaint( version: 1, msg_id: 30013, message_body: { - token: token, action: 'create', violation_id: violationId, text: textArea, @@ -337,7 +333,8 @@ export async function createComplaint( }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -394,13 +391,13 @@ export async function fetchComplainInfo(id: number) { msg_id: 30013, message_body: { action: 'get_by_violation', - violation_id: id, - token + violation_id: id } }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -438,13 +435,13 @@ export async function updateMatchStatus(id: number, status: MatchStatus) { message_body: { action: 'updateStatus', violation_id: id, - status: status, - token: token + status: status } }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -475,7 +472,6 @@ export async function fetchClaimInfo(id: number) { msg_id: 30017, message_body: { action: 'get_all', - token: token, pageSize: 1, pageNumber: 0, sortBy: "createdAt", @@ -485,7 +481,8 @@ export async function fetchClaimInfo(id: number) { }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -572,7 +569,6 @@ export async function createClaim( violation_id: violationId, description: textArea, email: email, - token: token, name: caseTitle, priority: 'HIGH', amount: Number(amount) @@ -580,7 +576,8 @@ export async function createClaim( }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -651,7 +648,6 @@ export async function fetchLastClaims(params: ComplaintsCaseQueryParams) { msg_id: 30017, message_body: { action: "get_all", - token: token, pageNumber: page, size, sort_by, @@ -660,7 +656,8 @@ export async function fetchLastClaims(params: ComplaintsCaseQueryParams) { }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); @@ -692,7 +689,6 @@ export async function fetchLastComplaint(params: ComplaintsCaseQueryParams) { msg_id: 30013, message_body: { action: "get_all", - token: token, page, size, sort_by, @@ -701,7 +697,8 @@ export async function fetchLastComplaint(params: ComplaintsCaseQueryParams) { }), headers: { 'Content-Type': 'application/json', - 'Accept': 'application/json' + 'Accept': 'application/json', + 'Authorization': `Bearer ${token}` } }); From 7d0fb265d4cd074690df667e1818ffb2e2fcbb99 Mon Sep 17 00:00:00 2001 From: smanylov Date: Tue, 2 Jun 2026 11:39:54 +0700 Subject: [PATCH 2/4] add bearer tokens for functions --- src/app/actions/action.ts | 16 +++++++++------- src/app/actions/auth.ts | 2 ++ src/app/actions/fileUpload.ts | 15 ++++++++++++--- src/app/actions/referralsActions.ts | 4 ++-- src/app/actions/searchActions.ts | 6 +++--- src/app/actions/trackingActions.ts | 7 ++++++- src/app/ui/forms/register-form.tsx | 11 ++++++++--- 7 files changed, 42 insertions(+), 19 deletions(-) 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" + >