@ministryofjustice/hmpps-connect-dps-components 2.2.0 → 3.0.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/allocationService.d.ts +14 -2
- package/dist/allocationService.test.d.ts +1 -0
- package/dist/caseLoadService.d.ts +14 -2
- package/dist/caseLoadService.test.d.ts +1 -0
- package/dist/componentsService.d.ts +24 -2
- package/dist/componentsService.test.d.ts +1 -0
- package/dist/data/allocationsApi/allocationsApiClient.d.ts +6 -6
- package/dist/data/componentApi/componentApiClient.d.ts +6 -6
- package/dist/data/prisonApi/prisonApiClient.d.ts +6 -6
- package/dist/index.cjs +266 -0
- package/dist/index.cjs.map +1 -0
- package/dist/index.d.ts +141 -66
- package/dist/index.esm.js +259 -0
- package/dist/index.esm.js.map +1 -0
- package/dist/middleware/getFrontendComponents.d.ts +3 -0
- package/dist/middleware/retrieveAllocationJobResponsibilities.d.ts +3 -0
- package/dist/middleware/retrieveCaseLoadData.d.ts +3 -0
- package/dist/types/ConnectDpsComponentLogger.d.ts +2 -0
- package/dist/types/public/middleware/index.d.ts +1 -0
- package/dist/types/public/services/index.d.ts +3 -0
- package/dist/utils/fallbacks.d.ts +9 -3
- package/dist/utils/updateCsp.d.ts +1 -1
- package/dist/utils/updateCsp.test.d.ts +1 -0
- package/package.json +34 -47
- package/dist/allocationService.js +0 -48
- package/dist/allocationService.js.map +0 -1
- package/dist/caseLoadService.js +0 -55
- package/dist/caseLoadService.js.map +0 -1
- package/dist/componentsService.js +0 -61
- package/dist/componentsService.js.map +0 -1
- package/dist/config.d.ts +0 -14
- package/dist/config.js +0 -28
- package/dist/config.js.map +0 -1
- package/dist/data/allocationsApi/allocationsApiClient.js +0 -23
- package/dist/data/allocationsApi/allocationsApiClient.js.map +0 -1
- package/dist/data/componentApi/componentApiClient.js +0 -23
- package/dist/data/componentApi/componentApiClient.js.map +0 -1
- package/dist/data/prisonApi/prisonApiClient.js +0 -24
- package/dist/data/prisonApi/prisonApiClient.js.map +0 -1
- package/dist/index.js +0 -72
- package/dist/index.js.map +0 -1
- package/dist/types/AllocationJobResponsibility.js +0 -3
- package/dist/types/AllocationJobResponsibility.js.map +0 -1
- package/dist/types/AvailableComponent.js +0 -3
- package/dist/types/AvailableComponent.js.map +0 -1
- package/dist/types/CaseLoad.js +0 -3
- package/dist/types/CaseLoad.js.map +0 -1
- package/dist/types/CaseLoadOptions.js +0 -3
- package/dist/types/CaseLoadOptions.js.map +0 -1
- package/dist/types/Component.js +0 -3
- package/dist/types/Component.js.map +0 -1
- package/dist/types/HeaderFooterSharedData.js +0 -3
- package/dist/types/HeaderFooterSharedData.js.map +0 -1
- package/dist/types/HmppsUser.js +0 -3
- package/dist/types/HmppsUser.js.map +0 -1
- package/dist/types/RequestOptions.d.ts +0 -12
- package/dist/types/RequestOptions.js +0 -3
- package/dist/types/RequestOptions.js.map +0 -1
- package/dist/types/Service.js +0 -3
- package/dist/types/Service.js.map +0 -1
- package/dist/types/TimeoutOptions.js +0 -3
- package/dist/types/TimeoutOptions.js.map +0 -1
- package/dist/utils/fallbacks.js +0 -36
- package/dist/utils/fallbacks.js.map +0 -1
- package/dist/utils/updateCsp.js +0 -25
- package/dist/utils/updateCsp.js.map +0 -1
package/dist/index.d.ts
CHANGED
|
@@ -1,67 +1,142 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
3
|
-
import
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
/**
|
|
47
|
-
* Ensures that:
|
|
48
|
-
* - `res.locals.user.allocationJobResponsibilities`
|
|
49
|
-
* is set for NOMIS users (or will propagate an error). It will also attempt to cache in `req.session.allocationJobResponsibilities`
|
|
50
|
-
* (this is so that extra requests to Allocations API are not required for routes that do not need frontend components,
|
|
51
|
-
* such as image data, or if the frontend component API errors or is temporarily down).
|
|
52
|
-
*
|
|
53
|
-
* It will do the following in priority order, and will attempt the next if the previous fails:
|
|
54
|
-
*
|
|
55
|
-
* * Use values from `res.feComponents.sharedData` if present (and cache in `req.session`)
|
|
56
|
-
* * Use cached data from `req.session`
|
|
57
|
-
* * Fetch data from Allocations API as a fallback and cache in `req.session`
|
|
58
|
-
*
|
|
59
|
-
* Expects res.locals.user to be set up inline with the hmpps-template-typescript project
|
|
60
|
-
*
|
|
61
|
-
* @param caseLoadOptions - config object for request
|
|
62
|
-
* @param caseLoadOptions.logger - pass in the bunyen logger if you want to use it. Falls back to console if not provided
|
|
63
|
-
* @param caseLoadOptions.timeoutOptions - timeout object for superagent. Defaults to 2500ms
|
|
64
|
-
*/
|
|
65
|
-
retrieveAllocationJobResponsibilities: typeof retrieveAllocationJobResponsibilities;
|
|
1
|
+
import { RequestHandler } from 'express';
|
|
2
|
+
import { RestClient, ApiConfig, AuthenticationClient } from '@ministryofjustice/hmpps-rest-client';
|
|
3
|
+
import Logger from 'bunyan';
|
|
4
|
+
|
|
5
|
+
type AvailableComponent = 'header' | 'footer';
|
|
6
|
+
|
|
7
|
+
interface Component {
|
|
8
|
+
html: string;
|
|
9
|
+
css: string[];
|
|
10
|
+
javascript: string[];
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
type ConnectDpsComponentLogger = Logger | typeof console;
|
|
14
|
+
|
|
15
|
+
interface CaseLoad {
|
|
16
|
+
caseLoadId: string;
|
|
17
|
+
description: string;
|
|
18
|
+
type: string;
|
|
19
|
+
caseloadFunction: string;
|
|
20
|
+
currentlyActive: boolean;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
interface Service {
|
|
24
|
+
id: string;
|
|
25
|
+
heading: string;
|
|
26
|
+
description: string;
|
|
27
|
+
href: string;
|
|
28
|
+
navEnabled: boolean;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
type AllocationJobResponsibility = 'KEY_WORKER' | 'PERSONAL_OFFICER';
|
|
32
|
+
|
|
33
|
+
interface HeaderFooterSharedData {
|
|
34
|
+
activeCaseLoad?: CaseLoad;
|
|
35
|
+
caseLoads: CaseLoad[];
|
|
36
|
+
services: Service[];
|
|
37
|
+
allocationJobResponsibilities: AllocationJobResponsibility[];
|
|
38
|
+
}
|
|
39
|
+
interface ComponentsSharedData {
|
|
40
|
+
header: HeaderFooterSharedData;
|
|
41
|
+
footer: HeaderFooterSharedData;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
type ComponentsApiResponse<T extends AvailableComponent[]> = Record<T[number], Component> & {
|
|
45
|
+
meta: ComponentsSharedData[T[number]];
|
|
66
46
|
};
|
|
67
|
-
|
|
47
|
+
declare class ComponentApiClient extends RestClient {
|
|
48
|
+
constructor(logger: ConnectDpsComponentLogger, config: ApiConfig, authenticationClient: AuthenticationClient);
|
|
49
|
+
getComponents<T extends AvailableComponent[]>(userToken: string): Promise<ComponentsApiResponse<T>>;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
interface FrontentComponentRequestOptions {
|
|
53
|
+
authUrl?: string;
|
|
54
|
+
supportUrl?: string;
|
|
55
|
+
environmentName?: 'DEV' | 'PRE-PRODUCTION' | 'PRODUCTION';
|
|
56
|
+
includeSharedData?: boolean;
|
|
57
|
+
useFallbacksByDefault?: boolean;
|
|
58
|
+
}
|
|
59
|
+
declare class ComponentsService {
|
|
60
|
+
private readonly logger;
|
|
61
|
+
private readonly componentApiConfig;
|
|
62
|
+
private readonly componentApiClient;
|
|
63
|
+
private readonly dpsUrl;
|
|
64
|
+
constructor(logger: ConnectDpsComponentLogger, componentApiConfig: ApiConfig, componentApiClient: ComponentApiClient, dpsUrl: string);
|
|
65
|
+
static create({ logger, componentApiConfig, authenticationClient, dpsUrl, }: {
|
|
66
|
+
logger?: ConnectDpsComponentLogger;
|
|
67
|
+
componentApiConfig: ApiConfig;
|
|
68
|
+
authenticationClient: AuthenticationClient;
|
|
69
|
+
dpsUrl: string;
|
|
70
|
+
}): ComponentsService;
|
|
71
|
+
getFrontendComponents(requestOptions: FrontentComponentRequestOptions): RequestHandler;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
declare function getFrontendComponents({ logger, componentApiConfig, authenticationClient, dpsUrl, }: Parameters<typeof ComponentsService.create>[0]): (requestOptions: FrontentComponentRequestOptions) => RequestHandler;
|
|
75
|
+
|
|
76
|
+
declare class PrisonApiClient extends RestClient {
|
|
77
|
+
constructor(logger: ConnectDpsComponentLogger, config: ApiConfig, authenticationClient: AuthenticationClient);
|
|
78
|
+
getUserCaseLoads(userToken: string): Promise<CaseLoad[]>;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
declare class CaseLoadService {
|
|
82
|
+
private readonly logger;
|
|
83
|
+
private readonly prisonApiClient;
|
|
84
|
+
constructor(logger: ConnectDpsComponentLogger, prisonApiClient: PrisonApiClient);
|
|
85
|
+
static create({ logger, prisonApiConfig, authenticationClient, }: {
|
|
86
|
+
logger?: ConnectDpsComponentLogger;
|
|
87
|
+
prisonApiConfig: ApiConfig;
|
|
88
|
+
authenticationClient: AuthenticationClient;
|
|
89
|
+
}): CaseLoadService;
|
|
90
|
+
retrieveCaseLoadData(): RequestHandler;
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
type AuthSource = 'nomis' | 'delius' | 'external' | 'azuread';
|
|
94
|
+
/**
|
|
95
|
+
* These are the details that all user types share.
|
|
96
|
+
*/
|
|
97
|
+
interface BaseUser {
|
|
98
|
+
authSource: AuthSource;
|
|
99
|
+
username: string;
|
|
100
|
+
userId: string;
|
|
101
|
+
name: string;
|
|
102
|
+
displayName: string;
|
|
103
|
+
token?: string;
|
|
104
|
+
backLink?: string;
|
|
105
|
+
}
|
|
106
|
+
/**
|
|
107
|
+
* Prison users are those that have a user account in NOMIS.
|
|
108
|
+
* HMPPS Auth automatically grants these users a `ROLE_PRISON` role.
|
|
109
|
+
* Prison users have an additional numerical staffId. The userId is
|
|
110
|
+
* a stringified version of the staffId. Some teams may need to separately
|
|
111
|
+
* retrieve the user case load (which prisons that a prison user has access
|
|
112
|
+
* to) and store it here, an example can be found in `hmpps-prisoner-profile`.
|
|
113
|
+
*/
|
|
114
|
+
interface PrisonUser extends BaseUser {
|
|
115
|
+
authSource: 'nomis';
|
|
116
|
+
staffId: number;
|
|
117
|
+
caseLoads: CaseLoad[];
|
|
118
|
+
activeCaseLoad?: CaseLoad;
|
|
119
|
+
activeCaseLoadId?: string;
|
|
120
|
+
allocationJobResponsibilities?: AllocationJobResponsibility[];
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
declare class AllocationsApiClient extends RestClient {
|
|
124
|
+
constructor(logger: ConnectDpsComponentLogger, config: ApiConfig, authenticationClient: AuthenticationClient);
|
|
125
|
+
getStaffAllocationPolicies(user: PrisonUser): Promise<{
|
|
126
|
+
policies: AllocationJobResponsibility[];
|
|
127
|
+
}>;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
declare class AllocationService {
|
|
131
|
+
private readonly logger;
|
|
132
|
+
private readonly allocationsApiClient;
|
|
133
|
+
constructor(logger: ConnectDpsComponentLogger, allocationsApiClient: AllocationsApiClient);
|
|
134
|
+
static create({ logger, allocationsApiConfig, authenticationClient, }: {
|
|
135
|
+
logger?: ConnectDpsComponentLogger;
|
|
136
|
+
allocationsApiConfig: ApiConfig;
|
|
137
|
+
authenticationClient: AuthenticationClient;
|
|
138
|
+
}): AllocationService;
|
|
139
|
+
retrieveAllocationJobResponsibilities(): RequestHandler;
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
export { AllocationService, CaseLoadService, ComponentsService, getFrontendComponents };
|
|
@@ -0,0 +1,259 @@
|
|
|
1
|
+
import { RestClient, asSystem, asUser } from '@ministryofjustice/hmpps-rest-client';
|
|
2
|
+
import nunjucks from 'nunjucks';
|
|
3
|
+
|
|
4
|
+
class ComponentApiClient extends RestClient {
|
|
5
|
+
constructor(logger, config, authenticationClient) {
|
|
6
|
+
super('Component API Client', config, logger, authenticationClient);
|
|
7
|
+
}
|
|
8
|
+
async getComponents(userToken) {
|
|
9
|
+
return this.get({
|
|
10
|
+
path: `/components`,
|
|
11
|
+
query: 'component=header&component=footer',
|
|
12
|
+
headers: { 'x-user-token': userToken },
|
|
13
|
+
}, asSystem());
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
function getFallbackHeader(user, dpsUrl, { environmentName, authUrl, supportUrl }) {
|
|
18
|
+
return nunjucks.render('dpsComponents/header-bar.njk', {
|
|
19
|
+
isPrisonUser: !user || user.authSource === 'nomis',
|
|
20
|
+
user,
|
|
21
|
+
dpsUrl,
|
|
22
|
+
environmentName,
|
|
23
|
+
authUrl,
|
|
24
|
+
supportUrl,
|
|
25
|
+
name: initialiseName(user?.displayName),
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
function getFallbackFooter(user, { authUrl, supportUrl }) {
|
|
29
|
+
return nunjucks.render('dpsComponents/footer.njk', {
|
|
30
|
+
isPrisonUser: !user || user.authSource === 'nomis',
|
|
31
|
+
supportUrl,
|
|
32
|
+
authUrl,
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
function initialiseName(fullName) {
|
|
36
|
+
if (!fullName)
|
|
37
|
+
return null;
|
|
38
|
+
const array = fullName.split(' ');
|
|
39
|
+
return `${array[0][0]}. ${array.reverse()[0]}`;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
function updateCsp(feComponentsUrl, res) {
|
|
43
|
+
const csp = res.getHeaders()['content-security-policy'];
|
|
44
|
+
const allDirectives = csp?.split(';') ?? [];
|
|
45
|
+
const directivesToUpdate = ['script-src', 'style-src', 'img-src', 'font-src'];
|
|
46
|
+
const updatedCspDirectives = allDirectives.map(directive => {
|
|
47
|
+
// if directive is not in cspToUpdate or includes fe components url already return as is
|
|
48
|
+
if (directive.includes(feComponentsUrl) || !directivesToUpdate.some(p => directive.includes(`${p} `)))
|
|
49
|
+
return directive;
|
|
50
|
+
// if directive is in cspToUpdate and does not have fe components url, add in
|
|
51
|
+
return `${directive} ${feComponentsUrl}`;
|
|
52
|
+
});
|
|
53
|
+
const requiredAndNotPresent = directivesToUpdate
|
|
54
|
+
.filter(p => !updatedCspDirectives.find(directive => directive.includes(`${p} `)))
|
|
55
|
+
.map(p => `${p} 'self' ${feComponentsUrl}`);
|
|
56
|
+
res.set('content-security-policy', [...updatedCspDirectives, ...requiredAndNotPresent].join(';'));
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
const defaultOptions = {
|
|
60
|
+
includeSharedData: false,
|
|
61
|
+
useFallbacksByDefault: false,
|
|
62
|
+
};
|
|
63
|
+
class ComponentsService {
|
|
64
|
+
logger;
|
|
65
|
+
componentApiConfig;
|
|
66
|
+
componentApiClient;
|
|
67
|
+
dpsUrl;
|
|
68
|
+
constructor(logger, componentApiConfig, componentApiClient, dpsUrl) {
|
|
69
|
+
this.logger = logger;
|
|
70
|
+
this.componentApiConfig = componentApiConfig;
|
|
71
|
+
this.componentApiClient = componentApiClient;
|
|
72
|
+
this.dpsUrl = dpsUrl;
|
|
73
|
+
}
|
|
74
|
+
static create({ logger = console, componentApiConfig, authenticationClient, dpsUrl, }) {
|
|
75
|
+
return new ComponentsService(logger, componentApiConfig, new ComponentApiClient(logger, componentApiConfig, authenticationClient), dpsUrl);
|
|
76
|
+
}
|
|
77
|
+
getFrontendComponents(requestOptions) {
|
|
78
|
+
const requestOptionsWithDefaults = {
|
|
79
|
+
...defaultOptions,
|
|
80
|
+
...requestOptions,
|
|
81
|
+
};
|
|
82
|
+
const { includeSharedData, useFallbacksByDefault } = requestOptionsWithDefaults;
|
|
83
|
+
return async (_req, res, next) => {
|
|
84
|
+
const useFallbacks = (user) => {
|
|
85
|
+
res.locals.feComponents = {
|
|
86
|
+
header: getFallbackHeader(user, this.dpsUrl, {
|
|
87
|
+
environmentName: requestOptionsWithDefaults.environmentName,
|
|
88
|
+
authUrl: requestOptionsWithDefaults.authUrl,
|
|
89
|
+
supportUrl: requestOptionsWithDefaults.supportUrl,
|
|
90
|
+
}),
|
|
91
|
+
footer: getFallbackFooter(user, {
|
|
92
|
+
authUrl: requestOptionsWithDefaults.authUrl,
|
|
93
|
+
supportUrl: requestOptionsWithDefaults.supportUrl,
|
|
94
|
+
}),
|
|
95
|
+
cssIncludes: [],
|
|
96
|
+
jsIncludes: [],
|
|
97
|
+
};
|
|
98
|
+
};
|
|
99
|
+
if (!res.locals.user) {
|
|
100
|
+
this.logger.info('Using fallback frontend components when no user in context');
|
|
101
|
+
useFallbacks(null);
|
|
102
|
+
return next();
|
|
103
|
+
}
|
|
104
|
+
if (useFallbacksByDefault) {
|
|
105
|
+
this.logger.info('Using fallback frontend components by default');
|
|
106
|
+
useFallbacks(res.locals.user);
|
|
107
|
+
return next();
|
|
108
|
+
}
|
|
109
|
+
try {
|
|
110
|
+
const { header, footer, meta } = await this.componentApiClient.getComponents(res.locals.user.token);
|
|
111
|
+
res.locals.feComponents = {
|
|
112
|
+
header: header.html,
|
|
113
|
+
footer: footer.html,
|
|
114
|
+
cssIncludes: [...header.css, ...footer.css],
|
|
115
|
+
jsIncludes: [...header.javascript, ...footer.javascript],
|
|
116
|
+
};
|
|
117
|
+
if (includeSharedData) {
|
|
118
|
+
res.locals.feComponents.sharedData = meta;
|
|
119
|
+
}
|
|
120
|
+
updateCsp(this.componentApiConfig.url, res);
|
|
121
|
+
return next();
|
|
122
|
+
}
|
|
123
|
+
catch (_error) {
|
|
124
|
+
this.logger.error('Failed to retrieve front end components, using fallbacks');
|
|
125
|
+
useFallbacks(res.locals.user);
|
|
126
|
+
return next();
|
|
127
|
+
}
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
function getFrontendComponents$1({ logger = console, componentApiConfig, authenticationClient, dpsUrl, }) {
|
|
133
|
+
const service = ComponentsService.create({ logger, componentApiConfig, authenticationClient, dpsUrl });
|
|
134
|
+
return requestOptions => service.getFrontendComponents(requestOptions);
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
class PrisonApiClient extends RestClient {
|
|
138
|
+
constructor(logger, config, authenticationClient) {
|
|
139
|
+
super('Prison API Client', config, logger, authenticationClient);
|
|
140
|
+
}
|
|
141
|
+
async getUserCaseLoads(userToken) {
|
|
142
|
+
return this.get({
|
|
143
|
+
path: '/api/users/me/caseloads',
|
|
144
|
+
query: { allCaseloads: true },
|
|
145
|
+
}, asUser(userToken));
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
class CaseLoadService {
|
|
150
|
+
logger;
|
|
151
|
+
prisonApiClient;
|
|
152
|
+
constructor(logger, prisonApiClient) {
|
|
153
|
+
this.logger = logger;
|
|
154
|
+
this.prisonApiClient = prisonApiClient;
|
|
155
|
+
}
|
|
156
|
+
static create({ logger = console, prisonApiConfig, authenticationClient, }) {
|
|
157
|
+
return new CaseLoadService(logger, new PrisonApiClient(logger, prisonApiConfig, authenticationClient));
|
|
158
|
+
}
|
|
159
|
+
retrieveCaseLoadData() {
|
|
160
|
+
return async (req, res, next) => {
|
|
161
|
+
if (!req.session)
|
|
162
|
+
throw new Error('User session required in order to cache case loads');
|
|
163
|
+
if (res.locals.user && res.locals.user.token && res.locals.user.authSource === 'nomis') {
|
|
164
|
+
try {
|
|
165
|
+
// Update cache with values from res.feComponents.sharedData if present
|
|
166
|
+
if (res.locals.feComponents && res.locals.feComponents.sharedData) {
|
|
167
|
+
req.session.caseLoads = res.locals.feComponents.sharedData.caseLoads;
|
|
168
|
+
req.session.activeCaseLoad = res.locals.feComponents.sharedData.activeCaseLoad;
|
|
169
|
+
req.session.activeCaseLoadId = res.locals.feComponents.sharedData.activeCaseLoad?.caseLoadId;
|
|
170
|
+
}
|
|
171
|
+
// If cache is empty, fetch data from Prison API
|
|
172
|
+
if (!req.session.caseLoads) {
|
|
173
|
+
this.logger.info(`Falling back to Prison API to retrieve case loads for: ${res.locals.user.username}`);
|
|
174
|
+
const userCaseLoads = await this.prisonApiClient.getUserCaseLoads(res.locals.user.token);
|
|
175
|
+
const caseLoads = userCaseLoads.filter(caseload => caseload.type !== 'APP');
|
|
176
|
+
const activeCaseLoad = caseLoads.find((caseLoad) => caseLoad.currentlyActive);
|
|
177
|
+
req.session.caseLoads = caseLoads;
|
|
178
|
+
req.session.activeCaseLoad = activeCaseLoad;
|
|
179
|
+
req.session.activeCaseLoadId = activeCaseLoad?.caseLoadId;
|
|
180
|
+
}
|
|
181
|
+
// Populate res.locals.user with values from cache
|
|
182
|
+
res.locals.user.caseLoads = req.session.caseLoads;
|
|
183
|
+
res.locals.user.activeCaseLoad = req.session.activeCaseLoad;
|
|
184
|
+
res.locals.user.activeCaseLoadId = req.session.activeCaseLoadId;
|
|
185
|
+
}
|
|
186
|
+
catch (error) {
|
|
187
|
+
this.logger.error(error, `Failed to retrieve case loads for: ${res.locals.user.username}`);
|
|
188
|
+
return next(error);
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
return next();
|
|
192
|
+
};
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
function retrieveCaseLoadData({ logger = console, prisonApiConfig, authenticationClient, }) {
|
|
197
|
+
const service = CaseLoadService.create({ logger, prisonApiConfig, authenticationClient });
|
|
198
|
+
return () => service.retrieveCaseLoadData();
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
class AllocationsApiClient extends RestClient {
|
|
202
|
+
constructor(logger, config, authenticationClient) {
|
|
203
|
+
super('Allocations API Client', config, logger, authenticationClient);
|
|
204
|
+
}
|
|
205
|
+
async getStaffAllocationPolicies(user) {
|
|
206
|
+
return this.get({
|
|
207
|
+
path: `/prisons/${user.activeCaseLoadId}/staff/${user.userId}/job-classifications`,
|
|
208
|
+
}, asSystem());
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
class AllocationService {
|
|
213
|
+
logger;
|
|
214
|
+
allocationsApiClient;
|
|
215
|
+
constructor(logger, allocationsApiClient) {
|
|
216
|
+
this.logger = logger;
|
|
217
|
+
this.allocationsApiClient = allocationsApiClient;
|
|
218
|
+
}
|
|
219
|
+
static create({ logger = console, allocationsApiConfig, authenticationClient, }) {
|
|
220
|
+
return new AllocationService(logger, new AllocationsApiClient(logger, allocationsApiConfig, authenticationClient));
|
|
221
|
+
}
|
|
222
|
+
retrieveAllocationJobResponsibilities() {
|
|
223
|
+
return async (req, res, next) => {
|
|
224
|
+
if (!req.session)
|
|
225
|
+
throw new Error('User session required in order to cache allocation job responsibilities');
|
|
226
|
+
if (!res.locals.user.token)
|
|
227
|
+
throw new Error('Caseload details needs to be populated before retrieving allocation job responsibilities. Please run retrieveCaseLoadData before retrieveAllocationJobResponsibilities.');
|
|
228
|
+
if (res.locals.user && res.locals.user.authSource === 'nomis') {
|
|
229
|
+
try {
|
|
230
|
+
// Update cache with values from res.feComponents.sharedData if present
|
|
231
|
+
if (res.locals.feComponents && res.locals.feComponents.sharedData) {
|
|
232
|
+
req.session.allocationJobResponsibilities = res.locals.feComponents.sharedData.allocationJobResponsibilities;
|
|
233
|
+
}
|
|
234
|
+
// If cache is empty, fetch data from Prison API
|
|
235
|
+
if (!req.session.allocationJobResponsibilities) {
|
|
236
|
+
this.logger.info(`Falling back to Allocations API to retrieve job responsibilities for: ${res.locals.user.username}`);
|
|
237
|
+
const allocationPolicies = await this.allocationsApiClient.getStaffAllocationPolicies(res.locals.user);
|
|
238
|
+
req.session.allocationJobResponsibilities = allocationPolicies.policies;
|
|
239
|
+
}
|
|
240
|
+
// Populate res.locals.user with values from cache
|
|
241
|
+
res.locals.user.allocationJobResponsibilities = req.session.allocationJobResponsibilities;
|
|
242
|
+
}
|
|
243
|
+
catch (error) {
|
|
244
|
+
this.logger.error(error, `Failed to retrieve allocation job responsibilities for: ${res.locals.user.username}`);
|
|
245
|
+
return next(error);
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
return next();
|
|
249
|
+
};
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
function getFrontendComponents({ logger = console, allocationsApiConfig, authenticationClient, }) {
|
|
254
|
+
const service = AllocationService.create({ logger, allocationsApiConfig, authenticationClient });
|
|
255
|
+
return () => service.retrieveAllocationJobResponsibilities();
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
export { AllocationService, CaseLoadService, ComponentsService, getFrontendComponents$1 as getFrontendComponents, getFrontendComponents as retrieveAllocationJobResponsibilities, retrieveCaseLoadData };
|
|
259
|
+
//# sourceMappingURL=index.esm.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.esm.js","sources":["../src/data/componentApi/componentApiClient.ts","../src/utils/fallbacks.ts","../src/utils/updateCsp.ts","../src/componentsService.ts","../src/middleware/getFrontendComponents.ts","../src/data/prisonApi/prisonApiClient.ts","../src/caseLoadService.ts","../src/middleware/retrieveCaseLoadData.ts","../src/data/allocationsApi/allocationsApiClient.ts","../src/allocationService.ts","../src/middleware/retrieveAllocationJobResponsibilities.ts"],"sourcesContent":["import { ApiConfig, asSystem, AuthenticationClient, RestClient } from '@ministryofjustice/hmpps-rest-client'\nimport AvailableComponent from '../../types/AvailableComponent'\nimport Component from '../../types/Component'\nimport { ConnectDpsComponentLogger } from '../../types/ConnectDpsComponentLogger'\nimport { ComponentsSharedData } from '../../types/HeaderFooterSharedData'\n\nexport type ComponentsApiResponse<T extends AvailableComponent[]> = Record<T[number], Component> & {\n meta: ComponentsSharedData[T[number]] // TODO: rename 'meta' in the API response\n}\n\nexport default class ComponentApiClient extends RestClient {\n constructor(logger: ConnectDpsComponentLogger, config: ApiConfig, authenticationClient: AuthenticationClient) {\n super('Component API Client', config, logger, authenticationClient)\n }\n\n async getComponents<T extends AvailableComponent[]>(userToken: string): Promise<ComponentsApiResponse<T>> {\n return this.get<ComponentsApiResponse<T>>(\n {\n path: `/components`,\n query: 'component=header&component=footer',\n headers: { 'x-user-token': userToken },\n },\n asSystem(),\n )\n }\n}\n","import nunjucks from 'nunjucks'\nimport { HmppsUser } from '../types/HmppsUser'\n\nexport function getFallbackHeader(\n user: HmppsUser | null,\n dpsUrl: string,\n { environmentName, authUrl, supportUrl }: { environmentName?: string; authUrl?: string; supportUrl?: string },\n): string {\n return nunjucks.render('dpsComponents/header-bar.njk', {\n isPrisonUser: !user || user.authSource === 'nomis',\n user,\n dpsUrl,\n environmentName,\n authUrl,\n supportUrl,\n name: initialiseName(user?.displayName),\n })\n}\n\nexport function getFallbackFooter(\n user: HmppsUser | null,\n { authUrl, supportUrl }: { authUrl?: string; supportUrl?: string },\n): string {\n return nunjucks.render('dpsComponents/footer.njk', {\n isPrisonUser: !user || user.authSource === 'nomis',\n supportUrl,\n authUrl,\n })\n}\n\nfunction initialiseName(fullName?: string): string | null {\n if (!fullName) return null\n\n const array = fullName.split(' ')\n return `${array[0][0]}. ${array.reverse()[0]}`\n}\n","import { type Response } from 'express'\n\nexport default function updateCsp(feComponentsUrl: string, res: Response) {\n const csp = res.getHeaders()['content-security-policy']\n const allDirectives = csp?.split(';') ?? []\n const directivesToUpdate = ['script-src', 'style-src', 'img-src', 'font-src']\n\n const updatedCspDirectives = allDirectives.map(directive => {\n // if directive is not in cspToUpdate or includes fe components url already return as is\n if (directive.includes(feComponentsUrl as string) || !directivesToUpdate.some(p => directive.includes(`${p} `)))\n return directive\n\n // if directive is in cspToUpdate and does not have fe components url, add in\n return `${directive} ${feComponentsUrl}`\n })\n\n const requiredAndNotPresent = directivesToUpdate\n .filter(p => !updatedCspDirectives.find(directive => directive.includes(`${p} `)))\n .map(p => `${p} 'self' ${feComponentsUrl}`)\n\n res.set('content-security-policy', [...updatedCspDirectives, ...requiredAndNotPresent].join(';'))\n}\n","import { type NextFunction, type Request, type Response, type RequestHandler } from 'express'\nimport { ApiConfig, AuthenticationClient } from '@ministryofjustice/hmpps-rest-client'\nimport ComponentApiClient from './data/componentApi/componentApiClient'\nimport { getFallbackFooter, getFallbackHeader } from './utils/fallbacks'\nimport updateCsp from './utils/updateCsp'\nimport { HmppsUser } from './types/HmppsUser'\nimport { ConnectDpsComponentLogger } from './types/ConnectDpsComponentLogger'\n\nexport interface FrontentComponentRequestOptions {\n authUrl?: string\n supportUrl?: string\n environmentName?: 'DEV' | 'PRE-PRODUCTION' | 'PRODUCTION'\n includeSharedData?: boolean\n useFallbacksByDefault?: boolean\n}\n\nconst defaultOptions: Partial<FrontentComponentRequestOptions> = {\n includeSharedData: false,\n useFallbacksByDefault: false,\n}\n\nexport default class ComponentsService {\n constructor(\n private readonly logger: ConnectDpsComponentLogger,\n private readonly componentApiConfig: ApiConfig,\n private readonly componentApiClient: ComponentApiClient,\n private readonly dpsUrl: string,\n ) {}\n\n static create({\n logger = console,\n componentApiConfig,\n authenticationClient,\n dpsUrl,\n }: {\n logger?: ConnectDpsComponentLogger\n componentApiConfig: ApiConfig\n authenticationClient: AuthenticationClient\n dpsUrl: string\n }) {\n return new ComponentsService(\n logger,\n componentApiConfig,\n new ComponentApiClient(logger, componentApiConfig, authenticationClient),\n dpsUrl,\n )\n }\n\n getFrontendComponents(requestOptions: FrontentComponentRequestOptions): RequestHandler {\n const requestOptionsWithDefaults = {\n ...defaultOptions,\n ...requestOptions,\n }\n const { includeSharedData, useFallbacksByDefault } = requestOptionsWithDefaults\n\n return async (_req: Request, res: Response, next: NextFunction) => {\n const useFallbacks = (user: HmppsUser | null) => {\n res.locals.feComponents = {\n header: getFallbackHeader(user, this.dpsUrl, {\n environmentName: requestOptionsWithDefaults.environmentName,\n authUrl: requestOptionsWithDefaults.authUrl,\n supportUrl: requestOptionsWithDefaults.supportUrl,\n }),\n footer: getFallbackFooter(user, {\n authUrl: requestOptionsWithDefaults.authUrl,\n supportUrl: requestOptionsWithDefaults.supportUrl,\n }),\n cssIncludes: [],\n jsIncludes: [],\n }\n }\n\n if (!res.locals.user) {\n this.logger.info('Using fallback frontend components when no user in context')\n useFallbacks(null)\n return next()\n }\n\n if (useFallbacksByDefault) {\n this.logger.info('Using fallback frontend components by default')\n useFallbacks(res.locals.user)\n return next()\n }\n\n try {\n const { header, footer, meta } = await this.componentApiClient.getComponents(res.locals.user.token as string)\n\n res.locals.feComponents = {\n header: header.html,\n footer: footer.html,\n cssIncludes: [...header.css, ...footer.css],\n jsIncludes: [...header.javascript, ...footer.javascript],\n }\n\n if (includeSharedData) {\n res.locals.feComponents.sharedData = meta\n }\n\n updateCsp(this.componentApiConfig.url, res)\n\n return next()\n } catch (_error) {\n this.logger.error('Failed to retrieve front end components, using fallbacks')\n useFallbacks(res.locals.user)\n return next()\n }\n }\n }\n}\n","import { type RequestHandler } from 'express'\nimport ComponentsService, { FrontentComponentRequestOptions } from '../componentsService'\n\nexport default function getFrontendComponents({\n logger = console,\n componentApiConfig,\n authenticationClient,\n dpsUrl,\n}: Parameters<typeof ComponentsService.create>[0]): (\n requestOptions: FrontentComponentRequestOptions,\n) => RequestHandler {\n const service = ComponentsService.create({ logger, componentApiConfig, authenticationClient, dpsUrl })\n return requestOptions => service.getFrontendComponents(requestOptions)\n}\n","import { ApiConfig, asUser, AuthenticationClient, RestClient } from '@ministryofjustice/hmpps-rest-client'\nimport CaseLoad from '../../types/CaseLoad'\nimport { ConnectDpsComponentLogger } from '../../types/ConnectDpsComponentLogger'\n\nexport default class PrisonApiClient extends RestClient {\n constructor(logger: ConnectDpsComponentLogger, config: ApiConfig, authenticationClient: AuthenticationClient) {\n super('Prison API Client', config, logger, authenticationClient)\n }\n\n async getUserCaseLoads(userToken: string): Promise<CaseLoad[]> {\n return this.get<CaseLoad[]>(\n {\n path: '/api/users/me/caseloads',\n query: { allCaseloads: true },\n },\n asUser(userToken),\n )\n }\n}\n","import { type RequestHandler } from 'express'\nimport { ApiConfig, AuthenticationClient } from '@ministryofjustice/hmpps-rest-client'\nimport CaseLoad from './types/CaseLoad'\nimport PrisonApiClient from './data/prisonApi/prisonApiClient'\nimport { ConnectDpsComponentLogger } from './types/ConnectDpsComponentLogger'\n\nexport default class CaseLoadService {\n constructor(\n private readonly logger: ConnectDpsComponentLogger,\n private readonly prisonApiClient: PrisonApiClient,\n ) {}\n\n static create({\n logger = console,\n prisonApiConfig,\n authenticationClient,\n }: {\n logger?: ConnectDpsComponentLogger\n prisonApiConfig: ApiConfig\n authenticationClient: AuthenticationClient\n }) {\n return new CaseLoadService(logger, new PrisonApiClient(logger, prisonApiConfig, authenticationClient))\n }\n\n retrieveCaseLoadData(): RequestHandler {\n return async (req, res, next) => {\n if (!req.session) throw new Error('User session required in order to cache case loads')\n\n if (res.locals.user && res.locals.user.token && res.locals.user.authSource === 'nomis') {\n try {\n // Update cache with values from res.feComponents.sharedData if present\n if (res.locals.feComponents && res.locals.feComponents.sharedData) {\n req.session.caseLoads = res.locals.feComponents.sharedData.caseLoads\n req.session.activeCaseLoad = res.locals.feComponents.sharedData.activeCaseLoad\n req.session.activeCaseLoadId = res.locals.feComponents.sharedData.activeCaseLoad?.caseLoadId\n }\n\n // If cache is empty, fetch data from Prison API\n if (!req.session.caseLoads) {\n this.logger.info(`Falling back to Prison API to retrieve case loads for: ${res.locals.user.username}`)\n const userCaseLoads = await this.prisonApiClient.getUserCaseLoads(res.locals.user.token)\n const caseLoads = userCaseLoads.filter(caseload => caseload.type !== 'APP')\n const activeCaseLoad = caseLoads.find((caseLoad: CaseLoad) => caseLoad.currentlyActive)\n\n req.session.caseLoads = caseLoads\n req.session.activeCaseLoad = activeCaseLoad\n req.session.activeCaseLoadId = activeCaseLoad?.caseLoadId\n }\n\n // Populate res.locals.user with values from cache\n res.locals.user.caseLoads = req.session.caseLoads\n res.locals.user.activeCaseLoad = req.session.activeCaseLoad\n res.locals.user.activeCaseLoadId = req.session.activeCaseLoadId\n } catch (error) {\n this.logger.error(error, `Failed to retrieve case loads for: ${res.locals.user.username}`)\n return next(error)\n }\n }\n\n return next()\n }\n }\n}\n","import { type RequestHandler } from 'express'\nimport CaseLoadService from '../caseLoadService'\n\nexport default function retrieveCaseLoadData({\n logger = console,\n prisonApiConfig,\n authenticationClient,\n}: Parameters<typeof CaseLoadService.create>[0]): () => RequestHandler {\n const service = CaseLoadService.create({ logger, prisonApiConfig, authenticationClient })\n return () => service.retrieveCaseLoadData()\n}\n","import { ApiConfig, asSystem, AuthenticationClient, RestClient } from '@ministryofjustice/hmpps-rest-client'\nimport { PrisonUser } from '../../types/HmppsUser'\nimport { AllocationJobResponsibility } from '../../types/AllocationJobResponsibility'\nimport { ConnectDpsComponentLogger } from '../../types/ConnectDpsComponentLogger'\n\nexport default class AllocationsApiClient extends RestClient {\n constructor(logger: ConnectDpsComponentLogger, config: ApiConfig, authenticationClient: AuthenticationClient) {\n super('Allocations API Client', config, logger, authenticationClient)\n }\n\n async getStaffAllocationPolicies(user: PrisonUser): Promise<{ policies: AllocationJobResponsibility[] }> {\n return this.get<{ policies: AllocationJobResponsibility[] }>(\n {\n path: `/prisons/${user.activeCaseLoadId}/staff/${user.userId}/job-classifications`,\n },\n asSystem(),\n )\n }\n}\n","import { type RequestHandler } from 'express'\nimport { ApiConfig, AuthenticationClient } from '@ministryofjustice/hmpps-rest-client'\nimport AllocationsApiClient from './data/allocationsApi/allocationsApiClient'\nimport { ConnectDpsComponentLogger } from './types/ConnectDpsComponentLogger'\n\nexport default class AllocationService {\n constructor(\n private readonly logger: ConnectDpsComponentLogger,\n private readonly allocationsApiClient: AllocationsApiClient,\n ) {}\n\n static create({\n logger = console,\n allocationsApiConfig,\n authenticationClient,\n }: {\n logger?: ConnectDpsComponentLogger\n allocationsApiConfig: ApiConfig\n authenticationClient: AuthenticationClient\n }) {\n return new AllocationService(logger, new AllocationsApiClient(logger, allocationsApiConfig, authenticationClient))\n }\n\n public retrieveAllocationJobResponsibilities(): RequestHandler {\n return async (req, res, next) => {\n if (!req.session) throw new Error('User session required in order to cache allocation job responsibilities')\n if (!res.locals.user.token)\n throw new Error(\n 'Caseload details needs to be populated before retrieving allocation job responsibilities. Please run retrieveCaseLoadData before retrieveAllocationJobResponsibilities.',\n )\n\n if (res.locals.user && res.locals.user.authSource === 'nomis') {\n try {\n // Update cache with values from res.feComponents.sharedData if present\n if (res.locals.feComponents && res.locals.feComponents.sharedData) {\n req.session.allocationJobResponsibilities = res.locals.feComponents.sharedData.allocationJobResponsibilities\n }\n\n // If cache is empty, fetch data from Prison API\n if (!req.session.allocationJobResponsibilities) {\n this.logger.info(\n `Falling back to Allocations API to retrieve job responsibilities for: ${res.locals.user.username}`,\n )\n const allocationPolicies = await this.allocationsApiClient.getStaffAllocationPolicies(res.locals.user)\n req.session.allocationJobResponsibilities = allocationPolicies.policies\n }\n\n // Populate res.locals.user with values from cache\n res.locals.user.allocationJobResponsibilities = req.session.allocationJobResponsibilities\n } catch (error) {\n this.logger.error(\n error,\n `Failed to retrieve allocation job responsibilities for: ${res.locals.user.username}`,\n )\n return next(error)\n }\n }\n\n return next()\n }\n }\n}\n","import { type RequestHandler } from 'express'\nimport AllocationService from '../allocationService'\n\nexport default function getFrontendComponents({\n logger = console,\n allocationsApiConfig,\n authenticationClient,\n}: Parameters<typeof AllocationService.create>[0]): () => RequestHandler {\n const service = AllocationService.create({ logger, allocationsApiConfig, authenticationClient })\n return () => service.retrieveAllocationJobResponsibilities()\n}\n"],"names":["getFrontendComponents"],"mappings":"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"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import { type RequestHandler } from 'express';
|
|
2
|
+
import ComponentsService, { FrontentComponentRequestOptions } from '../componentsService';
|
|
3
|
+
export default function getFrontendComponents({ logger, componentApiConfig, authenticationClient, dpsUrl, }: Parameters<typeof ComponentsService.create>[0]): (requestOptions: FrontentComponentRequestOptions) => RequestHandler;
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import { type RequestHandler } from 'express';
|
|
2
|
+
import AllocationService from '../allocationService';
|
|
3
|
+
export default function getFrontendComponents({ logger, allocationsApiConfig, authenticationClient, }: Parameters<typeof AllocationService.create>[0]): () => RequestHandler;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export type { default as getFrontendComponents } from '../../../middleware/getFrontendComponents';
|
|
@@ -1,4 +1,10 @@
|
|
|
1
|
-
import RequestOptions from '../types/RequestOptions';
|
|
2
1
|
import { HmppsUser } from '../types/HmppsUser';
|
|
3
|
-
export declare function getFallbackHeader(user: HmppsUser | null,
|
|
4
|
-
|
|
2
|
+
export declare function getFallbackHeader(user: HmppsUser | null, dpsUrl: string, { environmentName, authUrl, supportUrl }: {
|
|
3
|
+
environmentName?: string;
|
|
4
|
+
authUrl?: string;
|
|
5
|
+
supportUrl?: string;
|
|
6
|
+
}): string;
|
|
7
|
+
export declare function getFallbackFooter(user: HmppsUser | null, { authUrl, supportUrl }: {
|
|
8
|
+
authUrl?: string;
|
|
9
|
+
supportUrl?: string;
|
|
10
|
+
}): string;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { type Response } from 'express';
|
|
2
|
-
export default function updateCsp(res: Response): void;
|
|
2
|
+
export default function updateCsp(feComponentsUrl: string, res: Response): void;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|