Add SP for SAML SP-IDP-Script-Service connection

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/saml/EditSamlServiceSpBean.java

@@ -19,10 +19,12 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 import edu.kit.scc.webreg.entity.SamlIdpConfigurationEntity;
+import edu.kit.scc.webreg.entity.SamlSpMetadataEntity;
 import edu.kit.scc.webreg.entity.ScriptEntity;
 import edu.kit.scc.webreg.entity.ServiceEntity;
 import edu.kit.scc.webreg.entity.ServiceSamlSpEntity;
 import edu.kit.scc.webreg.service.SamlIdpConfigurationService;
+import edu.kit.scc.webreg.service.SamlSpMetadataService;
 import edu.kit.scc.webreg.service.ScriptService;
 import edu.kit.scc.webreg.service.ServiceSamlSpService;
 import edu.kit.scc.webreg.service.ServiceService;
@@ -39,6 +41,9 @@ public class EditSamlServiceSpBean implements Serializable {
 	@Inject
 	private SamlIdpConfigurationService idpConfigurationService;
 	
+	@Inject
+	private SamlSpMetadataService spMetadataService;
+	
 	@Inject
 	private ServiceService serviceService;
 	
@@ -49,6 +54,7 @@ public class EditSamlServiceSpBean implements Serializable {
 	private List<SamlIdpConfigurationEntity> idpList;
 	private List<ServiceEntity> serviceList;
 	private List<ScriptEntity> scriptList;
+	private List<SamlSpMetadataEntity> samlSpList;
 	
 	private Long id;
 
@@ -56,7 +62,7 @@ public class EditSamlServiceSpBean implements Serializable {
 	}
 	
 	public String save() {
-		entity = service.save(entity);
+		entity = service.save(getEntity());
 		return "list-idp-configs.xhtml?faces-redirect=true";
 	}
 
@@ -121,4 +127,15 @@ public class EditSamlServiceSpBean implements Serializable {
 		this.scriptList = scriptList;
 	}
 
+	public List<SamlSpMetadataEntity> getSamlSpList() {
+		if (samlSpList == null) {
+			samlSpList = spMetadataService.findAll();
+		}
+		return samlSpList;
+	}
+
+	public void setSamlSpList(List<SamlSpMetadataEntity> samlSpList) {
+		this.samlSpList = samlSpList;
+	}
+
 }

bwreg-webapp/src/main/java/edu/kit/scc/webreg/converter/SamlSpMetadataConverter.java

+/*******************************************************************************
+ * Copyright (c) 2014 Michael Simon.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ * 
+ * Contributors:
+ *     Michael Simon - initial
+ ******************************************************************************/
+package edu.kit.scc.webreg.converter;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import edu.kit.scc.webreg.entity.BaseEntity;
+import edu.kit.scc.webreg.service.BaseService;
+import edu.kit.scc.webreg.service.SamlSpMetadataService;
+
+@Named("samlSpMetadataConverter")
+public class SamlSpMetadataConverter extends AbstractConverter {
+
+	private static final long serialVersionUID = 1L;
+
+	@Inject
+	private SamlSpMetadataService service;
+
+	@Override
+	protected BaseService<? extends BaseEntity<Long>, Long> getService() {
+		return service;
+	}
+	
+}

bwreg-webapp/src/main/webapp/admin/saml/edit-saml-service-sp.xhtml

@@ -38,6 +38,14 @@
 	            		var="idp" itemLabel="#{idp.entityId} (id #{idp.id})" itemValue="#{idp}"/>
 	            </p:selectOneMenu>
 
+		        <h:outputText value="#{messages.sp}:"/>
+		        <p:selectOneMenu value="#{editSamlServiceSpBean.entity.sp}"
+		        	converter="#{samlSpMetadataConverter}">
+		        	<f:selectItem itemLabel="No SP set" itemValue="#{null}"/>
+	            	<f:selectItems value="#{editSamlServiceSpBean.samlSpList}" 
+	            		var="sp" itemLabel="#{sp.entityId} (id #{sp.id})" itemValue="#{sp}"/>
+	            </p:selectOneMenu>
+
 		        <h:outputText value="#{messages.service}:"/>
 		        <p:selectOneMenu value="#{editSamlServiceSpBean.entity.service}"
 		        	converter="#{serviceConverter}">
@@ -56,8 +64,8 @@
 
 			</p:panelGrid>
 		
-			<p:commandButton id="cancel" action="#{editSamlServiceSpBean.cancel}" value="#{messages.cancel}"/>
-			<p:commandButton id="save" action="#{editSamlServiceSpBean.save}" value="#{messages.save}"/>
+			<p:commandButton id="cancel" action="#{editSamlServiceSpBean.cancel()}" value="#{messages.cancel}" immediate="true"/>
+			<p:commandButton id="save" action="#{editSamlServiceSpBean.save()}" value="#{messages.save}" ajax="false"/>
 		</p:panel>
 
 	</h:form>

bwreg-webapp/src/main/webapp/admin/saml/list-idp-configs.xhtml

@@ -52,7 +52,8 @@
 					<f:facet name="header">
 						<h:outputText value="#{messages.idp}" />
 					</f:facet>
-					<h:outputText value="#{(empty entity.idp.entityId ? 'All IDPs' : entity.idp.entityId)}" />
+					<h:outputText value="#{(empty entity.idp.entityId ? 'All IDPs' : entity.idp.entityId)}" /><br/>
+					<h:outputText value="#{(empty entity.sp.entityId ? 'No SP set' : entity.sp.entityId)}" />
 				</p:column>		
 				<p:column>
 					<f:facet name="header">