Skip to content

Commit

Permalink
Update Content-Security-Policy script-src directive to allow 'blob' a…
Browse files Browse the repository at this point in the history
…s a source (#7105)

* Update Content-Security-Policy script-src directive to allow 'blob' as a source

* fixed abha linking via qr

---------

Co-authored-by: khavinshankar <[email protected]>
  • Loading branch information
Ashesh3 and khavinshankar authored Jan 25, 2024
1 parent 35e78bd commit 4e53a3e
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 6 deletions.
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ status = 200
X-Content-Type-Options = "nosniff"
Content-Security-Policy = '''
default-src 'self';
script-src 'self' 'nonce-f51b9742' https://plausible.10bedicu.in;
script-src 'self' blob: 'nonce-f51b9742' https://plausible.10bedicu.in;
style-src 'self' 'unsafe-inline';
connect-src *;
img-src 'self' blob: data: https://cdn.coronasafe.network https://egov-s3-facility-10bedicu.s3.amazonaws.com https://egov-s3-patient-data-10bedicu.s3.amazonaws.com;
Expand Down
17 changes: 14 additions & 3 deletions src/Components/ABDM/LinkABHANumberModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import TextFormField from "../Form/FormFields/TextFormField";
import { classNames } from "../../Utils/utils";
import request from "../../Utils/request/request";
import routes from "../../Redux/api";
import { ABDMError } from "./models";
import { ABDMError, ABHAQRContent } from "./models";

export const validateRule = (
condition: boolean,
Expand Down Expand Up @@ -188,9 +188,20 @@ const ScanABHAQRSection = ({
setIsLoading(true);

try {
const abha = JSON.parse(value);
const abha = JSON.parse(value) as ABHAQRContent;

const { res, data } = await request(routes.abha.linkViaQR, {
body: { ...abha, patientId },
body: {
patientId,
hidn: abha?.hidn,
phr: abha?.hid,
name: abha?.name,
gender: abha?.gender,
dob: abha?.dob.replace(/\//g, "-"),
address: abha?.address,
"dist name": abha?.district_name,
"state name": abha?.["state name"],
},
});

if (res?.status === 200 || res?.status === 202) {
Expand Down
26 changes: 26 additions & 0 deletions src/Components/ABDM/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,29 @@ export interface IcreateHealthFacilityTBody {
export interface IpartialUpdateHealthFacilityTBody {
hf_id: string;
}

export interface ILinkViaQRBody {
hidn: string;
phr: string;
name: string;
gender: "M" | "F" | "O";
dob: string;
address?: string;
"dist name"?: string;
"state name"?: string;
patientId?: string;
}

export interface ABHAQRContent {
address: string;
distlgd: string;
district_name: string;
dob: string;
gender: "M";
hid: string;
hidn: string;
mobile: string;
name: string;
"state name": string;
statelgd: string;
}
3 changes: 2 additions & 1 deletion src/Redux/api.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
IHealthId,
IinitiateAbdmAuthenticationTBody,
ILinkABHANumber,
ILinkViaQRBody,
IpartialUpdateHealthFacilityTBody,
ISearchByHealthIdTBody,
IVerifyAadhaarOtpTBody,
Expand Down Expand Up @@ -1188,7 +1189,7 @@ const routes = {
path: "/api/v1/abdm/healthid/link_via_qr/",
method: "POST",
TRes: Type<ILinkABHANumber>(),
TBody: Type<ISearchByHealthIdTBody>(),
TBody: Type<ILinkViaQRBody>(),
},

linkCareContext: {
Expand Down
2 changes: 1 addition & 1 deletion vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export default defineConfig({
preview: {
headers: {
"Content-Security-Policy": `default-src 'self';\
script-src 'self' 'nonce-f51b9742' https://plausible.10bedicu.in;\
script-src 'self' blob: 'nonce-f51b9742' https://plausible.10bedicu.in;\
style-src 'self' 'unsafe-inline';\
connect-src *;\
img-src 'self' blob: data: https://cdn.coronasafe.network ${cdnUrls};\
Expand Down

0 comments on commit 4e53a3e

Please sign in to comment.