Setter opp egen api-proxy-endepunkt for kall mot Unleash

.nais/unleash/unleash-api-token.dev.yml → .nais/unleash/unleash-api-token.dev.yaml

@@ -2,16 +2,13 @@ apiVersion: unleash.nais.io/v1
 kind: ApiToken
 metadata:
   name: nav-dekoratoren
-  namespace: navno
+  namespace: personbruker
   labels:
-    team: navno
+    team: personbruker
 spec:
     unleashInstance:
       apiVersion: unleash.nais.io/v1
       kind: RemoteUnleash
       name: navno
     secretName: nav-dekoratoren-unleash-api-token
-
-    # Specify which environment the API token should be created for.
-    # Can be one of: development, or production.
     environment: development

.nais/unleash/unleash-api-token.prod.yml → .nais/unleash/unleash-api-token.prod.yaml

@@ -2,9 +2,9 @@ apiVersion: unleash.nais.io/v1
 kind: ApiToken
 metadata:
   name: nav-dekoratoren
-  namespace: navno
+  namespace: personbruker
   labels:
-    team: navno
+    team: personbruker
 spec:
     unleashInstance:
       apiVersion: unleash.nais.io/v1

src/server/api-handlers/features.ts

@@ -1,11 +1,41 @@
 import { RequestHandler } from 'express';
-import { startUnleash } from 'unleash-client';
+import { initialize, Unleash } from 'unleash-client';
+
+let unleashInstance: Unleash;
+const featurePrefix = 'dekoratoren';
+const expectedFeatures = ['skjermdeling', 'chatbotscript'];
+
+type Features = { [key: string]: boolean };
+
+const initializeUnleash = async () => {
+    const { UNLEASH_SERVER_API_TOKEN, UNLEASH_SERVER_API_URL } = process.env;
+    if (!UNLEASH_SERVER_API_TOKEN || !UNLEASH_SERVER_API_URL) {
+        console.error('Missing UNLEASH_SERVER_API_TOKEN or UNLEASH_SERVER_API_URL');
+        return false;
+    }
+
+    try {
+        unleashInstance = initialize({
+            url: `${UNLEASH_SERVER_API_URL}/api/`,
+            appName: 'nav-dekoratoren',
+            customHeaders: { Authorization: UNLEASH_SERVER_API_TOKEN },
+        });
+    } catch (e) {
+        console.error('Error initializing unleash', e);
+    }
+
+    return true;
+};
+
+initializeUnleash();
 
 export const getFeaturesHandler: RequestHandler = async (req, res) => {
+    if (!unleashInstance) {
+        await initializeUnleash();
+    }
+
     // Cant easily fetch feature toggles when running locally
     // so just mock this.
-    const { UNLEASH_SERVER_API_TOKEN, UNLEASH_SERVER_API_URL } = process.env;
-
     if (process.env.NODE_ENV === 'development') {
         const features = {
             skjermdeling: true,
@@ -15,24 +45,12 @@ export const getFeaturesHandler: RequestHandler = async (req, res) => {
         return;
     }
 
-    if (!UNLEASH_SERVER_API_TOKEN || !UNLEASH_SERVER_API_URL) {
-        res.status(500).send('Missing UNLEASH_SERVER_API_TOKEN or UNLEASH_SERVER_API_URL');
-        return;
-    }
+    console.log(unleashInstance.isEnabled('dekoratoren.skjermdeling'));
 
-    try {
-        const unleash = await startUnleash({
-            url: UNLEASH_SERVER_API_URL,
-            appName: 'nav-dekoratoren',
-            customHeaders: { Authorization: UNLEASH_SERVER_API_TOKEN },
-        });
+    const features = expectedFeatures.reduce((acc: Features, feature: string) => {
+        acc[feature] = unleashInstance.isEnabled(`${featurePrefix}.${feature}`);
+        return acc;
+    }, {});
 
-        return {
-            skjermdeling: unleash.isEnabled('dekoratoren.skjermdeling'),
-            chatbotscript: unleash.isEnabled('dekoratoren.chatbotscript'),
-        };
-    } catch (e) {
-        console.error(`Failed to fetch feature toggles from unleash - ${e}`);
-        res.status(500).send(`Failed to fetch feature toggles from unleash - ${e}`);
-    }
+    res.json(features);
 };

src/server/server.ts

@@ -16,7 +16,7 @@ import { getCspHandler } from './api-handlers/csp';
 import { getTaskAnalyticsConfigHandler } from './api-handlers/ta';
 import { mockSessionHandler, refreshMockSessionHandler } from './mock/mockSession';
 import { mockAuthHandler } from './mock/mockAuth';
-// import { getFeaturesHandler } from './api-handlers/features';
+import { getFeaturesHandler } from './api-handlers/features';
 
 require('console-stamp')(console, '[HH:MM:ss.l]');
 
@@ -122,7 +122,7 @@ app.get(createPaths('/env'), (req, res, next) => {
 // Api endpoints
 app.get(createPaths('/api/meny'), getMenuHandler);
 app.get(createPaths('/api/sok'), getSokHandler);
-// app.get(createPaths('/api/features'), getFeaturesHandler);
+app.get(createPaths('/api/features'), getFeaturesHandler);
 app.get(createPaths('/api/driftsmeldinger'), getDriftsmeldingerHandler);
 app.get(createPaths('/api/auth'), mockAuthHandler);
 app.get(createPaths('/api/oauth2/session'), mockSessionHandler);