Merge get and post routes for password protected rooms

master
Daniel Berteaud 10 years ago
parent b6e6ca81cd
commit 63d2f70bfa
  1. 31
      vroom.pl

@ -924,7 +924,7 @@ any [qw(GET POST)] => '/invitation/:token' => { token => '' } => sub {
} }
}; };
# This handler creates a new room # This handler room creation
post '/create' => sub { post '/create' => sub {
my $self = shift; my $self = shift;
# No name provided ? Lets generate one # No name provided ? Lets generate one
@ -969,57 +969,50 @@ get '/localize/:lang' => { lang => 'en' } => sub {
foreach my $string (JS_STRINGS){ foreach my $string (JS_STRINGS){
$strings->{$string} = $self->l($string); $strings->{$string} = $self->l($string);
} }
# Cache the translation # Tell the client to cache it
$self->res->headers->cache_control('private,max-age=3600'); $self->res->headers->cache_control('private,max-age=3600');
return $self->render(json => $strings); return $self->render(json => $strings);
}; };
# Route for the password page # Route for the password page
get '/password/(:room)' => sub { # When someone tries to join a password protected room
any [qw(GET POST)] => '/password/(:room)' => sub {
my $self = shift; my $self = shift;
my $room = $self->stash('room') || ''; my $room = $self->stash('room') || '';
my $data = $self->get_room_by_name($room); my $data = $self->get_room_by_name($room);
unless ($data){ if (!$data){
return $self->render('error', return $self->render('error',
err => 'ERROR_ROOM_s_DOESNT_EXIST', err => 'ERROR_ROOM_s_DOESNT_EXIST',
msg => sprintf ($self->l("ERROR_ROOM_s_DOESNT_EXIST"), $room), msg => sprintf ($self->l("ERROR_ROOM_s_DOESNT_EXIST"), $room),
room => $room room => $room
); );
} }
$self->render('password', room => $room); if ($self->req->method eq 'GET'){
}; return $self->render('password',
# Route for password submiting
post '/password/(:room)' => sub {
my $self = shift;
my $room = $self->stash('room') || '';
my $data = $self->get_room_by_name($room);
unless ($data){
return $self->render('error',
err => 'ERROR_ROOM_s_DOESNT_EXIST',
msg => sprintf ($self->l("ERROR_ROOM_s_DOESNT_EXIST"), $room),
room => $room room => $room
); );
} }
else{
my $pass = $self->param('password'); my $pass = $self->param('password');
# First check if we got the owner password, and if so, mark this user as owner # First check if we got the owner password, and if so, mark this user as owner
if ($data->{owner_password} && Crypt::SaltedHash->validate($data->{owner_password}, $pass)){ if ($data->{owner_password} && Crypt::SaltedHash->validate($data->{owner_password}, $pass)){
$self->session($room => {role => 'owner'}); $self->session($room => {role => 'owner'});
$self->redirect_to($self->get_url('/') . $room); return $self->redirect_to($self->get_url('/') . $room);
} }
# Then, check if it's the join password # Then, check if it's the join password
elsif ($data->{join_password} && Crypt::SaltedHash->validate($data->{join_password}, $pass)){ elsif ($data->{join_password} && Crypt::SaltedHash->validate($data->{join_password}, $pass)){
$self->session($room => {role => 'participant'}); $self->session($room => {role => 'participant'});
$self->redirect_to($self->get_url('/') . $room); return $self->redirect_to($self->get_url('/') . $room);
} }
# Else, it's a wrong password, display an error page # Else, it's a wrong password, display an error page
else{ else{
$self->render('error', return $self->render('error',
err => 'WRONG_PASSWORD', err => 'WRONG_PASSWORD',
msg => sprintf ($self->l("WRONG_PASSWORD"), $room), msg => sprintf ($self->l("WRONG_PASSWORD"), $room),
room => $room room => $room
); );
} }
}
}; };
# Catch all route: if nothing else match, it's the name of a room # Catch all route: if nothing else match, it's the name of a room

Loading…
Cancel
Save