Skip to content

Commit

Permalink
Mijn-8373 bug (#1263)
Browse files Browse the repository at this point in the history 
* Encrypt uuid

* Change bezwaren async detail page request

* Update test data

* Use SID
  • Loading branch information
@timvanoostrom
timvanoostrom authored Apr 26, 2024
1 parent cd1ad0b commit 2e0c999
Show file tree
Hide file tree
Showing 15 changed files with 236 additions and 104 deletions.
3 changes: 2 additions & 1 deletion src/client/pages/BezwarenDetail/BezwarenDetail.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const testState = {
{
identificatie: 'BI.21.014121.001',
uuid: '68cdd171-b4fd-44cc-a4d3-06b77341f20a',
uuidEncrypted: 'asdasd98asd098asdjalmsndas-d9aps9dapsdja.sdasd',
startdatum: '2023-04-25',
bezwaarnummer: 'BI.21.014121.001',
zaakkenmerk: 'ghi.abc.def',
Expand All @@ -38,7 +39,7 @@ const testState = {
},
BEZWAREN_BAG: {
abc: null,
'68cdd171-b4fd-44cc-a4d3-06b77341f20a': {
'asdasd98asd098asdjalmsndas-d9aps9dapsdja.sdasd': {
statussen: [
{
uuid: 'b62fdaa9-f7ec-45d1-b23c-7f36fa00b393',
Expand Down
115 changes: 65 additions & 50 deletions src/client/pages/BezwarenDetail/BezwarenDetail.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,27 +43,80 @@ const loadingContentBarConfig2: BarConfig = [
['30rem', '4rem', '2rem'],
];

const BezwarenDetail = () => {
const { BEZWAREN } = useAppStateGetter();
const { uuid } = useParams<{ uuid: string }>();

const bezwaar = BEZWAREN.content?.find((b) => b.uuid === uuid) ?? null;
interface BezwarenDetailPartialProps {
uuidEncrypted: string;
}

function BezwarenDetailPartial({ uuidEncrypted }: BezwarenDetailPartialProps) {
const [bezwaarDetail, api] = useAppStateBagApi<BezwaarDetail | null>({
url: `${BFFApiUrls.BEZWAREN_DETAIL}/${uuid}`,
url: `${BFFApiUrls.BEZWAREN_DETAIL}/${uuidEncrypted}`,
bagChapter: BagChapters.BEZWAREN,
key: uuid,
key: uuidEncrypted,
});

const noContent = !isLoading(BEZWAREN) && !bezwaar;
const documents = bezwaarDetail?.documents ?? [];
const statussen = bezwaarDetail?.statussen ?? [];

const documentCategories = uniqueArray(
documents.map((d) => d.dossiertype).filter(Boolean)
).sort();

const isSmallScreen = usePhoneScreen();

return (
<>
<PageContent>
{documentCategories.length > 0 && (
<>
{documentCategories.map((category) => {
const docs = documents.filter((d) => d.dossiertype === category);
return (
<InfoDetailGroup
key={category}
label={
<div className={styles.DocumentListHeader}>
<InfoDetailHeading
label={`Document${
documents.length > 1 ? 'en' : ''
} ${category.toLowerCase()}`}
/>
{!isSmallScreen && (
<span className={styles.DocumentListHeader_Date}>
Datum
</span>
)}
</div>
}
>
<DocumentList documents={docs} showDatePublished />
</InfoDetailGroup>
);
})}
</>
)}
{api.isLoading && (
<>
<Heading level={4} size="level-4">
Status
</Heading>
<LoadingContent barConfig={loadingContentBarConfig2} />
</>
)}
</PageContent>
{!!bezwaarDetail && (
<BezwarenStatusLines id={uuidEncrypted} statussen={statussen} />
)}
</>
);
}

function BezwarenDetail() {
const { BEZWAREN } = useAppStateGetter();
const { uuid } = useParams<{ uuid: string }>();

const bezwaar = BEZWAREN.content?.find((b) => b.uuid === uuid) ?? null;
const noContent = !isLoading(BEZWAREN) && !bezwaar;

return (
<DetailPage>
<PageHeading
Expand All @@ -78,7 +131,7 @@ const BezwarenDetail = () => {
</PageHeading>

<PageContent>
{(isError(BEZWAREN) || noContent || api.isError) && (
{(isError(BEZWAREN) || noContent) && (
<ErrorAlert>We kunnen op dit moment geen gegevens tonen.</ErrorAlert>
)}
{!!bezwaar && (
Expand Down Expand Up @@ -111,52 +164,14 @@ const BezwarenDetail = () => {
{bezwaar.einddatum && bezwaar.resultaat && (
<InfoDetail label="Resultaat bezwaar" value={bezwaar.resultaat} />
)}
{documentCategories.length > 0 && (
<>
{documentCategories.map((category) => {
const docs = documents.filter(
(d) => d.dossiertype === category
);
return (
<InfoDetailGroup
key={category}
label={
<div className={styles.DocumentListHeader}>
<InfoDetailHeading
label={`Document${
documents.length > 1 ? 'en' : ''
} ${category.toLowerCase()}`}
/>
{!isSmallScreen && (
<span className={styles.DocumentListHeader_Date}>
Datum
</span>
)}
</div>
}
>
<DocumentList documents={docs} showDatePublished />
</InfoDetailGroup>
);
})}
</>
)}
</>
)}
</PageContent>
{api.isLoading && (
<PageContent>
<Heading level={4} size="level-4">
Status
</Heading>
<LoadingContent barConfig={loadingContentBarConfig2} />
</PageContent>
)}
{!!bezwaarDetail && !!bezwaar?.uuid && (
<BezwarenStatusLines id={bezwaar.uuid} statussen={statussen} />
{!!bezwaar?.uuidEncrypted && (
<BezwarenDetailPartial uuidEncrypted={bezwaar.uuidEncrypted} />
)}
</DetailPage>
);
};
}

export default BezwarenDetail;
1 change: 0 additions & 1 deletion src/client/pages/BezwarenDetail/BezwarenStatusLines.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ const BezwarenStatusLines = ({

return (
<StatusLine
className=""
trackCategory="Bezwaar detail / status"
items={statusLineItems}
id={`bezwaar-detail-${id}`}
Expand Down
4 changes: 4 additions & 0 deletions src/client/pages/BezwarenDetail/__snapshots__/BezwarenDetail.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,10 @@ exports[`BezwarenDetail > With result > Matches the Full Page snapshot 1`] = `
</div>
</div>
</div>
</div>
<div
class="_PageContent_47d7c0"
>
<div
class="_InfoDetailGroup_6f1df2"
>
Expand Down
4 changes: 2 additions & 2 deletions src/server/router-protected.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,12 @@ router.get(
authProfileAndToken,
req.params.id
);

if (
documentResponse.status === 'ERROR' ||
!documentResponse.content?.data
) {
res.status(500);
return res.send(documentResponse);
return res.status(500).send(documentResponse);
}

res.type(documentResponse.content.mimetype ?? 'application/pdf');
Expand Down
4 changes: 4 additions & 0 deletions src/server/services/bezwaren/__snapshots__/bezwaren.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ exports[`Bezwaren > fetch bezwaren > should return data in expected format 1`] =
"statussen": [],
"toelichting": "Lange uitleg over het bezwaar. Kan dus veel tekst hebben want is vrije invoer.",
"uuid": "68cdd171-b4fd-44cc-a4d3-06b77341f20a",
"uuidEncrypted": "test-encrypted-id",
"zaakkenmerk": "ghi.abc.def",
},
{
Expand All @@ -47,6 +48,7 @@ exports[`Bezwaren > fetch bezwaren > should return data in expected format 1`] =
"statussen": [],
"toelichting": "",
"uuid": "9804b064-90a3-43b0-bc7c-924f9939888d",
"uuidEncrypted": "test-encrypted-id",
"zaakkenmerk": "abc.def",
},
{
Expand All @@ -70,6 +72,7 @@ exports[`Bezwaren > fetch bezwaren > should return data in expected format 1`] =
"statussen": [],
"toelichting": "Met toelichting",
"uuid": "cc117d91-1b00-4bae-bbdd-9ea3a6d6d185",
"uuidEncrypted": "test-encrypted-id",
"zaakkenmerk": "123.abc.def",
},
{
Expand All @@ -93,6 +96,7 @@ exports[`Bezwaren > fetch bezwaren > should return data in expected format 1`] =
"statussen": [],
"toelichting": "Met toelichting",
"uuid": "956541b6-7a25-4132-9592-0a509bc7ace0",
"uuidEncrypted": "test-encrypted-id",
"zaakkenmerk": "321.abc.def",
},
],
Expand Down
22 changes: 21 additions & 1 deletion src/server/services/bezwaren/bezwaren.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ vi.mock('../../../universal/helpers/encrypt-decrypt', async (requireActual) => {
return {
...((await requireActual()) as object),
encrypt: () => {
return ['session-id', 'test-encrypted-id'];
return ['test-encrypted-id'];
},
decrypt: () => 'session-id:e6ed38c3-a44a-4c16-97c1-89d7ebfca095',
};
Expand Down Expand Up @@ -194,5 +194,25 @@ describe('Bezwaren', () => {
expect(res.content?.statussen?.length).toBeGreaterThan(0);
expect(res.content?.documents?.length).toBeGreaterThan(0);
});

it('should fail to fetch more results', async () => {
const res = await fetchBezwaarDetail(
requestId,
{
...profileAndToken,
profile: { ...profileAndToken.profile, sid: 'nope' },
},
'xxx'
);

expect(res).toMatchInlineSnapshot(`
{
"code": 401,
"content": null,
"message": "Not authorized",
"status": "ERROR",
}
`);
});
});
});
43 changes: 30 additions & 13 deletions src/server/services/bezwaren/bezwaren.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,13 @@ function getZaakUrl(zaakId: string) {
}

function transformBezwarenDocumentsResults(
sessionID: AuthProfileAndToken['profile']['sid'],
response: BezwarenSourceResponse<BezwaarSourceDocument>
): BezwaarDocument[] {
if (Array.isArray(response.results)) {
return response.results.map(
({ bestandsnaam, identificatie, dossiertype, verzenddatum }) => {
const [documentIdEncrypted] = encrypt(
identificatie,
process.env.BFF_GENERAL_ENCRYPTION_KEY ?? ''
);
const [documentIdEncrypted] = encrypt(`${sessionID}:${identificatie}`);
return {
id: documentIdEncrypted,
title: bestandsnaam,
Expand Down Expand Up @@ -166,7 +164,11 @@ export async function fetchBezwarenDocuments(
return requestData<BezwaarDocument[]>(
getApiConfig('BEZWAREN_DOCUMENTS', {
params,
transformResponse: transformBezwarenDocumentsResults,
transformResponse: (responseData) =>
transformBezwarenDocumentsResults(
authProfileAndToken.profile.sid,
responseData
),
headers: await getBezwarenApiHeaders(authProfileAndToken),
}),
zaakId
Expand All @@ -184,6 +186,7 @@ function getKenmerkValue(kenmerken: Kenmerk[], kenmerk: kenmerkKey) {
}

function transformBezwarenResults(
sessionID: AuthProfileAndToken['profile']['sid'],
response: BezwarenSourceResponse<BezwaarSourceData>
): BezwaarResponse {
const results = response.results;
Expand All @@ -197,11 +200,14 @@ function transformBezwarenResults(
'besluitdatum'
);

const [idEncrypted] = encrypt(`${sessionID}:${bezwaarBron.uuid}`);

const bezwaar: Bezwaar = {
identificatie: bezwaarBron.identificatie,
zaakkenmerk:
getKenmerkValue(bezwaarBron.kenmerken, 'zaakkenmerk') ?? '',
uuid: bezwaarBron.uuid,
uuidEncrypted: idEncrypted,
startdatum: bezwaarBron.startdatum,
ontvangstdatum: bezwaarBron.registratiedatum,
omschrijving: bezwaarBron.omschrijving,
Expand Down Expand Up @@ -259,7 +265,8 @@ export async function fetchBezwaren(
const requestConfig = getApiConfig('BEZWAREN_LIST', {
data: requestBody,
params,
transformResponse: transformBezwarenResults,
transformResponse: (responseData) =>
transformBezwarenResults(authProfileAndToken.profile.sid, responseData),
headers: await getBezwarenApiHeaders(authProfileAndToken),
});

Expand Down Expand Up @@ -359,9 +366,15 @@ export async function fetchBezwaarDetail(
authProfileAndToken: AuthProfileAndToken,
zaakIdEncrypted: string
) {
const [sessionID, zaakId] = decrypt(zaakIdEncrypted).split(':');
let sessionID;
let zaakId;
try {
[sessionID, zaakId] = decrypt(zaakIdEncrypted).split(':');
} catch (error) {
captureException(error);
}

if (sessionID !== authProfileAndToken.profile.sid) {
if (!zaakId || sessionID !== authProfileAndToken.profile.sid) {
return apiErrorResult('Not authorized', null, 401);
}

Expand Down Expand Up @@ -399,12 +412,16 @@ export async function fetchBezwaarDocument(
documentIdEncrypted: string,
isDownload: boolean = true
) {
const [sessionID, documentId] = decrypt(
documentIdEncrypted,
process.env.BFF_GENERAL_ENCRYPTION_KEY ?? ''
).split(':');
let sessionID: string = '';
let documentId: string = '';

try {
[sessionID, documentId] = decrypt(documentIdEncrypted).split(':');
} catch (error) {
captureException(error);
}

if (sessionID !== authProfileAndToken.profile.sid) {
if (!documentId || sessionID !== authProfileAndToken.profile.sid) {
return apiErrorResult('Not authorized', null, 401);
}

Expand Down
1 change: 1 addition & 0 deletions src/server/services/bezwaren/types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export type Bezwaar = {
identificatie: string;
zaakkenmerk: string;
uuid: string;
uuidEncrypted: string;
startdatum: string;
ontvangstdatum: string;
omschrijving: string | null;
Expand Down
Loading

0 comments on commit 2e0c999

Please sign in to comment.