Remove /first-page endpoint since ettersending could not use it

Author: lotorvik

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

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

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

@@ -10,8 +10,9 @@ import forstesideV2 from './forstesideV2';
 const { skjemabyggingProxyUrl } = config;
 
 /*
- * TODO: This version of forsteside is deprecated. When all consumers have implemented version 2
- *  we can remove the version parameter and make forstesideV2 (renamed) the running version
+ * TODO: This version of forsteside is deprecated.
+ * v2 is can be removed, but the default version is used by fyllut-ettersending
+ * @deprecated
  **/
 const forsteside = {
   post: async (req: Request, res: Response, next: NextFunction) => {

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

@@ -5,37 +5,14 @@ import applicationService from './applicationService';
 import frontPageService from './frontPageService';
 import { mergeFiles } from './gotenbergService';
 
-interface FrontPageProps {
+interface FrontPageAndApplicationProps {
   accessToken: string;
   form: NavFormType;
+  submissionMethod: string;
   submission: Submission;
   language: string;
-  unitNumber: string;
-}
-
-const frontPage = async (props: FrontPageProps) => {
-  const { accessToken, form, submission, language, unitNumber } = props;
-
-  const frontPageResponse: any = frontPageService.createPdf({
-    accessToken,
-    form,
-    submission,
-    language,
-    unitNumber,
-  });
-
-  const frontPagePdf = base64Decode(frontPageResponse.foersteside);
-
-  if (frontPagePdf === undefined) {
-    throw htmlResponseError('Generering av førstesideark feilet');
-  }
-
-  return Buffer.from(new Uint8Array(frontPagePdf));
-};
-
-interface FrontPageAndApplicationProps extends FrontPageProps {
   translations: I18nTranslationMap;
-  submissionMethod: string;
+  unitNumber: string;
 }
 
 const frontPageAndApplication = async (props: FrontPageAndApplicationProps) => {
@@ -51,6 +28,10 @@ const frontPageAndApplication = async (props: FrontPageAndApplicationProps) => {
 
   const frontPagePdf = base64Decode(frontPageResponse.foersteside);
 
+  if (frontPagePdf === undefined) {
+    throw htmlResponseError('Generering av førstesideark PDF feilet');
+  }
+
   const applicationResponse: any = await applicationService.createPdf(
     accessToken,
     form,
@@ -62,8 +43,8 @@ const frontPageAndApplication = async (props: FrontPageAndApplicationProps) => {
 
   const applicationPdf = base64Decode(applicationResponse.data);
 
-  if (applicationPdf === undefined || frontPagePdf === undefined) {
-    throw htmlResponseError('Generering av førstesideark eller søknads PDF feilet');
+  if (applicationPdf === undefined) {
+    throw htmlResponseError('Generering av søknads PDF feilet');
   }
 
   const documents = [frontPagePdf, applicationPdf];
@@ -80,7 +61,6 @@ const frontPageAndApplication = async (props: FrontPageAndApplicationProps) => {
 };
 
 const documentsService = {
-  frontPage,
   frontPageAndApplication,
 };
 

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

@@ -27,11 +27,16 @@ const createPdf = async (props: CreatePdfProps) => {
 
   const body = forstesideUtils.genererFoerstesideData(form, submission, language, recipients, unitNumber);
 
-  const response = await createRequest(accessToken, JSON.stringify(body));
+  const response = await createPdfRequest(accessToken, JSON.stringify(body));
 
   log(body, response);
 
-  return response;
+  return {
+    ...(response as object),
+    navSkjemaId: body.navSkjemaId,
+    overskriftstittel: body.overskriftstittel,
+    spraakkode: body.spraakkode,
+  };
 };
 
 const getRecipients = async (formProperties: FormPropertiesType): Promise<Recipient[] | undefined> => {
@@ -52,7 +57,7 @@ const getRecipients = async (formProperties: FormPropertiesType): Promise<Recipi
   }
 };
 
-const createRequest = async (accessToken: string, body?: BodyInit) => {
+const createPdfRequest = async (accessToken: string, body?: BodyInit) => {
   const { skjemabyggingProxyUrl } = config;
 
   const response = await fetch(`${skjemabyggingProxyUrl}/foersteside`, {

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

@@ -50,9 +50,9 @@ const formatPDFDate = (date: Date) => {
 };
 
 // Generisk metode for kall til mot Gotenberg gitt rute og preparert FormData
-export const callGotenberg = async (language: string, route: string, formData: FormData): Promise<any> => {
+export const callGotenberg = async (language: string = 'no', route: string, formData: FormData): Promise<any> => {
   const url = language.toLowerCase().startsWith('en') ? gotenbergUrlEn : gotenbergUrl;
-  console.log(`Calling Gotenberg with url = ${url}/${route}`);
+  console.log(`Calling Gotenberg with url = ${url}${route}`);
 
   try {
     // Send the request to Gotenberg

packages/shared-components/src/components/button/DownloadApplicationButton.tsx

@@ -56,7 +56,7 @@ const DownloadApplicationButton = ({
           enhetNummer,
           submissionMethod: submissionMethod ?? 'paper',
         }}
-        actionUrl={`${fyllutBaseURL}/api/documents/front-page`}
+        actionUrl={`${fyllutBaseURL}/api/documents/front-page-and-application`}
         isValid={isValid}
         onSuccess={onSuccess}
         onError={onError}

packages/shared-components/src/components/button/DownloadPdfButton.tsx

@@ -31,8 +31,10 @@ const DownloadPdfButton = ({
       const response: Blob = await http.post(actionUrl, values, {
         Accept: http.MimeType.PDF,
       });
-
       const url = window.URL.createObjectURL(response);
+      if (!url) {
+        throw new Error('Could not create PDF url');
+      }
       const a = document.createElement('a');
       a.href = url;
       a.download = fileName;