Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/lau-frontend/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ appVersion: "1.0"
description: A Helm chart for Log and Audit Frontend App
name: lau-frontend
home: https://github.com/hmcts/lau-frontend
version: 0.2.7
version: 0.2.8
dependencies:
- name: nodejs
version: 3.2.0
Expand Down
2 changes: 0 additions & 2 deletions charts/lau-frontend/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ nodejs:
- frontend-redis-access-key
- idam-client-secret
- s2s-secret
- launchdarkly-sdk-key
- lau-deleted-users-ft

redis:
architecture: standalone
Expand Down
3 changes: 0 additions & 3 deletions config/custom-environment-variables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ services:
s2s:
enabled: S2S_ENABLED
url: S2S_URL
featureToggles:
ldKey: LD_SDK_KEY
ft_deletedUsers: 'LAU_DELETED_USERS'
pages:
userDetailsEnabled: USER_DETAILS_PAGE_ENABLED
is_dev: IS_DEV
5 changes: 0 additions & 5 deletions config/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@ services:
lauSecret: 'AAAAAAAAAAAAAAAA'
auto-suggest:
data-file: 'data/auto-suggest-data-prod.json'
featureToggles:
enabled: true
ldKey: 'LD_SDK_KEY'
ft_deletedUsers: 'LAU_DELETED_USERS'
ft_challengeAccess: 'lau-challenged-access'
pages:
userDetailsEnabled: true
session:
Expand Down
2 changes: 0 additions & 2 deletions config/development.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,3 @@ services:
url: 'http://localhost:4552'
auto-suggest:
data-file: 'data/auto-suggest-data-dev.json'
featureToggles:
enabled: false
2 changes: 0 additions & 2 deletions config/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,3 @@ services:
s2s:
enabled: false
url: 'http://localhost:4552'
featureToggles:
enabled: false
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ module.exports = {
'^.+\\.ts?$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
setupFilesAfterEnv: ['./jest.setup.js']
setupFilesAfterEnv: []
}
25 changes: 0 additions & 25 deletions jest.setup.js

This file was deleted.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
"jquery": "^3.5.1",
"js-yaml": "^4.1.0",
"jwt-decode": "^4.0.0",
"launchdarkly-node-server-sdk": "^7.0.0",
"lodash": "^4.17.21",
"moment": "^2.29.4",
"nunjucks": "^3.2.4",
Expand Down
3 changes: 0 additions & 3 deletions src/main/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@
import {OidcMiddleware} from './modules/oidc';
import {HealthCheck} from './modules/health';
import {Container} from './modules/awilix';
import {LaunchDarklyClient} from './components/featureToggle/LaunchDarklyClient';

import config from 'config';
import {AutoSuggest} from './modules/autosuggest/AutoSuggest';

const { setupDev } = require('./development');

Check warning on line 18 in src/main/app.ts

View workflow job for this annotation

GitHub Actions / build

A `require()` style import is forbidden
const { setupTest } = require('./test');

Check warning on line 19 in src/main/app.ts

View workflow job for this annotation

GitHub Actions / build

A `require()` style import is forbidden

const env = process.env.NODE_ENV || 'development';
const developmentMode = env === 'development';
Expand All @@ -38,8 +37,6 @@
app.use(express.urlencoded({ extended: false }));



LaunchDarklyClient.initialise();
new Helmet(config.get('security')).enableFor(app);
new SessionStorage().enableFor(app);
new CSRFToken().enableFor(app);
Expand All @@ -66,7 +63,7 @@
});

globSync(__dirname + '/routes/**/*.+(ts|js)')
.map(filename => require(filename))

Check warning on line 66 in src/main/app.ts

View workflow job for this annotation

GitHub Actions / build

A `require()` style import is forbidden
.forEach(route => route.default(app));

// returning "not found" page for requests with paths not resolved by the router
Expand Down
53 changes: 0 additions & 53 deletions src/main/components/featureToggle/LaunchDarklyClient.ts

This file was deleted.

2 changes: 0 additions & 2 deletions src/main/modules/nunjucks/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import * as nunjucks from 'nunjucks';
import {numberWithCommas} from '../../util/Util';
import {AppRequest} from '../../models/appRequest';
import config from 'config';
import {FeatureToggleService} from './../../service/FeatureToggleService';

export class Nunjucks {
constructor(public developmentMode: boolean) {
Expand Down Expand Up @@ -34,7 +33,6 @@ export class Nunjucks {

app.use(async (req: AppRequest, res, next) => {
res.locals.isDev = JSON.parse(config.get('is_dev'));
res.locals.challengedAccessEnabled = await FeatureToggleService.getChallengedAccessFeatureToggle();
res.locals.userDetailsEnabled = JSON.parse(config.get('pages.userDetailsEnabled'));
res.locals.pagePath = req.path;
next();
Expand Down
2 changes: 0 additions & 2 deletions src/main/modules/properties-volume/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ export class PropertiesVolume {
PropertiesVolume.setSecret('secrets.lau.frontend-redis-access-key', 'redis.password');
PropertiesVolume.setSecret('secrets.lau.idam-client-secret', 'services.idam-api.clientSecret');
PropertiesVolume.setSecret('secrets.lau.s2s-secret', 'services.s2s.lauSecret');
PropertiesVolume.setSecret('secrets.lau.launchdarkly-sdk-key', 'featureToggles.ldKey');
PropertiesVolume.setSecret('secrets.lau.lau-deleted-users-ft', 'featureToggles.ft_deletedUsers');
}
}

Expand Down
3 changes: 0 additions & 3 deletions src/main/routes/home.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,6 @@ async function caseDeletionHandler(req: AppRequest, res: Response) {
}

export async function challengedSpecificAccessHandler(req: AppRequest, res: Response) {
if(!res.locals.challengedAccessEnabled){
return res.redirect('/');
}
const context: Context = {
caseChallengedAccessForm: req.session?.caseChallengedAccessFormState || {},
challengedSpecificAccessPage: true,
Expand Down
16 changes: 0 additions & 16 deletions src/main/service/FeatureToggleService.ts

This file was deleted.

2 changes: 0 additions & 2 deletions src/main/views/common/navigation.njk
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@
<li class="govuk-service-navigation__item {% if caseSearchPage %}govuk-service-navigation__item--active{% endif %}">
<a class="govuk-service-navigation__link" href="/case-audit" {% if caseSearchPage %}aria-current="page" {% endif %}>Case audit</a>
</li>
{% if challengedAccessEnabled %}
<li class="govuk-service-navigation__item {% if challengedSpecificAccessPage %}govuk-service-navigation__item--active{% endif %}">
<a class="govuk-service-navigation__link" href="/challenged-specific-access" {% if challengedSpecificAccessPage %}aria-current="page" {% endif %}>Challenged & specific access</a>
</li>
{% endif %}
<li class="govuk-service-navigation__item {% if logonSearchPage %}govuk-service-navigation__item--active{% endif %}">
<a class="govuk-service-navigation__link" href="/logon-audit" {% if logonSearchPage %}aria-current="page" {% endif %}>Log ons audit</a>
</li>
Expand Down
5 changes: 0 additions & 5 deletions src/test/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ module.exports = {
microservice: process.env.S2S_MICROSERVICE_KEY_CMC,
secret: process.env.S2S_MICROSERVICE_KEY_PWD,
},
featureToggles: {
enabled: process.env.LD_ENABLED || false,
launchDarklyKey: process.env.LAUNCHDARKLY_KEY,
flags: {},
},
env: process.env.TEST_ENV || 'local',
proxy: '',
};
37 changes: 0 additions & 37 deletions src/test/end-to-end/helpers/featureToggles.js

This file was deleted.

52 changes: 0 additions & 52 deletions src/test/end-to-end/helpers/launchDarkly.js

This file was deleted.

56 changes: 0 additions & 56 deletions src/test/unit/components/LaunchDarklyClient.test.ts

This file was deleted.

Loading
Loading