Fixing issue Sustainsys#1049 - IDPSSODescriptor element is not deserialized when after RoleDescriptor element of type ApplicationServiceType or SecurityTokenServiceType

Martin Veselý · Martin Veselý · commit c823a599e78b · 2019-01-08T12:36:09.000+01:00
diff --git a/Sustainsys.Saml2/Metadata/MetadataSerializer.cs b/Sustainsys.Saml2/Metadata/MetadataSerializer.cs
@@ -2010,13 +2010,13 @@ protected virtual EntityDescriptor ReadEntityDescriptor(XmlReader reader, Securi
 					{
 						if (String.Equals(extensionType, "ApplicationServiceType", StringComparison.Ordinal))
 						{
-							descriptor.RoleDescriptors.Add(
-								ReadApplicationServiceDescriptor(reader));
+							roleDescriptor = ReadApplicationServiceDescriptor(reader);
+							descriptor.RoleDescriptors.Add(roleDescriptor);
 						}
 						else if (String.Equals(extensionType, "SecurityTokenServiceType", StringComparison.Ordinal))
 						{
-							descriptor.RoleDescriptors.Add(
-								ReadSecurityTokenServiceDescriptor(reader));
+							roleDescriptor = ReadSecurityTokenServiceDescriptor(reader);
+							descriptor.RoleDescriptors.Add(roleDescriptor);
 						}
 					}
 					if (roleDescriptor == null)

Original file line number	Diff line number	Diff line change
`@@ -2010,13 +2010,13 @@ protected virtual EntityDescriptor ReadEntityDescriptor(XmlReader reader, Securi`
`2010`	`2010`	`{`
`2011`	`2011`	`if (String.Equals(extensionType, "ApplicationServiceType", StringComparison.Ordinal))`
`2012`	`2012`	`{`
`2013`		`- descriptor.RoleDescriptors.Add(`
`2014`		`- ReadApplicationServiceDescriptor(reader));`
	`2013`	`+ roleDescriptor = ReadApplicationServiceDescriptor(reader);`
	`2014`	`+ descriptor.RoleDescriptors.Add(roleDescriptor);`
`2015`	`2015`	`}`
`2016`	`2016`	`else if (String.Equals(extensionType, "SecurityTokenServiceType", StringComparison.Ordinal))`
`2017`	`2017`	`{`
`2018`		`- descriptor.RoleDescriptors.Add(`
`2019`		`- ReadSecurityTokenServiceDescriptor(reader));`
	`2018`	`+ roleDescriptor = ReadSecurityTokenServiceDescriptor(reader);`
	`2019`	`+ descriptor.RoleDescriptors.Add(roleDescriptor);`
`2020`	`2020`	`}`
`2021`	`2021`	`}`
`2022`	`2022`	`if (roleDescriptor == null)`