Support only download application

Author: lotorvik

packages/fyllut-backend/src/routers/api/documents/documents.ts

@@ -1,8 +1,31 @@
 import { RequestHandler } from 'express';
 import documentsService from '../../../services/documents/documentsService';
-import { htmlResponseError } from '../../../utils/errorHandling';
 import { logErrorWithStacktrace } from '../../../utils/errors';
 
+const application: RequestHandler = async (req, res, next) => {
+  try {
+    const { form, submission, language, enhetNummer, submissionMethod, translations } = req.body;
+    const formParsed = JSON.parse(form);
+    const submissionParsed = JSON.parse(submission);
+
+    const fileBuffer = await documentsService.application({
+      form: formParsed,
+      submission: submissionParsed,
+      language,
+      unitNumber: enhetNummer,
+      accessToken: req.headers.AzureAccessToken as string,
+      submissionMethod,
+      translations,
+    });
+    res.contentType('application/pdf');
+    res.setHeader('Content-Disposition', `inline; filename=${encodeURIComponent(`${formParsed.path}.pdf`)}`);
+    res.send(fileBuffer);
+  } catch (e) {
+    logErrorWithStacktrace(e as Error);
+    next(e);
+  }
+};
+
 const coverPageAndApplication: RequestHandler = async (req, res, next) => {
   try {
     const { form, submission, language, enhetNummer, submissionMethod, translations } = req.body;
@@ -23,11 +46,12 @@ const coverPageAndApplication: RequestHandler = async (req, res, next) => {
     res.send(fileBuffer);
   } catch (e) {
     logErrorWithStacktrace(e as Error);
-    next(htmlResponseError('Generering av førstesideark eller soknads PDF feilet'));
+    next(e);
   }
 };
 
 const documents = {
+  application,
   coverPageAndApplication,
 };
 

packages/fyllut-backend/src/routers/api/documents/index.ts

@@ -5,6 +5,7 @@ import documents from './documents';
 const documentsRouter = express.Router();
 const { azureSkjemabyggingProxy } = initApiConfig();
 
+documentsRouter.post('/application', azureSkjemabyggingProxy, documents.application);
 documentsRouter.post('/front-page-and-application', azureSkjemabyggingProxy, documents.coverPageAndApplication);
 
 export default documentsRouter;

packages/fyllut-backend/src/services/documents/documentsService.ts

@@ -5,13 +5,37 @@ import applicationService from './applicationService';
 import coverPageService from './coverPageService';
 import { mergeFiles } from './gotenbergService';
 
-interface CoverPageAndApplicationProps {
+interface ApplicationProps {
   accessToken: string;
   form: NavFormType;
   submissionMethod: string;
   submission: Submission;
   language: string;
   translations: I18nTranslationMap;
+}
+
+const application = async (props: CoverPageAndApplicationProps) => {
+  const { accessToken, form, submission, language, translations, submissionMethod } = props;
+
+  const applicationResponse: any = await applicationService.createPdf(
+    accessToken,
+    form,
+    submission,
+    submissionMethod,
+    translations,
+    language,
+  );
+
+  const applicationPdf = base64Decode(applicationResponse.data);
+
+  if (applicationPdf === undefined) {
+    throw htmlResponseError('Generering av søknads PDF feilet');
+  }
+
+  return Buffer.from(applicationPdf);
+};
+
+interface CoverPageAndApplicationProps extends ApplicationProps {
   unitNumber: string;
 }
 
@@ -61,6 +85,7 @@ const coverPageAndApplication = async (props: CoverPageAndApplicationProps) => {
 };
 
 const documentsService = {
+  application,
   coverPageAndApplication,
 };
 

packages/shared-components/src/pages/prepare-innsending/PrepareIngenInnsendingPage.tsx

@@ -31,12 +31,13 @@ export function PrepareIngenInnsendingPage({ form, submission, translations, for
     <div className={styles.content}>
       <section id="maincontent" className="fyllut-layout" tabIndex={-1}>
         <section className="main-col" aria-label={translate(form.properties.innsendingOverskrift)}>
-          <div className="wizard-page">
-            <Heading level="3" size="medium" spacing>
-              {translate(form.properties.innsendingOverskrift)}
-            </Heading>
-            <BodyShort className="mb">{translate(form.properties.innsendingForklaring)}</BodyShort>
+          <Heading level="3" size="medium" spacing>
+            {translate(form.properties.innsendingOverskrift)}
+          </Heading>
+          <BodyShort className="mb">{translate(form.properties.innsendingForklaring)}</BodyShort>
+          <div className="mb-4">
             <DownloadCoverPageAndApplicationButton
+              type="application"
               form={form}
               submission={submission}
               translations={translations}