diff options
Diffstat (limited to 'lib/Travelynx')
| -rw-r--r-- | lib/Travelynx/Command/database.pm | 32 | ||||
| -rw-r--r-- | lib/Travelynx/Command/maintenance.pm | 3 | ||||
| -rw-r--r-- | lib/Travelynx/Controller/Account.pm | 10 |
3 files changed, 37 insertions, 8 deletions
diff --git a/lib/Travelynx/Command/database.pm b/lib/Travelynx/Command/database.pm index 05b43d6..79ff086 100644 --- a/lib/Travelynx/Command/database.pm +++ b/lib/Travelynx/Command/database.pm @@ -424,6 +424,38 @@ my @migrations = ( } ); }, + + # v9 -> v10 + # Add pending_registrations table. The users.token column is no longer + # needed. + sub { + my ($db) = @_; + $db->query( + qq{ + create table pending_registrations ( + user_id integer not null references users (id) primary key, + token varchar(80) not null + ); + comment on table pending_registrations is 'Verification tokens for newly registered accounts'; + update schema_version set version = 10; + } + ); + my $res = $db->select( 'users', [ 'id', 'token' ], { status => 0 } ); + for my $user ( $res->hashes->each ) { + $db->insert( + 'pending_registrations', + { + user_id => $user->{id}, + token => $user->{token} + } + ); + } + $db->query( + qq{ + alter table users drop column token; + } + ); + }, ); sub setup_db { diff --git a/lib/Travelynx/Command/maintenance.pm b/lib/Travelynx/Command/maintenance.pm index 8c07728..fc64884 100644 --- a/lib/Travelynx/Command/maintenance.pm +++ b/lib/Travelynx/Command/maintenance.pm @@ -59,7 +59,8 @@ sub run { } ); } - $db->delete( 'users', { id => $user->{id} } ); + $db->delete( 'pending_registrations', { user_id => $user->{id} } ); + $db->delete( 'users', { id => $user->{id} } ); printf( "Pruned unverified user %d\n", $user->{id} ); } diff --git a/lib/Travelynx/Controller/Account.pm b/lib/Travelynx/Controller/Account.pm index dc3adb4..e4b385c 100644 --- a/lib/Travelynx/Controller/Account.pm +++ b/lib/Travelynx/Controller/Account.pm @@ -159,20 +159,16 @@ sub verify { my $id = $self->stash('id'); my $token = $self->stash('token'); - my @db_user = $self->get_user_token($id); - - if ( not @db_user ) { + if ( not $id =~ m{ ^ \d+ $ }x ) { $self->render( 'register', invalid => 'token' ); return; } - my ( $db_name, $db_status, $db_token ) = @db_user; - - if ( not $db_name or $token ne $db_token or $db_status != 0 ) { + if ( not $self->verify_registration_token( $id, $token ) ) { $self->render( 'register', invalid => 'token' ); return; } - $self->app->pg->db->update( 'users', { status => 1 }, { id => $id } ); + $self->render( 'login', from => 'verification' ); } |