mirror of https://github.com/dani/vroom.git
Remove the old password route and template
This commit is contained in:
parent
506b6f12db
commit
d5c95fb9eb
|
@ -1,29 +0,0 @@
|
|||
% title $self->l('PASSWORD_REQUIRED');
|
||||
%= include 'header'
|
||||
%= include 'public_toolbar'
|
||||
<div class="container-fluid">
|
||||
<br/>
|
||||
<div class="jumbotron">
|
||||
<h2><%=l 'PASSWORD_REQUIRED' %></h2>
|
||||
<p><%=l 'A_PASSWORD_IS_NEEDED_TO_JOIN' %></p>
|
||||
<form id="joinPassForm" class="form-inline" method="post">
|
||||
<fieldset>
|
||||
<div class="row">
|
||||
<div class="input-group col-md-6 col-lg-4">
|
||||
<span class="input-group-addon">
|
||||
<strong class="text-muted">
|
||||
<%=l 'PASSWORD' %>
|
||||
</strong>
|
||||
</span>
|
||||
<input id="password" name="password" type="password" placeholder="<%=l 'PASSWORD' %>" class="form-control help" data-toggle="tooltip" data-placement="bottom" title="<%=l 'PASSWORD' %>" autofocus>
|
||||
<span class="input-group-btn">
|
||||
<button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-log-in"></span></button>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
%= include 'js_common'
|
||||
%= include 'footer'
|
51
vroom.pl
51
vroom.pl
|
@ -1333,57 +1333,6 @@ get '/localize/:lang' => { lang => 'en' } => sub {
|
|||
return $self->render(json => $strings);
|
||||
};
|
||||
|
||||
# Route for the password page
|
||||
# When someone tries to join a password protected room
|
||||
any [qw(GET POST)] => '/password/(:room)' => sub {
|
||||
my $self = shift;
|
||||
my $room = $self->stash('room') || '';
|
||||
my $data = $self->get_room_by_name($room);
|
||||
if (!$data){
|
||||
return $self->render('error',
|
||||
err => 'ERROR_ROOM_s_DOESNT_EXIST',
|
||||
msg => sprintf ($self->l("ERROR_ROOM_s_DOESNT_EXIST"), $room),
|
||||
room => $room
|
||||
);
|
||||
}
|
||||
if ($self->req->method eq 'GET'){
|
||||
return $self->render('password',
|
||||
room => $room
|
||||
);
|
||||
}
|
||||
else{
|
||||
my $pass = $self->param('password');
|
||||
# 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)){
|
||||
$self->session($room => {role => 'owner'});
|
||||
$self->associate_key_to_room(
|
||||
room => $room,
|
||||
key => $self->session('key'),
|
||||
role => 'owner'
|
||||
);
|
||||
return $self->redirect_to($self->get_url('/') . $room);
|
||||
}
|
||||
# Then, check if it's the join password
|
||||
elsif ($data->{join_password} && Crypt::SaltedHash->validate($data->{join_password}, $pass)){
|
||||
$self->session($room => {role => 'participant'});
|
||||
$self->associate_key_to_room(
|
||||
room => $room,
|
||||
key => $self->session('key'),
|
||||
role => 'participant'
|
||||
);
|
||||
return $self->redirect_to($self->url_for('/') . $room);
|
||||
}
|
||||
# Else, it's a wrong password, display an error page
|
||||
else{
|
||||
return $self->render('error',
|
||||
err => 'WRONG_PASSWORD',
|
||||
msg => sprintf ($self->l("WRONG_PASSWORD"), $room),
|
||||
room => $room
|
||||
);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
# API requests handler
|
||||
any '/api' => sub {
|
||||
my $self = shift;
|
||||
|
|
Loading…
Reference in New Issue