Pear-Trading/Foodloop-Server
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Change registration to be the same as the api docs

Browse source
This commit is contained in:
Tom Bloor 2017-04-22 19:35:19 +01:00
parent 7e5211b7b7
commit 1d1b4aa1cf
8 changed files with 91 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

63
lib/Pear/LocalLoop/Controller/Api/Register.pm
View file

@ -8,10 +8,8 @@ has error_messages => sub {
required => { message => 'No token sent.', status => 400 },
in_resultset => { message => 'Token invalid or has been used.', status => 401 },
},
username => {
required => { message => 'No username sent or was blank.', status => 400 },
like => { message => 'Username can only be A-Z, a-z and 0-9 characters.', status => 400 },
not_in_resultset => { message => 'Username exists.', status => 403 },
name => {
required => { message => 'No name sent or was blank.', status => 400 },
},
email => {
required => { message => 'No email sent.', status => 400 },
@ -20,6 +18,7 @@ has error_messages => sub {
},
postcode => {
required => { message => 'No postcode sent.', status => 400 },
postcode => { message => 'Postcode is invalid', status => 400 },
},
password => {
required => { message => 'No password sent.', status => 400 },
@ -28,10 +27,10 @@ has error_messages => sub {
required => { message => 'No usertype sent.', status => 400 },
in => { message => '"usertype" is invalid.', status => 400 },
},
age => {
required => { message => 'No age sent.', status => 400 },
number => { message => 'Age range is invalid', status => 400 },
in_resultset => { message => 'Age range is invalid.', status => 400 },
age_range => {
required => { message => 'No age_range sent.', status => 400 },
number => { message => 'age_range is invalid', status => 400 },
in_resultset => { message => 'age_range is invalid.', status => 400 },
},
street_name => {
required => { message => 'No street_name sent.', status => 400 },
@ -46,62 +45,30 @@ sub post_register{
my $c = shift;
my $validation = $c->validation;
my $json = $c->req->json;
if ( ! defined $json ){
return $c->render( json => {
success => Mojo::JSON->false,
message => 'No json sent.',
},
status => 400,); #Malformed request
}
$validation->input( $json );
$validation->input( $c->stash->{api_json} );
my $token_rs = $c->schema->resultset('AccountToken')->search_rs({used => 0});
$validation->required('token')->in_resultset('name', $token_rs);
my $customer_rs = $c->schema->resultset('Customer');
$validation->required('username')->like(qr/^[A-Za-z0-9]+$/)->not_in_resultset('username', $customer_rs);
my $user_rs = $c->schema->resultset('User');
$validation->required('email')->email->not_in_resultset('email', $user_rs);
#TODO test to see if post code is valid.
$validation->required('postcode');
#TODO should we enforce password requirements.
$validation->required('password');
$validation->required('name');
$validation->required('postcode')->postcode;
$validation->required('usertype')->in('customer', 'organisation');
my $usertype = $validation->param('usertype') || '';
if ( $usertype eq 'customer' ) {
my $age_rs = $c->schema->resultset('AgeRange');
$validation->required('age')->number->in_resultset('id', $age_rs);
$validation->required('age_range')->number->in_resultset('id', $age_rs);
} elsif ( $usertype eq 'organisation' ) {
$validation->required('street_name');
$validation->required('town');
}
if ( $validation->has_error ) {
my $failed_vals = $validation->failed;
for my $val ( @$failed_vals ) {
my $check = shift @{ $validation->error($val) };
return $c->render(
json => {
success => Mojo::JSON->false,
message => $c->error_messages->{$val}->{$check}->{message},
},
status => $c->error_messages->{$val}->{$check}->{status},
);
}
}
return $c->api_validation_error if $validation->has_error;
if ($usertype eq 'customer'){
@ -112,8 +79,8 @@ sub post_register{
})->update({ used => 1 });
$c->schema->resultset('User')->create({
customer => {
username => $validation->param('username'),
age_range_id => $validation->param('age'),
name => $validation->param('name'),
age_range_id => $validation->param('age_range'),
postcode => $validation->param('postcode'),
},
email => $validation->param('email'),
@ -132,7 +99,7 @@ sub post_register{
})->update({ used => 1 });
$c->schema->resultset('User')->create({
organisation => {
name => $validation->param('username'),
name => $validation->param('name'),
street_name => $validation->param('street_name'),
town => $validation->param('town'),
postcode => $validation->param('postcode'),