update SP-Identifier for Applikation-Register communication to combination of MOA EntityID and PublicUrlPrefix to make applications unique on AppReg side

1 files changed, 18 insertions, 0 deletions

diff --git a/id/server/modules/moa-id-module-E-ID_connector/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidproxyauth/utils/Utils.java b/id/server/modules/moa-id-module-E-ID_connector/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidproxyauth/utils/Utils.java
index cd578d373..fefd3ec73 100644
--- a/id/server/modules/moa-id-module-E-ID_connector/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidproxyauth/utils/Utils.java
+++ b/id/server/modules/moa-id-module-E-ID_connector/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidproxyauth/utils/Utils.java
@@ -14,6 +14,24 @@ import at.gv.egovernment.moa.logging.Logger;
 
 public class Utils {
 
+	public static final String PARAM_APPREG_SP_ID = "?sp=";
+	
+	public static String getEidSystemApplicationId(ISPConfiguration spConfiguration, String authUrl) {
+		StringBuilder builder = new StringBuilder();
+		if (authUrl.endsWith("/")) {
+			builder.append(authUrl.substring(0, authUrl.length() - 1));
+			
+		} else {
+			builder.append(authUrl);
+			
+		}		
+		builder.append(EIDProxyAuthConstants.ENDPOINT_METADATA);
+		builder.append(PARAM_APPREG_SP_ID);
+		builder.append(spConfiguration.getUniqueIdentifier());		
+		return builder.toString();
+		
+	}
+	
 	public static String getEIDSystemEntityId(ISPConfiguration spConfiguration, IConfiguration authConfig) {
 		//load from service-provider configuration
 		String msNodeEntityID = spConfiguration.getConfigurationValue(MOAIDConfigurationConstants.SERVICE_EXTERNAL_EID_SYSTEM_SERVICE_URL);