From 1a8a9f8ddbf248752e04284f18891b40a3039201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Thu, 13 Apr 2023 14:14:55 +0200 Subject: [PATCH] fix(core): Fix lint on SAML controller (no-changelog) (#5967) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * :shirt: Fix lint on SAML controller * :blue_book: Type request properly * Update requests.ts * :truck: Move type to module Assuming ACS falls under configuration. --------- Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ --- .../cli/src/sso/saml/routes/saml.controller.ee.ts | 10 +++++++--- packages/cli/src/sso/saml/types/requests.ts | 12 +++++++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts b/packages/cli/src/sso/saml/routes/saml.controller.ee.ts index 1dfe6ded82..7ced030b0f 100644 --- a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts +++ b/packages/cli/src/sso/saml/routes/saml.controller.ee.ts @@ -83,7 +83,7 @@ export class SamlController { * Assertion Consumer Service endpoint */ @Get(SamlUrls.acs, { middlewares: [samlLicensedMiddleware] }) - async acsGet(req: express.Request, res: express.Response) { + async acsGet(req: SamlConfiguration.AcsRequest, res: express.Response) { return this.acsHandler(req, res, 'redirect'); } @@ -92,7 +92,7 @@ export class SamlController { * Assertion Consumer Service endpoint */ @Post(SamlUrls.acs, { middlewares: [samlLicensedMiddleware] }) - async acsPost(req: express.Request, res: express.Response) { + async acsPost(req: SamlConfiguration.AcsRequest, res: express.Response) { return this.acsHandler(req, res, 'post'); } @@ -101,7 +101,11 @@ export class SamlController { * Available if SAML is licensed, even if not enabled to run connection tests * For test connections, returns status 202 if SAML is not enabled */ - private async acsHandler(req: express.Request, res: express.Response, binding: SamlLoginBinding) { + private async acsHandler( + req: SamlConfiguration.AcsRequest, + res: express.Response, + binding: SamlLoginBinding, + ) { const loginResult = await this.samlService.handleSamlLogin(req, binding); if (loginResult) { // return attributes if this is a test connection diff --git a/packages/cli/src/sso/saml/types/requests.ts b/packages/cli/src/sso/saml/types/requests.ts index 4d58afb2dd..3d3e4125fc 100644 --- a/packages/cli/src/sso/saml/types/requests.ts +++ b/packages/cli/src/sso/saml/types/requests.ts @@ -1,7 +1,17 @@ -import type { AuthenticatedRequest } from '@/requests'; +import type { AuthenticatedRequest, AuthlessRequest } from '@/requests'; import type { SamlPreferences } from './samlPreferences'; export declare namespace SamlConfiguration { type Update = AuthenticatedRequest<{}, {}, SamlPreferences, {}>; type Toggle = AuthenticatedRequest<{}, {}, { loginEnabled: boolean }, {}>; + + type AcsRequest = AuthlessRequest< + {}, + {}, + { + // eslint-disable-next-line @typescript-eslint/naming-convention + RelayState?: string; + }, + {} + >; }