fix: configure auth server when configuring environment (#191)

UserOfficeProject · Mar 6, 2023 · 692bb1b · 692bb1b
1 parent 790a22f
commit 692bb1b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/apps/user-office-backend/src/config/ess/configureESSEnvironment.ts b/apps/user-office-backend/src/config/ess/configureESSEnvironment.ts
@@ -5,6 +5,7 @@ import { FeatureId } from '../../models/Feature';
 import { SettingsId } from '../../models/Settings';
 import { setTimezone, setDateTimeFormats } from '../setTimezoneAndFormat';
 import { Tokens } from '../Tokens';
+import { updateOIDCSettings } from '../updateOIDCSettings';
 
 async function setEssColourTheme() {
   const db = container.resolve<AdminDataSource>(Tokens.AdminDataSource);
@@ -99,4 +100,5 @@ export async function configureESSDevelopmentEnvironment() {
   await enableDefaultEssFeatures();
   await setTimezone();
   await setDateTimeFormats();
+  await updateOIDCSettings();
 }
diff --git a/apps/user-office-backend/src/config/updateOIDCSettings.ts b/apps/user-office-backend/src/config/updateOIDCSettings.ts
@@ -0,0 +1,26 @@
+import { OpenIdClient } from '@user-office-software/openid';
+import { container } from 'tsyringe';
+
+import { AdminDataSource } from '../datasources/AdminDataSource';
+import { SettingsId } from '../models/Settings';
+import { Tokens } from './Tokens';
+
+export async function updateOIDCSettings() {
+  if (OpenIdClient.hasConfig() === false) {
+    return;
+  }
+
+  const loginUrl = await OpenIdClient.loginUrl();
+  const logoutUrl = await OpenIdClient.logoutUrl();
+  const db = container.resolve<AdminDataSource>(Tokens.AdminDataSource);
+
+  await db.updateSettings({
+    settingsId: SettingsId.EXTERNAL_AUTH_LOGIN_URL,
+    settingsValue: loginUrl,
+  });
+
+  await db.updateSettings({
+    settingsId: SettingsId.EXTERNAL_AUTH_LOGOUT_URL,
+    settingsValue: logoutUrl,
+  });
+}
diff --git a/apps/user-office-frontend-e2e/cypress/integration/appSettings.ts b/apps/user-office-frontend-e2e/cypress/integration/appSettings.ts
@@ -40,8 +40,8 @@ context('App settings tests', () => {
       cy.get('[data-cy="officer-menu-items"]').contains('App settings').click();
 
       cy.get('[data-cy="settings-table"]')
-        .find('button[aria-label="Next Page"]')
-        .click();
+        .get('input[aria-label="Search"]')
+        .type(initialDBData.settings.dateTimeFormat.id);
 
       cy.get('[data-cy="settings-table"]')
         .contains(initialDBData.settings.dateTimeFormat.id)