mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

delete unnecessary code

Browse source
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™ 2024-10-22 13:51:24 +02:00
parent 39e6432b05
commit 44e806cf1f
No known key found for this signature in database
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/cli/src/sso/saml/routes/saml.controller.ee.ts
View file

@ -15,7 +15,7 @@ import {
samlLicensedAndEnabledMiddleware, samlLicensedAndEnabledMiddleware,
samlLicensedMiddleware, samlLicensedMiddleware,
} from '../middleware/saml-enabled-middleware'; } from '../middleware/saml-enabled-middleware';
import { isConnectionTestRequest, isSamlLicensedAndEnabled } from '../saml-helpers'; import { isSamlLicensedAndEnabled } from '../saml-helpers';
import { SamlService } from '../saml.service.ee'; import { SamlService } from '../saml.service.ee';
import { import {
getServiceProviderConfigTestReturnUrl, getServiceProviderConfigTestReturnUrl,
@ -111,10 +111,11 @@ export class SamlController {
res: express.Response, res: express.Response,
binding: SamlLoginBinding, binding: SamlLoginBinding,
) { ) {
const isConnectionTestRequest = req.body.RelayState === getServiceProviderConfigTestReturnUrl();
try { try {
const loginResult = await this.samlService.handleSamlLogin(req, binding); const loginResult = await this.samlService.handleSamlLogin(req, binding);
// if RelayState is set to the test connection Url, this is a test connection // if RelayState is set to the test connection Url, this is a test connection
if (isConnectionTestRequest(req)) { if (isConnectionTestRequest) {
if (loginResult.authenticatedUser) { if (loginResult.authenticatedUser) {
return res.render('sso/saml-connection-test-success', loginResult.attributes); return res.render('sso/saml-connection-test-success', loginResult.attributes);
} else { } else {
@ -149,7 +150,7 @@ export class SamlController {
}); });
throw new AuthError('SAML Authentication failed'); throw new AuthError('SAML Authentication failed');
} catch (error) { } catch (error) {
if (isConnectionTestRequest(req)) { if (isConnectionTestRequest) {
return res.render('sso/saml-connection-test-failed', { message: (error as Error).message }); return res.render('sso/saml-connection-test-failed', { message: (error as Error).message });
} }
this.eventService.emit('user-login-failed', { this.eventService.emit('user-login-failed', {

6
packages/cli/src/sso/saml/saml-helpers.ts
View file

@ -13,8 +13,6 @@ import { License } from '@/license';
import { PasswordUtility } from '@/services/password.utility'; import { PasswordUtility } from '@/services/password.utility';
import { SAML_LOGIN_ENABLED, SAML_LOGIN_LABEL } from './constants'; 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 { SamlAttributeMapping } from './types/saml-attribute-mapping';
import type { SamlPreferences } from './types/saml-preferences'; import type { SamlPreferences } from './types/saml-preferences';
import type { SamlUserAttributes } from './types/saml-user-attributes'; import type { SamlUserAttributes } from './types/saml-user-attributes';
@ -164,7 +162,3 @@ export function getMappedSamlAttributesFromFlowResult(
} }
return result; return result;
} }
export function isConnectionTestRequest(req: SamlConfiguration.AcsRequest): boolean {
return req.body.RelayState === getServiceProviderConfigTestReturnUrl();
}