diff options
Diffstat (limited to 'lib/Travelynx/Controller')
| -rw-r--r-- | lib/Travelynx/Controller/Account.pm | 15 | ||||
| -rwxr-xr-x | lib/Travelynx/Controller/Api.pm | 11 |
2 files changed, 15 insertions, 11 deletions
diff --git a/lib/Travelynx/Controller/Account.pm b/lib/Travelynx/Controller/Account.pm index 52850f7..2d9a1ce 100644 --- a/lib/Travelynx/Controller/Account.pm +++ b/lib/Travelynx/Controller/Account.pm @@ -388,10 +388,11 @@ sub verify { sub delete { my ($self) = @_; + my $uid = $self->current_user->{id}; if ( $self->validation->csrf_protect->has_error('csrf_token') ) { $self->render( 'account', - api_token => $self->get_api_token, + api_token => $self->users->get_api_token( uid => $uid ), invalid => 'csrf', ); return; @@ -407,15 +408,15 @@ sub delete { { $self->render( 'account', - api_token => $self->get_api_token, + api_token => $self->users->get_api_token( uid => $uid ), invalid => 'deletion password' ); return; } - $self->users->flag_deletion( uid => $self->current_user->{id} ); + $self->users->flag_deletion( uid => $uid ); } else { - $self->users->unflag_deletion( uid => $self->current_user->{id} ); + $self->users->unflag_deletion( uid => $uid ); } $self->redirect_to('account'); } @@ -950,9 +951,11 @@ sub confirm_mail { sub account { my ($self) = @_; + my $uid = $self->current_user->{id}; - $self->render( 'account', api_token => $self->get_api_token ); - $self->users->mark_seen( uid => $self->current_user->{id} ); + $self->render( 'account', + api_token => $self->users->get_api_token( uid => $uid ) ); + $self->users->mark_seen( uid => $uid ); } sub json_export { diff --git a/lib/Travelynx/Controller/Api.pm b/lib/Travelynx/Controller/Api.pm index 856c477..6f788b5 100755 --- a/lib/Travelynx/Controller/Api.pm +++ b/lib/Travelynx/Controller/Api.pm @@ -35,10 +35,11 @@ sub documentation { my ($self) = @_; if ( $self->is_user_authenticated ) { + my $uid = $self->current_user->{id}; $self->render( 'api_documentation', - uid => $self->current_user->{id}, - api_token => $self->get_api_token, + uid => $uid, + api_token => $self->users->get_api_token( uid => $uid ), ); } else { @@ -79,7 +80,7 @@ sub get_v1 { return; } - my $token = $self->get_api_token($uid); + my $token = $self->users->get_api_token( uid => $uid ); if ( not $api_token or not $token->{$api_action} or $api_token ne $token->{$api_action} ) @@ -145,7 +146,7 @@ sub travel_v1 { return; } - my $token = $self->get_api_token($uid); + my $token = $self->users->get_api_token( uid => $uid ); if ( not $token->{'travel'} or $api_token ne $token->{'travel'} ) { $self->render( json => { @@ -411,7 +412,7 @@ sub import_v1 { return; } - my $token = $self->get_api_token($uid); + my $token = $self->users->get_api_token($uid); if ( not $token->{'import'} or $api_token ne $token->{'import'} ) { $self->render( json => { |