diff --git a/script/administration/create_user.pl b/script/administration/create_user.pl
index 656f2497..7126f530 100755
--- a/script/administration/create_user.pl
+++ b/script/administration/create_user.pl
@@ -5,13 +5,14 @@
use Getopt::Long::Descriptive;
use Libki;
+use Libki::Utils::User;
my ( $opt, $usage ) = describe_options(
'%c %o',
- [ 'instance|i=s', "the instance for the user to exist on", { default => q{} } ],
- [ 'username|u=s', "the username for this user, required", { required => 1 } ],
+ [ 'instance|i=s', "the instance for the user to exist on", { default => q{} } ],
+ [ 'username|u=s', "the username for this user, required", { required => 1 } ],
[ 'password|p=s', "the password for this user" ],
- [ 'minutes|m=s', "number of minutes for this user" ],
+ [ 'minutes|m=i', "number of minutes for this user" ],
[ 'admin|a', "makes the user an admin" ],
[ 'superadmin|s', "makes the user a superadmin" ],
[],
@@ -20,64 +21,28 @@
print( $usage->text ), exit unless ( $opt->username );
-my $c = Libki->new();
-my $schema = $c->schema;
-my $user_rs = $schema->resultset('User');
-
-my $user = $user_rs->search( { instance => $opt->instance, username => $opt->username } )->next();
-
-if ($user) {
- $user->set_column( 'password', $opt->password );
- $user->update();
-}
-else {
- my $default_time_allowance_setting = $schema->resultset('Setting')->find({ instance => $opt->instance, name => 'DefaultTimeAllowance' });
- my $default_time_allowance = $default_time_allowance_setting ? $default_time_allowance_setting->value : 0;
-
- $user = $user_rs->create(
- {
- instance => $opt->instance,
- username => $opt->username,
- password => $opt->password,
- status => 'enabled',
- is_troublemaker => 'No',
- }
- );
-
- if (defined $opt->minutes) {
- $c->model('DB::Allotment')->update_or_create(
- {
- instance => $user->instance,
- user_id => $user->id,
- location => '',
- minutes => $opt->minutes,
- }
- );
+my $c = Libki->new();
+my $user = Libki::Utils::User::create_or_update_user(
+ $c,
+ {
+ instance => $opt->instance,
+ username => $opt->username,
+ password => $opt->password,
+ minutes => $opt->minutes,
+ admin => $opt->admin,
+ superadmin => $opt->superadmin,
}
-}
-
-if ( $opt->superadmin ) {
- my $role =
- $schema->resultset('Role')->search( { role => 'superadmin' } )->single();
-
- $schema->resultset('UserRole')->update_or_create(
- {
- role_id => $role->id,
- user_id => $user->id,
- }
- );
-}
-
-if ( $opt->admin || $opt->superadmin ) {
- my $role =
- $schema->resultset('Role')->search( { role => 'admin' } )->single();
+);
- $schema->resultset('UserRole')->update_or_create(
- {
- role_id => $role->id,
- user_id => $user->id,
- }
- );
+say "User created" if $user;
+say "User not created" unless $user;
+if ( $user && $opt->verbose ) {
+ say "User Id: " . $user->id;
+ say "Username: " . $user->username;
+ say "Instance: " . $user->instance;
+ say "Minutes: " . $user->minutes($c);
+ say "Is Admin: " . ( $user->has_role(q{admin}) ? 'Yes' : 'No' );
+ say "Is Admin: " . ( $user->has_role(q{superadmin}) ? 'Yes' : 'No' );
}
=head1 AUTHOR
diff --git a/t/controller_API-Client-v1_0.t b/t/controller_API-Client-v1_0.t
index 8d6af77e..8835e6fd 100644
--- a/t/controller_API-Client-v1_0.t
+++ b/t/controller_API-Client-v1_0.t
@@ -1,10 +1,137 @@
-use strict;
-use warnings;
+use Modern::Perl;
use Test::More;
+use JSON;
+use Data::Dumper;
use Catalyst::Test 'Libki';
use Libki::Controller::API::Client::v1_0;
+use Libki::Utils::User;
-ok( request('/api/client/v1_0')->is_success, 'Request should succeed' );
-done_testing();
+my $c = Libki->new();
+
+my $base = '/api/client/v1_0';
+my $base_params
+ = '?node=testClient&location=testLocation&type=testType&ipaddress=123.123.123&macaddress=00-B0-D0-63-C2-26&hostname=testHostnamev';
+
+# Test response for no action FIXME: Maybe we should return a 4xx here?
+my $res = request($base);
+ok( $res->is_success, 'Request should succeed' );
+is( $res->status_line, '200 OK', 'Status line is 200 OK' );
+is( $res->decoded_content, '{}', 'Content is empty JSON' );
+
+# Test basic client registration
+$res = request( $base . $base_params . '&node_name=TestClient&action=register_node' );
+ok( $res->is_success, 'Client registration succeeded' );
+my $json = decode_json( $res->decoded_content );
+is( $json->{status}, 'online', 'Registered client status is "online"' );
+
+my $user1
+ = Libki::Utils::User::create_or_update_user( $c, { username => "test1", password => "test1" } );
+isa_ok( $user1, "Libki::Model::DB::User", "Got a user" );
+
+my $user2
+ = Libki::Utils::User::create_or_update_user( $c, { username => "test2", password => "test2" } );
+isa_ok( $user2, "Libki::Model::DB::User", "Got another user" );
+
+subtest 'Client login' => sub {
+
+ # Test bad logins
+ ## Bad username
+ $res
+ = request( $base
+ . $base_params
+ . '&username=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA&password=badpassword&action=login' );
+ ok( $res->is_success, 'Client login response succeeded' );
+ $json = decode_json( $res->decoded_content );
+ is( $json->{error}, 'BAD_LOGIN', 'User was not authenticated' );
+
+ ### No username
+ $res = request( $base . $base_params . '&username=&password=badpassword&action=login' );
+ ok( $res->is_success, 'Client login response succeeded' );
+ $json = decode_json( $res->decoded_content );
+ is( $json->{error}, 'BAD_LOGIN', 'User was not authenticated' );
+
+ ### Bad password
+ $res = request( $base . $base_params . '&username=test1&password=badpassword&action=login' );
+ ok( $res->is_success, 'Client login response succeeded' );
+ $json = decode_json( $res->decoded_content );
+ is( $json->{error}, 'BAD_LOGIN', 'User was not authenticated' );
+
+ ### No password
+ $res = request( $base . $base_params . '&username=test1&password=&action=login' );
+ ok( $res->is_success, 'Client login response succeeded' );
+ $json = decode_json( $res->decoded_content );
+ is( $json->{error}, 'BAD_LOGIN', 'User was not authenticated' );
+
+ ## Test good credentials
+ $res = request( $base . $base_params . '&username=test1&password=test1&action=login' );
+ ok( $res->is_success, 'Client login response succeeded' );
+ $json = decode_json( $res->decoded_content );
+ is( $json->{authenticated}, '1', 'User was authenticated' );
+
+ ## Test duplicate login, should succeed
+ $res = request( $base . $base_params . '&username=test1&password=test1&action=login' );
+ ok( $res->is_success, 'Client login response succeeded' );
+ $json = decode_json( $res->decoded_content );
+ is( $json->{authenticated}, '1', 'User was authenticated' );
+
+ ## Test login with another user while original user is logged in
+ $res = request( $base . $base_params . '&username=test2&password=test2&action=login' );
+ ok( $res->is_success, 'Client login response succeeded' );
+ $json = decode_json( $res->decoded_content );
+ is( $json->{authenticated}, '1', 'User was authenticated' );
+
+ #TODO: Check the sessions table to ensure old session was removed and new session was created
+
+ # Test logout
+ ## Test logout when logged in
+ $res = request( $base . $base_params . '&username=test2&password=test2&action=logout' );
+ ok( $res->is_success, 'Client logout response succeeded' );
+ $json = decode_json( $res->decoded_content );
+ is( $json->{logged_out}, '1', 'User was logged out' );
+
+ #TODO: Check the sessions table to ensure session was removed
+
+ ## Test logout when not logged in
+ $res = request( $base . $base_params . '&username=test2&password=test2&action=logout' );
+ ok( $res->is_success, 'Client logout response succeeded' );
+ $json = decode_json( $res->decoded_content );
+ is( $json->{logged_out}, '0', 'Logged out' );
+};
+
+subtest 'Client guest login' => sub {
+ my $setting = $c->model( 'DB::Setting' )->find( { instance => $c->instance, name => 'EnableGuestSelfRegistration' } );
+ my $original_value = $setting->value;
+ $setting->update({ value => 1 });
+
+ # Do guest login
+ $res = request( $base . $base_params . '&createGuest=1&action=login' );
+ ok( $res->is_success, 'Client login response succeeded' );
+ $json = decode_json( $res->decoded_content );
+ is( $json->{authenticated}, '1', 'User was authenticated' );
+ ok( $json->{username}, 'Got guest username' );
+ ok( $json->{password}, 'Got guest password' );
+ my $username1 = $json->{username};
+
+ # Do second guest login
+ $res = request( $base . $base_params . '&createGuest=1&action=login' );
+ ok( $res->is_success, 'Client login response succeeded' );
+ $json = decode_json( $res->decoded_content );
+ is( $json->{authenticated}, '1', 'User was authenticated' );
+ ok( $json->{username}, 'Got guest username' );
+ ok( $json->{password}, 'Got guest password' );
+ my $username2 = $json->{username};
+
+ isnt( $username1, $username2, "Got different guest users for each login" );
+
+ $setting->update({ value => 0 });
+ $res = request( $base . $base_params . '&createGuest=1&action=login' );
+ ok( !$res->is_success, 'Client login response failed' );
+ $json = decode_json( $res->decoded_content );
+ is( $json->{authenticated}, '0', 'User was not authenticated' );
+ is( $json->{error}, 'GUEST_SELF_REG_NOT_ENABLED', "Error indicates guest self registration is not enabled" );
+ my $username1 = $json->{username};
+};
+
+done_testing()