From 44e806cf1f91d61fd121f6205a8077c23fdb0c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <aditya@netroy.in>
Date: Tue, 22 Oct 2024 13:51:24 +0200
Subject: [PATCH] delete unnecessary code

---
 packages/cli/src/sso/saml/routes/saml.controller.ee.ts | 7 ++++---
 packages/cli/src/sso/saml/saml-helpers.ts              | 6 ------
 2 files changed, 4 insertions(+), 9 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 0f3b72fc62..a80b247b03 100644
--- a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
+++ b/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
@@ -15,7 +15,7 @@ import {
 	samlLicensedAndEnabledMiddleware,
 	samlLicensedMiddleware,
 } from '../middleware/saml-enabled-middleware';
-import { isConnectionTestRequest, isSamlLicensedAndEnabled } from '../saml-helpers';
+import { isSamlLicensedAndEnabled } from '../saml-helpers';
 import { SamlService } from '../saml.service.ee';
 import {
 	getServiceProviderConfigTestReturnUrl,
@@ -111,10 +111,11 @@ export class SamlController {
 		res: express.Response,
 		binding: SamlLoginBinding,
 	) {
+		const isConnectionTestRequest = req.body.RelayState === getServiceProviderConfigTestReturnUrl();
 		try {
 			const loginResult = await this.samlService.handleSamlLogin(req, binding);
 			// if RelayState is set to the test connection Url, this is a test connection
-			if (isConnectionTestRequest(req)) {
+			if (isConnectionTestRequest) {
 				if (loginResult.authenticatedUser) {
 					return res.render('sso/saml-connection-test-success', loginResult.attributes);
 				} else {
@@ -149,7 +150,7 @@ export class SamlController {
 			});
 			throw new AuthError('SAML Authentication failed');
 		} catch (error) {
-			if (isConnectionTestRequest(req)) {
+			if (isConnectionTestRequest) {
 				return res.render('sso/saml-connection-test-failed', { message: (error as Error).message });
 			}
 			this.eventService.emit('user-login-failed', {
diff --git a/packages/cli/src/sso/saml/saml-helpers.ts b/packages/cli/src/sso/saml/saml-helpers.ts
index 996e17b359..f3327e0f1a 100644
--- a/packages/cli/src/sso/saml/saml-helpers.ts
+++ b/packages/cli/src/sso/saml/saml-helpers.ts
@@ -13,8 +13,6 @@ import { License } from '@/license';
 import { PasswordUtility } from '@/services/password.utility';
 
 import { SAML_LOGIN_ENABLED, SAML_LOGIN_LABEL } from './constants';
-import { getServiceProviderConfigTestReturnUrl } from './service-provider.ee';
-import type { SamlConfiguration } from './types/requests';
 import type { SamlAttributeMapping } from './types/saml-attribute-mapping';
 import type { SamlPreferences } from './types/saml-preferences';
 import type { SamlUserAttributes } from './types/saml-user-attributes';
@@ -164,7 +162,3 @@ export function getMappedSamlAttributesFromFlowResult(
 	}
 	return result;
 }
-
-export function isConnectionTestRequest(req: SamlConfiguration.AcsRequest): boolean {
-	return req.body.RelayState === getServiceProviderConfigTestReturnUrl();
-}