Merge pull request #1207 from navikt/bygger-ansatt-domene

Bygger ansatt domene

Author: akgagnat

Diff for: .nais/bygger/preprod-alt.yaml

@@ -1,7 +1,8 @@
 app-name: skjemabygging-preprod-alt
 ingresses:
 - "https://skjemabygging-preprod-alt.intern.dev.nav.no"
-fyllut-base-url: https://fyllut-preprod-alt.intern.dev.nav.no/fyllut
+- "https://skjemabygging-preprod-alt.ansatt.dev.nav.no"
+fyllut-base-url: http://skjemautfylling-preprod-alt/fyllut
 enabled-features: translations,diff
 publish-repo: skjemautfylling-formio
 publish-repo-owner: navikt
@@ -20,8 +21,10 @@ accessPolicy:
       - application: formio-enterprise-server
         namespace: skjemadigitalisering
         cluster: dev-gcp
+      - application: skjemautfylling-preprod-alt
+        namespace: skjemadigitalisering
+        cluster: dev-gcp
     external:
-      - host: fyllut-preprod-alt.intern.dev.nav.no
       - host: skjemabygging-proxy.dev-fss-pub.nais.io
 secrets:
   - formio-server-access-dev

Diff for: .nais/bygger/preprod.yaml

@@ -2,9 +2,10 @@ app-name: skjemabygging-preprod
 env-name: dev-gcp
 ingresses:
 - "https://skjemabygging-preprod.intern.dev.nav.no"
+- "https://skjemabygging-preprod.ansatt.dev.nav.no"
 logs-url: https://logs.adeo.no/app/r/s/lvnlu
 special-type-to-use-in-alertmanager-config: "fyllut-sendinn-alerts-dev"
-fyllut-base-url: https://fyllut-preprod.intern.dev.nav.no/fyllut
+fyllut-base-url: http://skjemautfylling-preprod/fyllut
 enabled-features: translations,diff
 publish-repo: skjemautfylling-formio
 publish-repo-owner: navikt
@@ -23,8 +24,10 @@ accessPolicy:
       - application: formio-enterprise-server
         namespace: skjemadigitalisering
         cluster: dev-gcp
+      - application: skjemautfylling-preprod
+        namespace: skjemadigitalisering
+        cluster: dev-gcp
     external:
-      - host: fyllut-preprod.intern.dev.nav.no
       - host: skjemabygging-proxy.dev-fss-pub.nais.io
 secrets:
   - formio-server-access-dev

Diff for: .nais/fyllut/preprod-alt.yaml

@@ -25,6 +25,8 @@ accessPolicy:
     rules:
       - application: send-inn-frontend-alt
         namespace: team-soknad
+      - application: skjemabygging-preprod-alt
+        namespace: skjemadigitalisering
   outbound:
     rules:
       - application: skjemabygging-proxy

Diff for: .nais/fyllut/preprod.yaml

@@ -25,6 +25,8 @@ accessPolicy:
     rules:
       - application: send-inn-frontend
         namespace: team-soknad
+      - application: skjemabygging-preprod
+        namespace: skjemadigitalisering
   outbound:
     rules:
       - application: skjemabygging-proxy

Diff for: packages/bygger-backend/src/routers/api/config.ts

@@ -11,7 +11,7 @@ const config = (req: ByggerRequest, res: Response) => {
   }
   res.json({
     formioProjectUrl: `${getByggerUrl(req)}/${appConfig.formio.projectName}`,
-    fyllutBaseUrl: appConfig.fyllut.baseUrl,
+    fyllutBaseUrl: `${getByggerUrl(req)}/fyllut`,
     pusherCluster: appConfig.pusher.cluster,
     pusherKey: appConfig.pusher.key,
     isDevelopment: appConfig.isDevelopment,

Diff for: packages/bygger-backend/src/routers/fyllut-proxy/index.ts

@@ -0,0 +1,49 @@
+import express from 'express';
+import httpProxy from 'http-proxy';
+import config from '../../config';
+import { logger } from '../../logging/logger';
+
+const fyllutBaseUrl = config.fyllut.baseUrl;
+const proxy = httpProxy.createProxyServer({});
+proxy.on('proxyReq', (proxyReq) => {
+  proxyReq.removeHeader('authorization');
+});
+
+const fyllutProxyRouter = express.Router();
+
+function logProxyError(proxyMessage: string, err: any, method: string, url: string) {
+  const { message, stack, ...errDetails } = err;
+  logger.error(`${proxyMessage}: ${message}`, {
+    method,
+    url,
+    fyllutBaseUrl,
+    stack,
+    errDetails,
+  });
+}
+
+fyllutProxyRouter.all('*', async (req, res, next) => {
+  const { method, url } = req;
+  try {
+    logger.info(`Fyllut proxy ${method} ${url}`, { fyllutBaseUrl });
+    proxy.web(
+      req,
+      res,
+      {
+        target: fyllutBaseUrl,
+        changeOrigin: true,
+        proxyTimeout: 60000,
+        timeout: 60000,
+      },
+      (err) => {
+        logProxyError('Fyllut proxy - error callback', err, method, url);
+        next(err);
+      },
+    );
+  } catch (err: any) {
+    logProxyError('Fyllut proxy - error was thrown', err, method, url);
+    next(err);
+  }
+});
+
+export default fyllutProxyRouter;

Diff for: packages/bygger-backend/src/server.js

@@ -6,13 +6,15 @@ import authHandler from './middleware/authHandler';
 import { fsAccessRateLimiter } from './middleware/ratelimit';
 import apiRouter from './routers/api';
 import formioProxyRouter from './routers/formio-proxy';
+import fyllutProxyRouter from './routers/fyllut-proxy';
 import internalRouter from './routers/internal';
 import notificationsRouter from './routers/notifications';
 import './util/errorToJson';
 
 const app = express();
 
 app.use(`/${config.formio.projectName}`, formioProxyRouter);
+app.use('/fyllut', fyllutProxyRouter);
 app.use(express.json({ limit: '50mb' }));
 app.use(express.urlencoded({ extended: true, limit: '50mb' }));
 app.use(correlator());