Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: #EXUI-2656: passport js rollout needs serviceOverride flag #259

Merged
merged 10 commits into from
Jan 27, 2025
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hmcts/rpx-xui-node-lib",
"version": "2.30.1",
"version": "2.30.2",
"description": "Common nodejs library components for XUI",
"main": "dist/index",
"types": "dist/index.d.ts",
Expand Down
1 change: 1 addition & 0 deletions src/auth/models/authOptions.interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export interface AuthOptions {
allowRolesRegex?: string
useCSRF?: boolean
routeCredential?: RouteCredential
serviceOverride?: boolean
}

export interface RouteCredential {
Expand Down
2 changes: 2 additions & 0 deletions src/auth/models/strategy.class.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export abstract class Strategy extends events.EventEmitter {
allowRolesRegex: '.',
useCSRF: true,
routeCredential: undefined,
serviceOverride: false,
}

protected constructor(strategyName: string, router: Router, logger: XuiLogger = getLogger('auth:strategy')) {
Expand Down Expand Up @@ -69,6 +70,7 @@ export abstract class Strategy extends events.EventEmitter {
customHeaders: Joi.any(),
allowRolesRegex: Joi.string(),
useCSRF: Joi.bool(),
serviceOverride: Joi.bool(),
routeCredential: Joi.any(),
})
const { error } = schema.validate(options)
Expand Down
10 changes: 7 additions & 3 deletions src/auth/oidc/models/openid.class.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,16 @@ export class OpenID extends AuthStrategy {
}

public discover = async (): Promise<Issuer<Client>> => {
this.logger.log(`discovering endpoint: ${this.options.discoveryEndpoint}`)
this.logger.info(`discovering endpoint: ${this.options.discoveryEndpoint}`)
const issuer = await this.discoverIssuer()

const metadata = issuer.metadata
metadata.issuer = this.options.issuerURL

this.logger.info(`start serviceOverride check`)
if (!this.options.serviceOverride) {
this.logger.info(`issuerURL: ${this.options?.issuerURL}`)
metadata.issuer = this.options.issuerURL
}
this.logger.info(`end serviceOverride check`)
this.logger.log('discover metadata', metadata)

return this.newIssuer(metadata)
Expand Down
Loading