From 4c93ca7256174c8c5695d323b1b235eac46857b6 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Fri, 8 Dec 2017 15:02:10 +0100
Subject: [PATCH] use a shorter namespace
---
bin/account-manager.cgi.in | 4 +-
bin/account-manager.pl.in | 50 +++++++++----------
.../AuthenticationToken.pm | 4 +-
.../AuthenticationToken/Manager.pm | 15 ++++++
.../DB.pm | 2 +-
lib/AccountManager/DB/Object.pm | 13 +++++
.../SAMLMetadata.pm | 6 +--
.../ServiceProvider.pm | 4 +-
lib/AccountManager/ServiceProvider/Manager.pm | 15 ++++++
.../TestAccount.pm | 4 +-
lib/AccountManager/TestAccount/Manager.pm | 15 ++++++
.../Tools.pm | 4 +-
.../WebRequest.pm | 44 ++++++++--------
.../AuthenticationToken/Manager.pm | 15 ------
lib/IdPAccountManager/DB/Object.pm | 13 -----
.../ServiceProvider/Manager.pm | 15 ------
lib/IdPAccountManager/TestAccount/Manager.pm | 15 ------
lib/Makefile.am | 22 ++++----
t/samlmetadata.t | 16 +++---
19 files changed, 138 insertions(+), 138 deletions(-)
rename lib/{IdPAccountManager => AccountManager}/AuthenticationToken.pm (91%)
create mode 100644 lib/AccountManager/AuthenticationToken/Manager.pm
rename lib/{IdPAccountManager => AccountManager}/DB.pm (95%)
create mode 100644 lib/AccountManager/DB/Object.pm
rename lib/{IdPAccountManager => AccountManager}/SAMLMetadata.pm (98%)
rename lib/{IdPAccountManager => AccountManager}/ServiceProvider.pm (91%)
create mode 100644 lib/AccountManager/ServiceProvider/Manager.pm
rename lib/{IdPAccountManager => AccountManager}/TestAccount.pm (98%)
create mode 100644 lib/AccountManager/TestAccount/Manager.pm
rename lib/{IdPAccountManager => AccountManager}/Tools.pm (96%)
rename lib/{IdPAccountManager => AccountManager}/WebRequest.pm (93%)
delete mode 100644 lib/IdPAccountManager/AuthenticationToken/Manager.pm
delete mode 100644 lib/IdPAccountManager/DB/Object.pm
delete mode 100644 lib/IdPAccountManager/ServiceProvider/Manager.pm
delete mode 100644 lib/IdPAccountManager/TestAccount/Manager.pm
diff --git a/bin/account-manager.cgi.in b/bin/account-manager.cgi.in
index b57bf93..31a4fdf 100755
--- a/bin/account-manager.cgi.in
+++ b/bin/account-manager.cgi.in
@@ -7,11 +7,11 @@ use lib qw(@modulesdir@);
use Config::Tiny;
-use IdPAccountManager::WebRequest;
+use AccountManager::WebRequest;
my $configuration = Config::Tiny->read('@sysconfdir@/manager.conf');
-my $request = IdPAccountManager::WebRequest->new(
+my $request = AccountManager::WebRequest->new(
configuration => $configuration
);
$request->run();
diff --git a/bin/account-manager.pl.in b/bin/account-manager.pl.in
index 79e6291..abf2d46 100755
--- a/bin/account-manager.pl.in
+++ b/bin/account-manager.pl.in
@@ -15,14 +15,14 @@ use Getopt::Long qw(:config auto_help);
use Log::Any::Adapter;
use Pod::Usage;
-use IdPAccountManager::AuthenticationToken;
-use IdPAccountManager::AuthenticationToken::Manager;
-use IdPAccountManager::ServiceProvider;
-use IdPAccountManager::ServiceProvider::Manager;
-use IdPAccountManager::TestAccount;
-use IdPAccountManager::TestAccount::Manager;
-use IdPAccountManager::SAMLMetadata;
-use IdPAccountManager::Tools;
+use AccountManager::AuthenticationToken;
+use AccountManager::AuthenticationToken::Manager;
+use AccountManager::ServiceProvider;
+use AccountManager::ServiceProvider::Manager;
+use AccountManager::TestAccount;
+use AccountManager::TestAccount::Manager;
+use AccountManager::SAMLMetadata;
+use AccountManager::Tools;
my %options;
GetOptions(
@@ -49,7 +49,7 @@ pod2usage(
my $configuration = Config::Tiny->read('@sysconfdir@/manager.conf');
-IdPAccountManager::DB->register_db(
+AccountManager::DB->register_db(
driver => $configuration->{database}->{type},
database => $configuration->{database}->{name},
host => $configuration->{database}->{host},
@@ -57,7 +57,7 @@ IdPAccountManager::DB->register_db(
username => $configuration->{database}->{user}
);
-my $db = IdPAccountManager::DB->new();
+my $db = AccountManager::DB->new();
for ($action) {
when ('add_account') { add_account() }
@@ -91,15 +91,15 @@ sub add_account {
my $validity_period =
$configuration->{$entity}->{account_validity_period} ||
$configuration->{service}->{account_validity_period};
- my $password = IdPAccountManager::Tools::generate_password();
+ my $password = AccountManager::Tools::generate_password();
- my $account = IdPAccountManager::TestAccount->new(
+ my $account = AccountManager::TestAccount->new(
db => $db,
profile => $options{profile},
sp_entityid => $options{sp_entityid},
scope => $configuration->{idp}->{scope},
password => $password,
- password_hash => IdPAccountManager::Tools::sha256_hash($password),
+ password_hash => AccountManager::Tools::sha256_hash($password),
creation_date => DateTime->today(),
expiration_date => DateTime->today()->add(days => $validity_period)
);
@@ -127,7 +127,7 @@ sub list_accounts {
}
my $accounts =
- IdPAccountManager::TestAccount::Manager->get_testaccounts(db => $db, %args);
+ AccountManager::TestAccount::Manager->get_testaccounts(db => $db, %args);
if (! @$accounts) {
printf "No matching test account in DB\n";
@@ -143,12 +143,12 @@ sub list_accounts {
}
printf "%d accounts removed\n", scalar @$accounts;
- $accounts = IdPAccountManager::TestAccount::Manager->get_testaccounts(
+ $accounts = AccountManager::TestAccount::Manager->get_testaccounts(
db => $db
);
eval {
- IdPAccountManager::Tools::update_ssp_authsources(
+ AccountManager::Tools::update_ssp_authsources(
$configuration->{_}->{templates_dir},
$configuration->{idp}->{accounts_file},
$accounts
@@ -166,7 +166,7 @@ sub parse_metadata {
my $federation_metadata;
eval {
- $federation_metadata = IdPAccountManager::SAMLMetadata->new(
+ $federation_metadata = AccountManager::SAMLMetadata->new(
file => $configuration->{_}->{federation_metadata_file}
);
};
@@ -195,7 +195,7 @@ sub add_provider {
) unless $options{contacts};
## Check if entry already exists in DB first
- my $provider = IdPAccountManager::ServiceProvider->new(
+ my $provider = AccountManager::ServiceProvider->new(
db => $db,
entityid => $options{sp_entityid}
);
@@ -206,7 +206,7 @@ sub add_provider {
$provider->contacts($options{contacts});
$provider->displayname($options{displayname}) if $options{displayname};
} else {
- $provider = IdPAccountManager::ServiceProvider->new(
+ $provider = AccountManager::ServiceProvider->new(
db => $db,
entityid => $options{sp_entityid},
contacts => $options{contacts},
@@ -223,7 +223,7 @@ sub add_provider {
sub list_providers {
my %args;
- my $providers = IdPAccountManager::ServiceProvider::Manager->get_serviceproviders(db => $db, %args);
+ my $providers = AccountManager::ServiceProvider::Manager->get_serviceproviders(db => $db, %args);
if (! @$providers) {
printf "No service provider in DB\n";
@@ -256,7 +256,7 @@ sub list_tokens {
}
my $tokens =
- IdPAccountManager::AuthenticationToken::Manager->get_authenticationtokens(db => $db, %args);
+ AccountManager::AuthenticationToken::Manager->get_authenticationtokens(db => $db, %args);
if (!@$tokens) {
printf "No corresponding token found in DB\n";
@@ -284,7 +284,7 @@ sub get_token {
}
my $token =
- IdPAccountManager::AuthenticationToken->new(db => $db, %args);
+ AccountManager::AuthenticationToken->new(db => $db, %args);
die "No corresponding token found in DB\n"
unless $token->load();
@@ -311,7 +311,7 @@ sub add_token {
) unless $options{sp_entityid};
# delete any previous token for the same email/service couple
- my $old_token = IdPAccountManager::AuthenticationToken->new(
+ my $old_token = AccountManager::AuthenticationToken->new(
db => $db,
email_address => $options{email_address},
sp_entityid => $options{sp_entityid}
@@ -322,12 +322,12 @@ sub add_token {
}
# compute a new token
- my $token = IdPAccountManager::AuthenticationToken->new(
+ my $token = AccountManager::AuthenticationToken->new(
db => $db,
email_address => $options{email_address},
sp_entityid => $options{sp_entityid},
creation_date => DateTime->today(),
- token => IdPAccountManager::Tools::generate_token()
+ token => AccountManager::Tools::generate_token()
);
$token->save() or die "failed to save authentication token\n";
diff --git a/lib/IdPAccountManager/AuthenticationToken.pm b/lib/AccountManager/AuthenticationToken.pm
similarity index 91%
rename from lib/IdPAccountManager/AuthenticationToken.pm
rename to lib/AccountManager/AuthenticationToken.pm
index 85292f6..6ab9945 100644
--- a/lib/IdPAccountManager/AuthenticationToken.pm
+++ b/lib/AccountManager/AuthenticationToken.pm
@@ -1,9 +1,9 @@
-package IdPAccountManager::AuthenticationToken;
+package AccountManager::AuthenticationToken;
use strict;
use warnings;
-use base 'IdPAccountManager::DB::Object';
+use base 'AccountManager::DB::Object';
__PACKAGE__->meta->setup(
table => 'authenticationtokens',
diff --git a/lib/AccountManager/AuthenticationToken/Manager.pm b/lib/AccountManager/AuthenticationToken/Manager.pm
new file mode 100644
index 0000000..9106777
--- /dev/null
+++ b/lib/AccountManager/AuthenticationToken/Manager.pm
@@ -0,0 +1,15 @@
+package AccountManager::AuthenticationToken::Manager;
+
+use strict;
+use warnings;
+
+use base qw(Rose::DB::Object::Manager);
+
+use AccountManager::AuthenticationToken;
+
+sub object_class { 'AccountManager::AuthenticationToken' }
+
+__PACKAGE__->make_manager_methods('authenticationtokens');
+
+1;
+
diff --git a/lib/IdPAccountManager/DB.pm b/lib/AccountManager/DB.pm
similarity index 95%
rename from lib/IdPAccountManager/DB.pm
rename to lib/AccountManager/DB.pm
index eb7f5bb..8703bf7 100644
--- a/lib/IdPAccountManager/DB.pm
+++ b/lib/AccountManager/DB.pm
@@ -1,4 +1,4 @@
-package IdPAccountManager::DB;
+package AccountManager::DB;
use strict;
use warnings;
diff --git a/lib/AccountManager/DB/Object.pm b/lib/AccountManager/DB/Object.pm
new file mode 100644
index 0000000..b37384a
--- /dev/null
+++ b/lib/AccountManager/DB/Object.pm
@@ -0,0 +1,13 @@
+package AccountManager::DB::Object;
+
+use strict;
+use warnings;
+use base 'Rose::DB::Object';
+
+use AccountManager::DB;
+
+sub init_db {
+ AccountManager::DB->new();
+}
+
+1;
diff --git a/lib/IdPAccountManager/SAMLMetadata.pm b/lib/AccountManager/SAMLMetadata.pm
similarity index 98%
rename from lib/IdPAccountManager/SAMLMetadata.pm
rename to lib/AccountManager/SAMLMetadata.pm
index 72c6a15..4978c7b 100644
--- a/lib/IdPAccountManager/SAMLMetadata.pm
+++ b/lib/AccountManager/SAMLMetadata.pm
@@ -1,4 +1,4 @@
-package IdPAccountManager::SAMLMetadata;
+package AccountManager::SAMLMetadata;
use strict;
use warnings;
@@ -213,7 +213,7 @@ SAMLMetadata - loading SAML federation metadata
=head1 SYNOPSIS
# instanciate metadata object
- my $metadata = IdPAccountManager::SAMLMetadata->new(
+ my $metadata = AccountManager::SAMLMetadata->new(
file => '/tmp/edugain-saml-metadata.xml'
);
@@ -230,7 +230,7 @@ This class parses a SAML2 metadata file.
=item new()
-Create a new IdPAccountManager::SAMLMetadata object.
+Create a new AccountManager::SAMLMetadata object.
Supported arguments include:
diff --git a/lib/IdPAccountManager/ServiceProvider.pm b/lib/AccountManager/ServiceProvider.pm
similarity index 91%
rename from lib/IdPAccountManager/ServiceProvider.pm
rename to lib/AccountManager/ServiceProvider.pm
index 44b5300..b1ffcd2 100644
--- a/lib/IdPAccountManager/ServiceProvider.pm
+++ b/lib/AccountManager/ServiceProvider.pm
@@ -1,9 +1,9 @@
-package IdPAccountManager::ServiceProvider;
+package AccountManager::ServiceProvider;
use strict;
use warnings;
-use base 'IdPAccountManager::DB::Object';
+use base 'AccountManager::DB::Object';
use List::MoreUtils qw(any);
diff --git a/lib/AccountManager/ServiceProvider/Manager.pm b/lib/AccountManager/ServiceProvider/Manager.pm
new file mode 100644
index 0000000..651bb0c
--- /dev/null
+++ b/lib/AccountManager/ServiceProvider/Manager.pm
@@ -0,0 +1,15 @@
+package AccountManager::ServiceProvider::Manager;
+
+use strict;
+use warnings;
+
+use base qw(Rose::DB::Object::Manager);
+
+use AccountManager::ServiceProvider;
+
+sub object_class { 'AccountManager::ServiceProvider' }
+
+__PACKAGE__->make_manager_methods('serviceproviders');
+
+1;
+
diff --git a/lib/IdPAccountManager/TestAccount.pm b/lib/AccountManager/TestAccount.pm
similarity index 98%
rename from lib/IdPAccountManager/TestAccount.pm
rename to lib/AccountManager/TestAccount.pm
index d9c8b2a..f85c6c9 100644
--- a/lib/IdPAccountManager/TestAccount.pm
+++ b/lib/AccountManager/TestAccount.pm
@@ -1,9 +1,9 @@
-package IdPAccountManager::TestAccount;
+package AccountManager::TestAccount;
use strict;
use warnings;
-use base 'IdPAccountManager::DB::Object';
+use base 'AccountManager::DB::Object';
__PACKAGE__->meta->setup(
table => 'testaccounts',
diff --git a/lib/AccountManager/TestAccount/Manager.pm b/lib/AccountManager/TestAccount/Manager.pm
new file mode 100644
index 0000000..ea035c7
--- /dev/null
+++ b/lib/AccountManager/TestAccount/Manager.pm
@@ -0,0 +1,15 @@
+package AccountManager::TestAccount::Manager;
+
+use strict;
+use warnings;
+
+use base qw(Rose::DB::Object::Manager);
+
+use AccountManager::TestAccount;
+
+sub object_class { 'AccountManager::TestAccount' }
+
+__PACKAGE__->make_manager_methods('testaccounts');
+
+1;
+
diff --git a/lib/IdPAccountManager/Tools.pm b/lib/AccountManager/Tools.pm
similarity index 96%
rename from lib/IdPAccountManager/Tools.pm
rename to lib/AccountManager/Tools.pm
index bf3c930..45c20a1 100644
--- a/lib/IdPAccountManager/Tools.pm
+++ b/lib/AccountManager/Tools.pm
@@ -1,4 +1,4 @@
-package IdPAccountManager::Tools;
+package AccountManager::Tools;
use strict;
use warnings;
@@ -91,7 +91,7 @@ __END__
=head1 NAME
-IdPAccountManager::Tools - Set of subroutines usefull for the Test Account manager
+AccountManager::Tools - Set of subroutines usefull for the Test Account manager
=head1 DESCRIPTION
diff --git a/lib/IdPAccountManager/WebRequest.pm b/lib/AccountManager/WebRequest.pm
similarity index 93%
rename from lib/IdPAccountManager/WebRequest.pm
rename to lib/AccountManager/WebRequest.pm
index c828e80..6405a7b 100644
--- a/lib/IdPAccountManager/WebRequest.pm
+++ b/lib/AccountManager/WebRequest.pm
@@ -1,4 +1,4 @@
-package IdPAccountManager::WebRequest;
+package AccountManager::WebRequest;
use strict;
use warnings;
@@ -10,12 +10,12 @@ use Template;
use Log::Any::Adapter;
use List::MoreUtils qw(uniq);
-use IdPAccountManager::TestAccount;
-use IdPAccountManager::TestAccount::Manager;
-use IdPAccountManager::AuthenticationToken;
-use IdPAccountManager::ServiceProvider;
-use IdPAccountManager::SAMLMetadata;
-use IdPAccountManager::Tools;
+use AccountManager::TestAccount;
+use AccountManager::TestAccount::Manager;
+use AccountManager::AuthenticationToken;
+use AccountManager::ServiceProvider;
+use AccountManager::SAMLMetadata;
+use AccountManager::Tools;
## Defining parameters format
my $urn_or_url_regex = '(http(s?):\/\/|urn:)[^\\\$\*\"\'\`\^\|\<\>\n\s]+'
@@ -53,7 +53,7 @@ sub new {
$self->{logger} = Log::Any->get_logger();
- IdPAccountManager::DB->register_db(
+ AccountManager::DB->register_db(
driver => $self->{configuration}->{database}->{type},
database => $self->{configuration}->{database}->{name},
host => $self->{configuration}->{database}->{host},
@@ -61,7 +61,7 @@ sub new {
username => $self->{configuration}->{database}->{user}
);
- $self->{db} = IdPAccountManager::DB->new();
+ $self->{db} = AccountManager::DB->new();
$self->{cgi} = CGI->new();
bless $self, $pkg;
@@ -186,7 +186,7 @@ sub req_account_wizard {
my $metadata;
eval {
- $metadata = IdPAccountManager::SAMLMetadata->new(
+ $metadata = AccountManager::SAMLMetadata->new(
file => $self->{configuration}->{_}->{federation_metadata_file}
);
};
@@ -215,7 +215,7 @@ sub req_select_sp {
}
# Create a persistent service provider object
- my $provider = IdPAccountManager::ServiceProvider->new(
+ my $provider = AccountManager::ServiceProvider->new(
db => $self->{db},
entityid => $self->{in}->{sp_entityid}
);
@@ -227,7 +227,7 @@ sub req_select_sp {
my $metadata;
eval {
- $metadata = IdPAccountManager::SAMLMetadata->new(
+ $metadata = AccountManager::SAMLMetadata->new(
file => $self->{configuration}->{_}->{federation_metadata_file}
);
};
@@ -290,7 +290,7 @@ sub req_generate_token {
return;
}
- my $provider = IdPAccountManager::ServiceProvider->new(
+ my $provider = AccountManager::ServiceProvider->new(
db => $self->{db},
entityid => $self->{in}->{sp_entityid},
);
@@ -321,7 +321,7 @@ sub req_generate_token {
}
# delete any previous token for the same email/service couple
- my $old_token = IdPAccountManager::AuthenticationToken->new(
+ my $old_token = AccountManager::AuthenticationToken->new(
db => $self->{db},
email_address => $self->{in}->{email_address},
sp_entityid => $self->{in}->{sp_entityid}
@@ -339,12 +339,12 @@ sub req_generate_token {
}
# compute a new token
- my $token = IdPAccountManager::AuthenticationToken->new(
+ my $token = AccountManager::AuthenticationToken->new(
db => $self->{db},
email_address => $self->{in}->{email_address},
sp_entityid => $self->{in}->{sp_entityid},
creation_date => DateTime->today(),
- token => IdPAccountManager::Tools::generate_token()
+ token => AccountManager::Tools::generate_token()
);
unless ($token->save()) {
@@ -424,7 +424,7 @@ sub req_validate_token {
return;
}
- my $token = IdPAccountManager::AuthenticationToken->new(
+ my $token = AccountManager::AuthenticationToken->new(
db => $self->{db},
token => $self->{in}->{authentication_token}
);
@@ -469,14 +469,14 @@ sub req_validate_token {
$self->{configuration}->{service}->{account_validity_period};
foreach my $profile (split(/, */, $profiles)) {
- my $password = IdPAccountManager::Tools::generate_password();
- my $account = IdPAccountManager::TestAccount->new(
+ my $password = AccountManager::Tools::generate_password();
+ my $account = AccountManager::TestAccount->new(
db => $self->{db},
profile => $profile,
sp_entityid => $entity,
scope => $self->{configuration}->{idp}->{scope},
password => $password,
- password_hash => IdPAccountManager::Tools::sha256_hash($password),
+ password_hash => AccountManager::Tools::sha256_hash($password),
creation_date => DateTime->today(),
expiration_date => DateTime->today()->add(days => $validity_period)
);
@@ -494,12 +494,12 @@ sub req_validate_token {
}
## Update simpleSAMLphp configuration to enable test accounts
- my $accounts = IdPAccountManager::TestAccount::Manager->get_testaccounts(
+ my $accounts = AccountManager::TestAccount::Manager->get_testaccounts(
db => $self->{db}
);
eval {
- IdPAccountManager::Tools::update_ssp_authsources(
+ AccountManager::Tools::update_ssp_authsources(
$self->{configuration}->{_}->{templates_dir},
$self->{configuration}->{idp}->{accounts_file},
$accounts
diff --git a/lib/IdPAccountManager/AuthenticationToken/Manager.pm b/lib/IdPAccountManager/AuthenticationToken/Manager.pm
deleted file mode 100644
index bff3f74..0000000
--- a/lib/IdPAccountManager/AuthenticationToken/Manager.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-package IdPAccountManager::AuthenticationToken::Manager;
-
-use strict;
-use warnings;
-
-use base qw(Rose::DB::Object::Manager);
-
-use IdPAccountManager::AuthenticationToken;
-
-sub object_class { 'IdPAccountManager::AuthenticationToken' }
-
-__PACKAGE__->make_manager_methods('authenticationtokens');
-
-1;
-
diff --git a/lib/IdPAccountManager/DB/Object.pm b/lib/IdPAccountManager/DB/Object.pm
deleted file mode 100644
index 57c3223..0000000
--- a/lib/IdPAccountManager/DB/Object.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-package IdPAccountManager::DB::Object;
-
-use strict;
-use warnings;
-use base 'Rose::DB::Object';
-
-use IdPAccountManager::DB;
-
-sub init_db {
- IdPAccountManager::DB->new();
-}
-
-1;
diff --git a/lib/IdPAccountManager/ServiceProvider/Manager.pm b/lib/IdPAccountManager/ServiceProvider/Manager.pm
deleted file mode 100644
index d87002c..0000000
--- a/lib/IdPAccountManager/ServiceProvider/Manager.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-package IdPAccountManager::ServiceProvider::Manager;
-
-use strict;
-use warnings;
-
-use base qw(Rose::DB::Object::Manager);
-
-use IdPAccountManager::ServiceProvider;
-
-sub object_class { 'IdPAccountManager::ServiceProvider' }
-
-__PACKAGE__->make_manager_methods('serviceproviders');
-
-1;
-
diff --git a/lib/IdPAccountManager/TestAccount/Manager.pm b/lib/IdPAccountManager/TestAccount/Manager.pm
deleted file mode 100644
index da68c7e..0000000
--- a/lib/IdPAccountManager/TestAccount/Manager.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-package IdPAccountManager::TestAccount::Manager;
-
-use strict;
-use warnings;
-
-use base qw(Rose::DB::Object::Manager);
-
-use IdPAccountManager::TestAccount;
-
-sub object_class { 'IdPAccountManager::TestAccount' }
-
-__PACKAGE__->make_manager_methods('testaccounts');
-
-1;
-
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 19f70c4..3a5c598 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,16 +1,16 @@
modulesdir = $(pkgdatadir)/lib
nobase_modules_DATA = \
- IdPAccountManager/AuthenticationToken.pm \
- IdPAccountManager/AuthenticationToken/Manager.pm \
- IdPAccountManager/DB.pm \
- IdPAccountManager/DB/Object.pm \
- IdPAccountManager/SAMLMetadata.pm \
- IdPAccountManager/ServiceProvider.pm \
- IdPAccountManager/ServiceProvider/Manager.pm \
- IdPAccountManager/TestAccount.pm \
- IdPAccountManager/TestAccount/Manager.pm \
- IdPAccountManager/Tools.pm \
- IdPAccountManager/WebRequest.pm
+ AccountManager/AuthenticationToken.pm \
+ AccountManager/AuthenticationToken/Manager.pm \
+ AccountManager/DB.pm \
+ AccountManager/DB/Object.pm \
+ AccountManager/SAMLMetadata.pm \
+ AccountManager/ServiceProvider.pm \
+ AccountManager/ServiceProvider/Manager.pm \
+ AccountManager/TestAccount.pm \
+ AccountManager/TestAccount/Manager.pm \
+ AccountManager/Tools.pm \
+ AccountManager/WebRequest.pm
EXTRA_DIST = $(nobase_modules_DATA)
diff --git a/t/samlmetadata.t b/t/samlmetadata.t
index 846ae72..5516174 100755
--- a/t/samlmetadata.t
+++ b/t/samlmetadata.t
@@ -8,19 +8,19 @@ use File::Temp;
use Test::More;
use Test::Exception;
-use IdPAccountManager::SAMLMetadata;
+use AccountManager::SAMLMetadata;
plan tests => 21;
my $metadata;
throws_ok {
- $metadata = IdPAccountManager::SAMLMetadata->new();
+ $metadata = AccountManager::SAMLMetadata->new();
} qr/^missing argument 'file'/,
'instanciation: no file argument';
throws_ok {
- $metadata = IdPAccountManager::SAMLMetadata->new(
+ $metadata = AccountManager::SAMLMetadata->new(
file => '/no/such/file',
);
} qr/^non-existing file/,
@@ -31,7 +31,7 @@ my $file1 = File::Temp->new(UNLINK => $ENV{TEST_DEBUG} ? 0 : 1);
chmod 0000, $file1;
throws_ok {
- $metadata = IdPAccountManager::SAMLMetadata->new(
+ $metadata = AccountManager::SAMLMetadata->new(
file => $file1->filename()
);
} qr/^non-readable file/,
@@ -40,7 +40,7 @@ throws_ok {
chmod 0644, $file1;
throws_ok {
- $metadata = IdPAccountManager::SAMLMetadata->new(
+ $metadata = AccountManager::SAMLMetadata->new(
file => $file1->filename()
);
} qr/^Failed to parse file: \S+ parser error : Document is empty/,
@@ -54,7 +54,7 @@ EOF
close($file2);
throws_ok {
- $metadata = IdPAccountManager::SAMLMetadata->new(
+ $metadata = AccountManager::SAMLMetadata->new(
file => $file2->filename()
);
} qr/^Failed to parse file: \S+ parser error : Start tag expected/,
@@ -69,14 +69,14 @@ EOF
close($file3);
throws_ok {
- $metadata = IdPAccountManager::SAMLMetadata->new(
+ $metadata = AccountManager::SAMLMetadata->new(
file => $file3->filename()
);
} qr/^incorrect root element type 'root'/,
'instanciation: incorrect xml file';
lives_ok {
- $metadata = IdPAccountManager::SAMLMetadata->new(
+ $metadata = AccountManager::SAMLMetadata->new(
file => 't/edugain.xml'
);
} 'instanciation: edugain metadata';
--
GitLab