Merge pull request #237 from waterkip/gh-226-lang

Allow setting the xml:lang, defaults to 'en'.

Author: timlegge

lib/Net/SAML2/AttributeConsumingService.pm

@@ -2,6 +2,8 @@ package Net::SAML2::AttributeConsumingService;
 use Moose;
 use XML::Generator;
 use URN::OASIS::SAML2 qw(URN_METADATA NS_METADATA);
+with 'Net::SAML2::Role::XMLLang';
+
 # VERSION
 
 # ABSTRACT: An attribute consuming service object
@@ -66,8 +68,8 @@ sub to_xml {
             index     => $self->index,
             isDefault => $self->default ? 'true' : 'false',
         },
-        $xml->ServiceName($self->namespace, { 'xml:lang' => 'en' }, $self->service_name),
-        $self->_has_service_description ? $xml->ServiceDescription($self->namespace, { 'xml:lang' => 'en' }, $self->service_description) : (),
+        $xml->ServiceName($self->namespace, $self->lang, $self->service_name),
+        $self->_has_service_description ? $xml->ServiceDescription($self->namespace, $self->lang, $self->service_description) : (),
         map { $_->to_xml } @{ $self->attributes },
     );
 }

lib/Net/SAML2/Role/XMLLang.pm

@@ -0,0 +1,34 @@
+package Net::SAML2::Role::XMLLang;
+use Moose::Role;
+
+# VERSION
+
+# ABSTRACT: Common behaviour for XML language settings
+
+use namespace::autoclean;
+
+has _lang => (
+    isa     => 'Str',
+    is      => 'ro',
+    default => 'en',
+    init_arg => 'lang',
+);
+
+=head1 CONSTRUCTOR ARGUMENTS
+
+=over
+
+=item B<lang>
+
+Set the language, defaults to English (C<en>).
+
+=back
+
+=cut
+
+sub lang {
+  my $self = shift;
+  return { 'xml:lang' => $self->_lang }
+}
+
+1;

lib/Net/SAML2/SP.pm

@@ -21,6 +21,8 @@ use URN::OASIS::SAML2 qw(:bindings :urn);
 use XML::Generator;
 use Net::SAML2::Types qw(XsdID);
 
+with 'Net::SAML2::Role::XMLLang';
+
 # ABSTRACT: SAML Service Provider object
 
 =head1 SYNOPSIS
@@ -83,6 +85,10 @@ encryption and signing.
 
 Path to the CA certificate for verification
 
+=item B<lang>
+
+Set the language for the C<md:localizedNameType>, defaults to C<en>.
+
 =item B<org_name>
 
 SP organisation name
@@ -628,15 +634,15 @@ sub generate_metadata {
         $x->Organization(
             $md,
             $x->OrganizationName(
-                $md, { 'xml:lang' => 'en' }, $self->org_name,
+                $md, $self->lang, $self->org_name,
             ),
             $x->OrganizationDisplayName(
-                $md, { 'xml:lang' => 'en' },
+                $md, $self->lang,
                 $self->org_display_name,
             ),
             $x->OrganizationURL(
                 $md,
-                { 'xml:lang' => 'en' },
+                $self->lang,
                 defined($self->org_url) ? $self->org_url : $self->url
             )
         ),

t/02-create-sp.t

@@ -530,6 +530,18 @@ use URN::OASIS::SAML2 qw(:bindings :urn);
     is($child[1]->getAttribute('Name'),       'urn:foo:bar', ".. and name");
     is($child[1]->getAttribute('isRequired'), 'true', ".. and requiredness");
 }
+{
+    my $sp = net_saml2_sp(lang => 'nl');
+    my $xpath = get_xpath(
+        $sp->metadata,
+        md => URN_METADATA,
+        ds => URN_SIGNATURE,
+    );
+
+    my $org  = get_single_node_ok($xpath,  '//md:OrganizationName');
+    is($org->getAttribute("xml:lang"),
+        "nl", ".. and xml:lang is set");
+}
 
 {
     my $sp = net_saml2_sp();

t/28-attribute-consuming-service.t

@@ -40,10 +40,19 @@ $acs = Net::SAML2::AttributeConsumingService->new(
     service_description => "Some thing",
     index               => 1,
     default             => 1,
+    lang => 'nl',
 );
 $acs->add_attribute($attr);
 
 $xpath = get_xpath($acs->to_xml, md => URN_METADATA);
+$node
+  = get_single_node_ok($xpath, '/md:AttributeConsumingService/md:ServiceName');
+is(
+    $node->getAttribute('xml:lang'),
+    "nl",
+    ".. and has the correct xml:lang"
+);
+
 $node  = get_single_node_ok($xpath, '/md:AttributeConsumingService');
 is($node->getAttribute('index'), '1', ".. with the correct index");
 ok($node->getAttribute('isDefault'), ".. and is the default");
@@ -59,4 +68,5 @@ $node = get_single_node_ok($xpath,
     '/md:AttributeConsumingService/md:ServiceDescription');
 is($node->textContent(), "Some thing", ".. and has the correct content");
 
+
 done_testing;