From 85958e0967bde7fa75ee8fee34b4e21aa8f6d49d 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?= Date: Tue, 22 Oct 2024 13:22:43 +0200 Subject: [PATCH] move sso templates into a folder --- .../sso/saml/routes/__tests__/saml.controller.ee.test.ts | 9 ++++++--- packages/cli/src/sso/saml/routes/saml.controller.ee.ts | 6 +++--- .../{ => sso}/saml-connection-test-failed.handlebars | 0 .../{ => sso}/saml-connection-test-success.handlebars | 0 4 files changed, 9 insertions(+), 6 deletions(-) rename packages/cli/templates/{ => sso}/saml-connection-test-failed.handlebars (100%) rename packages/cli/templates/{ => sso}/saml-connection-test-success.handlebars (100%) diff --git a/packages/cli/src/sso/saml/routes/__tests__/saml.controller.ee.test.ts b/packages/cli/src/sso/saml/routes/__tests__/saml.controller.ee.test.ts index c4a33ed441..1cd57c4bcc 100644 --- a/packages/cli/src/sso/saml/routes/__tests__/saml.controller.ee.test.ts +++ b/packages/cli/src/sso/saml/routes/__tests__/saml.controller.ee.test.ts @@ -44,7 +44,7 @@ describe('Test views', () => { await controller.acsPost(req, res); - expect(res.render).toBeCalledWith('saml-connection-test-success', attributes); + expect(res.render).toBeCalledWith('sso/saml-connection-test-success', attributes); }); test('Should render failure with template', async () => { @@ -60,7 +60,10 @@ describe('Test views', () => { await controller.acsPost(req, res); - expect(res.render).toBeCalledWith('saml-connection-test-failed', { message: '', attributes }); + expect(res.render).toBeCalledWith('sso/saml-connection-test-failed', { + message: '', + attributes, + }); }); test('Should render error with template', async () => { @@ -72,6 +75,6 @@ describe('Test views', () => { await controller.acsPost(req, res); - expect(res.render).toBeCalledWith('saml-connection-test-failed', { message: 'Test Error' }); + expect(res.render).toBeCalledWith('sso/saml-connection-test-failed', { message: 'Test Error' }); }); }); 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 c7b954914b..e7c73200b6 100644 --- a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts +++ b/packages/cli/src/sso/saml/routes/saml.controller.ee.ts @@ -119,9 +119,9 @@ export class SamlController { // if RelayState is set to the test connection Url, this is a test connection if (isConnectionTestRequest(req)) { if (loginResult.authenticatedUser) { - return res.render('saml-connection-test-success', loginResult.attributes); + return res.render('sso/saml-connection-test-success', loginResult.attributes); } else { - return res.render('saml-connection-test-failed', { + return res.render('sso/saml-connection-test-failed', { message: '', attributes: loginResult.attributes, }); @@ -154,7 +154,7 @@ export class SamlController { return sendErrorResponse(res, new AuthError('SAML Authentication failed')); } catch (error) { if (isConnectionTestRequest(req)) { - return res.render('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', { userEmail: 'unknown', diff --git a/packages/cli/templates/saml-connection-test-failed.handlebars b/packages/cli/templates/sso/saml-connection-test-failed.handlebars similarity index 100% rename from packages/cli/templates/saml-connection-test-failed.handlebars rename to packages/cli/templates/sso/saml-connection-test-failed.handlebars diff --git a/packages/cli/templates/saml-connection-test-success.handlebars b/packages/cli/templates/sso/saml-connection-test-success.handlebars similarity index 100% rename from packages/cli/templates/saml-connection-test-success.handlebars rename to packages/cli/templates/sso/saml-connection-test-success.handlebars