From 75ee8030d28968e64ac46f8e752cb3bf8d50adf5 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Mon, 6 Nov 2017 17:51:55 +0100
Subject: [PATCH] use newer Metadata interface
---
lib/IdPAccountManager/WebRequest.pm | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/lib/IdPAccountManager/WebRequest.pm b/lib/IdPAccountManager/WebRequest.pm
index 5665ee5..f906069 100755
--- a/lib/IdPAccountManager/WebRequest.pm
+++ b/lib/IdPAccountManager/WebRequest.pm
@@ -201,12 +201,11 @@ sub respond {
sub req_account_wizard {
my ($self) = @_;
- my $federation_metadata = IdPAccountManager::SAMLMetadata->new();
+ my $metadata;
eval {
- $federation_metadata->load(
- federation_metadata_file_path =>
- $self->{configuration}->{federation_metadata_file_path}
+ $metadata = IdPAccountManager::SAMLMetadata->new(
+ file => $self->{configuration}->{federation_metadata_file_path}
);
};
if ($EVAL_ERROR) {
@@ -215,14 +214,7 @@ sub req_account_wizard {
return undef;
}
- eval {
- $self->{out} = $federation_metadata->parse();
- };
- if ($EVAL_ERROR) {
- push @{ $self->{out}->{errors} }, "internal";
- $self->{logger}->error("Failed to parse federation metadata: $EVAL_ERROR");
- return undef;
- }
+ $self->{out} = $metadata->parse();
$self->{out}->{subtitle} = 'Select your Service Provider';
--
GitLab