From d7f20753a91207a551d359a9b7e6e9d932de555e Mon Sep 17 00:00:00 2001 From: Deepak Pradhan Date: Thu, 25 Jan 2024 11:49:26 +0545 Subject: [PATCH 1/2] feat: added withcredential to include cookies on organization list api --- src/frontend/src/api/OrganisationService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/src/api/OrganisationService.ts b/src/frontend/src/api/OrganisationService.ts index d0b1f45ba9..db2884b68a 100644 --- a/src/frontend/src/api/OrganisationService.ts +++ b/src/frontend/src/api/OrganisationService.ts @@ -43,7 +43,7 @@ export const OrganisationDataService: Function = (url: string) => { dispatch(OrganisationAction.GetOrganisationDataLoading(true)); const getOrganisationData = async (url) => { try { - const getOrganisationDataResponse = await axios.get(url); + const getOrganisationDataResponse = await axios.get(url,{withCredentials: 'true'}); const response: GetOrganisationDataModel = getOrganisationDataResponse.data; dispatch(OrganisationAction.GetOrganisationsData(response)); } catch (error) { From fbcbca169187f23e2e7b790981b84de007f6babc Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 06:06:56 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/backend/app/projects/project_routes.py | 12 +++++++++--- src/frontend/src/api/OrganisationService.ts | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/backend/app/projects/project_routes.py b/src/backend/app/projects/project_routes.py index dfab02f954..ab1a5c94fa 100644 --- a/src/backend/app/projects/project_routes.py +++ b/src/backend/app/projects/project_routes.py @@ -666,7 +666,10 @@ async def update_project_form( contents = await form.read() form_updated = await project_crud.update_project_form( - db, project_id, contents, file_ext[1:] # Form Contents # File type + db, + project_id, + contents, + file_ext[1:], # Form Contents # File type ) return form_updated @@ -904,7 +907,10 @@ async def update_project_category( # Update odk forms await project_crud.update_project_form( - db, project_id, file_ext[1:] if upload else "xls", upload # Form + db, + project_id, + file_ext[1:] if upload else "xls", + upload, # Form ) return JSONResponse(status_code=200, content={"success": True}) @@ -1157,7 +1163,7 @@ async def get_task_status( async def get_template_file( file_type: str = Query( ..., enum=["data_extracts", "form"], description="Choose file type" - ) + ), ): """Get template file. diff --git a/src/frontend/src/api/OrganisationService.ts b/src/frontend/src/api/OrganisationService.ts index db2884b68a..393156fc76 100644 --- a/src/frontend/src/api/OrganisationService.ts +++ b/src/frontend/src/api/OrganisationService.ts @@ -43,7 +43,7 @@ export const OrganisationDataService: Function = (url: string) => { dispatch(OrganisationAction.GetOrganisationDataLoading(true)); const getOrganisationData = async (url) => { try { - const getOrganisationDataResponse = await axios.get(url,{withCredentials: 'true'}); + const getOrganisationDataResponse = await axios.get(url, { withCredentials: 'true' }); const response: GetOrganisationDataModel = getOrganisationDataResponse.data; dispatch(OrganisationAction.GetOrganisationsData(response)); } catch (error) {