Cherry pick branch 'genexuslabs:gamsaml20' into beta

Author: sgrampone

gamsaml20/src/main/java/com/genexus/saml20/utils/PolicyFormat.java

@@ -105,7 +105,6 @@ public static Document createLoginRequest(String id, String destination, String
 		String samlp = "urn:oasis:names:tc:SAML:2.0:protocol";
 		String saml = "urn:oasis:names:tc:SAML:2.0:assertion";
 
-		PolicyFormat pf = PolicyFormat.getPolicyFormat(policyFormat);
 
 		DocumentBuilder builder = createDocumentBuilder();
 
@@ -126,8 +125,7 @@ public static Document createLoginRequest(String id, String destination, String
 		request.appendChild(issuerElem);
 
 		org.w3c.dom.Element policy = doc.createElementNS(samlp, "saml2p:NameIDPolicy");
-		assert pf != null;
-		policy.setAttribute("Format", PolicyFormat.getPolicyFormatXmlValue(pf));
+		policy.setAttribute("Format", policyFormat.trim());
 		policy.setAttribute("AllowCreate", "true");
 		policy.setAttribute("SPNameQualifier", spname);
 		request.appendChild(policy);
@@ -220,7 +218,7 @@ public static String getLoginAttribute(Document doc, String name) {
 
 		for (int i = 0; i < nodes.getLength(); i++) {
 			if (nodes.item(i).getAttributes().getNamedItem("Name").getNodeValue().equals(name)) {
-				String value = getAttributeContent(nodes.item(i));
+				String value = nodes.item(i).getTextContent() == null ? getAttributeContent(nodes.item(i)): nodes.item(i).getTextContent();
 				logger.debug(MessageFormat.format("getLoginAttribute -- attribute name: {0}, value: {1}", name, value));
 				return value;
 			}