PrivateCoffee/travelynx
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

journey: add token to share link if non-public

Browse source
This commit is contained in:
Daniel Friesel 2023-02-28 19:45:27 +01:00
parent d58c5a8826
commit ba483a9daf
No known key found for this signature in database
GPG key ID: 100D5BFB5166E005
2 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/Travelynx/Controller/Traveling.pm
View file

@ -479,6 +479,26 @@ sub status_token_ok {
return; return;
} }
sub journey_token_ok {
my ( $self, $journey, $ts2_ext ) = @_;
my $token = $self->param('token') // q{};
my ( $eva, $ts, $ts2 ) = split( qr{-}, $token );
if ( not $ts ) {
return;
}
$ts2 //= $ts2_ext;
if ( $eva == $journey->{from_eva}
and $ts == $journey->{checkin_ts}
and $ts2 == $journey->{sched_dep_ts} )
{
return 1;
}
return;
}
sub user_status { sub user_status {
my ($self) = @_; my ($self) = @_;
@ -507,6 +527,8 @@ sub user_status {
) )
{ {
if ( $candidate->{sched_dep_ts} eq $ts ) { if ( $candidate->{sched_dep_ts} eq $ts ) {
# TODO pass token
$self->redirect_to("/p/${name}/j/$candidate->{id}"); $self->redirect_to("/p/${name}/j/$candidate->{id}");
return; return;
} }
@ -707,11 +729,11 @@ sub public_journey_details {
not( not(
$visibility eq 'public' $visibility eq 'public'
or ( $visibility eq 'unlisted' or ( $visibility eq 'unlisted'
and $self->status_token_ok($journey) ) and $self->journey_token_ok($journey) )
or ( or (
$visibility eq 'travelynx' $visibility eq 'travelynx'
and ( $self->is_user_authenticated and ( $self->is_user_authenticated
or $self->status_token_ok($journey) ) or $self->journey_token_ok($journey) )
) )
) )
) )

5
templates/journey.html.ep
View file

@ -246,7 +246,12 @@
</div> </div>
<div class="col s12 m6 l6 center-align"> <div class="col s12 m6 l6 center-align">
<a class="btn waves-effect waves-light action-share" <a class="btn waves-effect waves-light action-share"
% if ($journey_visibility eq 'public') {
data-url="<%= url_for('public_journey', name => current_user()->{name}, id => $journey->{id} )->to_abs->scheme('https'); %>" data-url="<%= url_for('public_journey', name => current_user()->{name}, id => $journey->{id} )->to_abs->scheme('https'); %>"
% }
% else {
data-url="<%= url_for('public_journey', name => current_user()->{name}, id => $journey->{id} )->to_abs->scheme('https'); %>?token=<%= $journey->{from_eva} %>-<%= $journey->{checkin_ts} %>-<%= $journey->{sched_dep_ts} %>"
% }
data-text="<%= stash('share_text') %>" data-text="<%= stash('share_text') %>"
> >
<i class="material-icons left" aria-hidden="true">share</i> Teilen <i class="material-icons left" aria-hidden="true">share</i> Teilen