fix(core): Fix lint on SAML controller (no-changelog) (#5967)

* 👕 Fix lint on SAML controller

* 📘 Type request properly

* Update requests.ts

* 🚚 Move type to module

Assuming ACS falls under configuration.

---------

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <netroy@users.noreply.github.com>
This commit is contained in:
Iván Ovejero 2023-04-13 14:14:55 +02:00 committed by GitHub
parent f8f8374506
commit 1a8a9f8ddb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions

View file

@ -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

View file

@ -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;
},
{}
>;
}