From fa4db2c42084506a89e28a3fba36221a510dc3b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A8=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E3=82=85?=
 <17376330+u1-liquid@users.noreply.github.com>
Date: Sun, 17 Mar 2024 23:34:59 +0900
Subject: [PATCH] =?UTF-8?q?fix(SSO):=20SAML=E8=AA=8D=E8=A8=BC=E3=81=AE?=
 =?UTF-8?q?=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/src/server/sso/SAMLIdentifyProviderService.ts   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/server/sso/SAMLIdentifyProviderService.ts b/packages/backend/src/server/sso/SAMLIdentifyProviderService.ts
index fef53a5e00..915f3bfd1a 100644
--- a/packages/backend/src/server/sso/SAMLIdentifyProviderService.ts
+++ b/packages/backend/src/server/sso/SAMLIdentifyProviderService.ts
@@ -81,7 +81,7 @@ export class SAMLIdentifyProviderService {
 		const nodes = {
 			'md:EntityDescriptor': {
 				'@xmlns:md': 'urn:oasis:names:tc:SAML:2.0:metadata',
-				'@entityID': this.config.url,
+				'@entityID': `${this.config.url}/sso/saml/${provider.id}/metadata`,
 				'@validUntil': tenYearsLater,
 				'md:IDPSSODescriptor': {
 					'@WantAuthnRequestsSigned': provider.wantAuthnRequestsSigned,
@@ -460,7 +460,7 @@ export class SAMLIdentifyProviderService {
 								'@Destination': ssoServiceProvider.acsUrl,
 								'@InResponseTo': this.get(flowResult, 'extract.request.id', ''),
 								'saml:Issuer': {
-									'#text': ssoServiceProvider.issuer,
+									'#text': `${this.config.url}/sso/saml/${ssoServiceProvider.id}/metadata`,
 								},
 								'samlp:Status': {
 									'samlp:StatusCode': {
@@ -474,7 +474,7 @@ export class SAMLIdentifyProviderService {
 									'@Version': '2.0',
 									'@IssueInstant': now,
 									'saml:Issuer': {
-										'#text': ssoServiceProvider.issuer,
+										'#text': `${this.config.url}/sso/saml/${ssoServiceProvider.id}/metadata`,
 									},
 									'saml:Subject': {
 										'saml:NameID': profile.emailVerified