Skip to content

refactor:modified validated api props #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 19, 2024
Merged

refactor:modified validated api props #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/src/components/LegacyCms/Actions/LoadUploadFile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const LoadUploadFile = (props: LoadUploadFileProps) => {
setProgressPercentage(30);
setShowProgress(true);

const res: any = await fileValidation();
const res: any = await fileValidation(projectId);
if(res?.status === 200){
setIsValidated(true);
setValidationMessage('Validated');
Expand Down
12 changes: 10 additions & 2 deletions ui/src/services/api/upload.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import axios from 'axios';
import { UPLOAD_FILE_RELATIVE_URL } from '../../utilities/constants';
import { User, SmsToken } from '../../pages/Login/login.interface';
import { API_VERSION } from '../../utilities/constants';
import { getDataFromLocalStorage } from '../../utilities/functions';

//Axios Calls for Upload server
export const getCall = async (url: string, options?: any) => {
Expand Down Expand Up @@ -36,9 +37,16 @@ export const uploadFilePath = () => {
return `${UPLOAD_FILE_RELATIVE_URL}upload`;
};

export const fileValidation = () => {
export const fileValidation = (projectId: string) => {
try {
return getCall(`${UPLOAD_FILE_RELATIVE_URL}validator`);
const options = {
headers: {
'app_token': getDataFromLocalStorage('app_token'),
'projectId': projectId
},

};
return getCall(`${UPLOAD_FILE_RELATIVE_URL}validator`, options);
} catch (error) {
return error;
}
Expand Down
2 changes: 1 addition & 1 deletion uplaode-api/src/routes/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ router.post('/upload', upload.single('file'), async function (req: Request, res:
// deepcode ignore NoRateLimitingForExpensiveWebOperation: <alredy implemetes>
router.get('/validator', express.json(), fileOperationLimiter, async function (req: Request, res: Response) {
try {
const projectId: string | string[] = req?.body?.projectId ?? "";
const projectId: string | string[] = req?.headers?.projectid ?? "";
const app_token: string | string[] = req?.headers?.app_token ?? "";
const cmsType = config?.cmsType?.toLowerCase();

Expand Down