diff --git a/bin/account-manager.pl.in b/bin/account-manager.pl.in index abf2d460f0eecdebb62851b4678ae444d16e1e36..2c2fbeef94a354f9ba5ca9ac2a46328087e99afc 100755 --- a/bin/account-manager.pl.in +++ b/bin/account-manager.pl.in @@ -15,8 +15,8 @@ use Getopt::Long qw(:config auto_help); use Log::Any::Adapter; use Pod::Usage; -use AccountManager::AuthenticationToken; -use AccountManager::AuthenticationToken::Manager; +use AccountManager::Token; +use AccountManager::Token::Manager; use AccountManager::ServiceProvider; use AccountManager::ServiceProvider::Manager; use AccountManager::TestAccount; @@ -256,7 +256,7 @@ sub list_tokens { } my $tokens = - AccountManager::AuthenticationToken::Manager->get_authenticationtokens(db => $db, %args); + AccountManager::Token::Manager->get_tokens(db => $db, %args); if (!@$tokens) { printf "No corresponding token found in DB\n"; @@ -284,7 +284,7 @@ sub get_token { } my $token = - AccountManager::AuthenticationToken->new(db => $db, %args); + AccountManager::Token->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 = AccountManager::AuthenticationToken->new( + my $old_token = AccountManager::Token->new( db => $db, email_address => $options{email_address}, sp_entityid => $options{sp_entityid} @@ -322,7 +322,7 @@ sub add_token { } # compute a new token - my $token = AccountManager::AuthenticationToken->new( + my $token = AccountManager::Token->new( db => $db, email_address => $options{email_address}, sp_entityid => $options{sp_entityid}, diff --git a/conf/create-manager-db.sql b/conf/create-manager-db.sql index a62370fcf38da42e959b09afa2d7a568cf2b9b39..635cbf295437c401cc6da7fd883852fcdba7356c 100644 --- a/conf/create-manager-db.sql +++ b/conf/create-manager-db.sql @@ -6,7 +6,7 @@ -- -------------------------------------------------------- -CREATE TABLE `authenticationtokens` ( +CREATE TABLE `tokens` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `token` varchar(50) NOT NULL, `email_address` varchar(200) NOT NULL, diff --git a/lib/AccountManager/AuthenticationToken/Manager.pm b/lib/AccountManager/AuthenticationToken/Manager.pm deleted file mode 100644 index 91067775034cf7777babbc8cdcb619d7a49c581b..0000000000000000000000000000000000000000 --- a/lib/AccountManager/AuthenticationToken/Manager.pm +++ /dev/null @@ -1,15 +0,0 @@ -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/AccountManager/AuthenticationToken.pm b/lib/AccountManager/Token.pm similarity index 91% rename from lib/AccountManager/AuthenticationToken.pm rename to lib/AccountManager/Token.pm index 6ab99457be350b55687ed4e930bf910f0b6ffcab..f74902914f9a8f87fa4f2d084064aa7217dc4fa7 100644 --- a/lib/AccountManager/AuthenticationToken.pm +++ b/lib/AccountManager/Token.pm @@ -1,4 +1,4 @@ -package AccountManager::AuthenticationToken; +package AccountManager::Token; use strict; use warnings; @@ -6,7 +6,7 @@ use warnings; use base 'AccountManager::DB::Object'; __PACKAGE__->meta->setup( - table => 'authenticationtokens', + table => 'tokens', columns => [ id => { type => 'bigserial', not_null => 1 }, diff --git a/lib/AccountManager/Token/Manager.pm b/lib/AccountManager/Token/Manager.pm new file mode 100644 index 0000000000000000000000000000000000000000..b9930ca83f43b2081bea4fec0b85ef53a19608a7 --- /dev/null +++ b/lib/AccountManager/Token/Manager.pm @@ -0,0 +1,15 @@ +package AccountManager::Token::Manager; + +use strict; +use warnings; + +use base qw(Rose::DB::Object::Manager); + +use AccountManager::Token; + +sub object_class { 'AccountManager::Token' } + +__PACKAGE__->make_manager_methods('tokens'); + +1; + diff --git a/lib/AccountManager/WebRequest.pm b/lib/AccountManager/WebRequest.pm index 6405a7b450f04fbc251a0699079bdc30377ac720..1e5fddd6dab8a9614fa348310657b7811b1ca278 100644 --- a/lib/AccountManager/WebRequest.pm +++ b/lib/AccountManager/WebRequest.pm @@ -12,7 +12,7 @@ use List::MoreUtils qw(uniq); use AccountManager::TestAccount; use AccountManager::TestAccount::Manager; -use AccountManager::AuthenticationToken; +use AccountManager::Token; use AccountManager::ServiceProvider; use AccountManager::SAMLMetadata; use AccountManager::Tools; @@ -321,7 +321,7 @@ sub req_generate_token { } # delete any previous token for the same email/service couple - my $old_token = AccountManager::AuthenticationToken->new( + my $old_token = AccountManager::Token->new( db => $self->{db}, email_address => $self->{in}->{email_address}, sp_entityid => $self->{in}->{sp_entityid} @@ -339,7 +339,7 @@ sub req_generate_token { } # compute a new token - my $token = AccountManager::AuthenticationToken->new( + my $token = AccountManager::Token->new( db => $self->{db}, email_address => $self->{in}->{email_address}, sp_entityid => $self->{in}->{sp_entityid}, @@ -424,7 +424,7 @@ sub req_validate_token { return; } - my $token = AccountManager::AuthenticationToken->new( + my $token = AccountManager::Token->new( db => $self->{db}, token => $self->{in}->{authentication_token} ); diff --git a/lib/Makefile.am b/lib/Makefile.am index 3a5c598fa0a52b8f04bb84bdd13dbe6272c7fda0..7ae6a433efb445cb6151e39ca06125c2f7f1f888 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,8 +1,8 @@ modulesdir = $(pkgdatadir)/lib nobase_modules_DATA = \ - AccountManager/AuthenticationToken.pm \ - AccountManager/AuthenticationToken/Manager.pm \ + AccountManager/Token.pm \ + AccountManager/Token/Manager.pm \ AccountManager/DB.pm \ AccountManager/DB/Object.pm \ AccountManager/SAMLMetadata.pm \