Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndersAbel
AndersAbel committed Jun 25, 2019
1 parent 30f8a5f commit b069256
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 48 deletions.
46 changes: 23 additions & 23 deletions Sustainsys.Saml2/SAML2P/Saml2RequestBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@ public string MessageName
/// </summary>
public EntityId Issuer { get; set; }

/// <summary>
/// The additional content to append within an Extensions element.
/// </summary>
public List<XElement> ExtensionContents { get; } = new List<XElement>();
/// <summary>
/// The additional content to append within an Extensions element.
/// </summary>
public List<XElement> ExtensionContents { get; } = new List<XElement>();

/// <summary>
/// The SAML2 request name
/// </summary>
protected abstract string LocalName { get; }
/// <summary>
/// The SAML2 request name
/// </summary>
protected abstract string LocalName { get; }

/// <summary>
/// Creates XNodes for the fields of the Saml2RequestBase class. These
Expand All @@ -115,11 +115,11 @@ protected IEnumerable<XObject> ToXNodes()
yield return new XElement(Saml2Namespaces.Saml2 + "Issuer", Issuer.Id);
}

if (ExtensionContents != null && ExtensionContents.Count > 0)
{
yield return new XElement(Saml2Namespaces.Saml2P + "Extensions", ExtensionContents);
}
}
if (ExtensionContents != null && ExtensionContents.Count > 0)
{
yield return new XElement(Saml2Namespaces.Saml2P + "Extensions", ExtensionContents);
}
}

/// <summary>
/// Reads the request properties present in Saml2RequestBase
Expand All @@ -136,25 +136,25 @@ protected void ReadBaseProperties(XmlElement xml)
Id = new Saml2Id(xml.Attributes["ID"].Value);

var destination = xml.Attributes["Destination"];
if(destination != null)
if (destination != null)
{
DestinationUrl = new Uri(destination.Value);
}

var issuerNode = xml["Issuer", Saml2Namespaces.Saml2Name];
if(issuerNode != null)
if (issuerNode != null)
{
Issuer = new EntityId(issuerNode.InnerXml);
}

var extensionsNode = xml["Extensions", Saml2Namespaces.Saml2PName];
if (extensionsNode != null && extensionsNode.HasChildNodes)
{
XElement converted = XElement.Parse(extensionsNode.OuterXml);
ExtensionContents.Clear();
ExtensionContents.AddRange(converted.Elements());
}
}
var extensionsNode = xml["Extensions", Saml2Namespaces.Saml2PName];
if (extensionsNode != null && extensionsNode.HasChildNodes)
{
XElement converted = XElement.Parse(extensionsNode.OuterXml);
ExtensionContents.Clear();
ExtensionContents.AddRange(converted.Elements());
}
}

private void ValidateCorrectDocument(XmlElement xml)
{
Expand Down
52 changes: 27 additions & 25 deletions Tests/Tests.Shared/Saml2P/Saml2AuthenticationRequestTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ public void Saml2AuthenticationRequest_AssertionConsumerServiceUrl()
[TestMethod]
public void Saml2AuthenticationRequest_ForceAuthentication_OmittedIfFalse()
{
var subject = new Saml2AuthenticationRequest() {
var subject = new Saml2AuthenticationRequest()
{
ForceAuthentication = false
}.ToXElement();

Expand All @@ -72,28 +73,29 @@ public void Saml2AuthenticationRequest_ForceAuthentication_OmittedIfFalse()
[TestMethod]
public void Saml2AuthenticationRequest_ForceAuthentication()
{
var subject = new Saml2AuthenticationRequest() {
var subject = new Saml2AuthenticationRequest()
{
ForceAuthentication = true
}.ToXElement();

subject.Should().NotBeNull().And.Subject.Attribute("ForceAuthn")
.Should().NotBeNull().And.Subject.Value.Should().Be("true");
}

[TestMethod]
public void Saml2AuthenticationRequest_Extensions()
{
var request = new Saml2AuthenticationRequest();
request.ExtensionContents.Add(new XElement(XNamespace.Get("test") + "aditional"));
var subject = request.ToXElement();

subject.Should().NotBeNull().And.Subject
.Element(Saml2Namespaces.Saml2P + "Extensions").Should().NotBeNull().And.Subject
.Elements().Should().HaveCount(1).And.Subject
.First().Name.LocalName.Should().Be("aditional");
}
[TestMethod]
public void Saml2AuthenticationRequest_Extensions()
{
var request = new Saml2AuthenticationRequest();
request.ExtensionContents.Add(new XElement(XNamespace.Get("test") + "aditional"));
var subject = request.ToXElement();

subject.Should().NotBeNull().And.Subject
.Element(Saml2Namespaces.Saml2P + "Extensions").Should().NotBeNull().And.Subject
.Elements().Should().HaveCount(1).And.Subject
.First().Name.LocalName.Should().Be("aditional");
}

[TestMethod]
[TestMethod]
public void Saml2AuthenticationRequest_Read()
{
var xmlData = @"<?xml version=""1.0"" encoding=""UTF-8""?>
Expand Down Expand Up @@ -231,10 +233,10 @@ public void Saml2AuthenticationRequest_Read_NoFormat()
subject.NameIdPolicy.Format.Should().Be(NameIdFormat.NotConfigured);
}

[TestMethod]
public void Saml2AuthenticationRequest_Read_Extensions()
{
var xmlData = @"<?xml version=""1.0"" encoding=""UTF-8""?>
[TestMethod]
public void Saml2AuthenticationRequest_Read_Extensions()
{
var xmlData = @"<?xml version=""1.0"" encoding=""UTF-8""?>
<samlp:AuthnRequest
xmlns:samlp=""urn:oasis:names:tc:SAML:2.0:protocol""
xmlns:saml=""urn:oasis:names:tc:SAML:2.0:assertion""
Expand All @@ -251,12 +253,12 @@ public void Saml2AuthenticationRequest_Read_Extensions()
</samlp:AuthnRequest>
";

var subject = Saml2AuthenticationRequest.Read(xmlData, null);
subject.ExtensionContents.Should().HaveCount(1);
subject.ExtensionContents[0].ToString().Should().BeEquivalentTo(@"<additional xmlns=""testurn:test"" />");
}
var subject = Saml2AuthenticationRequest.Read(xmlData, null);
subject.ExtensionContents.Should().HaveCount(1);
subject.ExtensionContents[0].ToString().Should().BeEquivalentTo(@"<additional xmlns=""testurn:test"" />");
}

[TestMethod]
[TestMethod]
public void Saml2AuthenticationRequest_ToXElement_AddsElementSaml2NameIdPolicy_ForAllowCreate()
{
var subject = new Saml2AuthenticationRequest()
Expand Down Expand Up @@ -343,7 +345,7 @@ public void Saml2AuthenticationRequest_ToXElement_Scoping_ZeroProxyCount_Attribu
ProxyCount = 0
}
};

var actual = subject.ToXElement().Element(Saml2Namespaces.Saml2P + "Scoping");

var expected = new XElement(Saml2Namespaces.Saml2P + "root",
Expand Down

0 comments on commit b069256

Please sign in to comment.