@@ -29,3 +29,4 @@ setup/latest-build

 setup/work/*

 setup/build.log

 xt/admin.db

+xt/admin

@@ -1,5 +1,15 @@

 <%

+  # API

+  my $api = gitprep_api;

+

   my $op = param('op') || '';

+

+  # Authentication

+  unless ($api->logined) {

+    $self->redirect_to('/');

+    $self->finish_rendering;

+    return;

+  }

   my $errors;

   if ($op eq 'create') {

@@ -8,15 +18,10 @@

     # Validation

     my $params = $api->params;

-    my $keyword_check = sub {

-      my $value = shift;

-      

-      return ($value || '') =~ /^[a-zA-Z0-9_\-]+$/

-    };

     my $rule = [

       project => [

         ['not_blank' => 'Repository name is empty'],

-        [$keyword_check => 'Invalid repository name']

+        ['project_name' => 'Invalid repository name']

       ],

       description => [

         'any'

@@ -62,7 +67,8 @@

         }

         else {

           $self->redirect_to("/$user/$project");

-          return 1;

+          $self->finish_rendering;

+          return;

         }

       }

     }

@@ -1,19 +1,20 @@

 <%

+  # API

   my $api = gitprep_api;

-  my $logined = $api->logined;

-  my $user_is_valid = $logined && $user eq session('user');

-  my $default_branch_name = app->manager->default_branch($user, $project);

-

-  my $git = app->git;

-

+  

+  # Parameters

   my $op = param('op') || '';

+  my $user = param('user') || '';

-  unless ($user_is_valid) {

-    $self->render_exception('Forbidden');

-    $self->res->code(403);

+  # Authentication

+  unless ($api->logined($user)) {

+    $self->redirect_to('/');

+    $self->finish_rendering;

     return;

   }

+  # Rename project

+  my $git = app->git;

   if ($op eq 'rename-project') {

     # Validation

@@ -53,6 +54,8 @@

       $self->render(json => {ok => 0, message => 'Invalid Parameters'});

     }

   }

+  

+  # Change description

   elsif ($op eq 'change_description') {

     my $description = param('description');

     $description = '' unless defined $description;

@@ -61,6 +64,8 @@

     $self->render(json => {ok => 1});

     return $self->res->body;

   }

+  

+  # Delete project

   elsif ($op eq 'delete-project') {

     # Validation

@@ -218,7 +223,7 @@

         Default Branch

         % my $branches = $git->branches($user, $project);

         % my $branch_names = [map { $_->{name} } @$branches];

-        % push @$branch_names, $default_branch_name unless @$branch_names;

+        % push @$branch_names, app->manager->default_branch($user, $project) unless @$branch_names;

         %= select_field 'default_branch' => $branch_names, style => 'margin-top:5px';

       </div>

     </div>

@@ -1,3 +1,19 @@

+<%

+  # API

+  my $api = gitprep_api;

+  

+  # Parameters

+  my $op = param('op') || '';

+  my $user = param('user') || '';

+  

+  # Authentication

+  unless ($api->logined($user)) {

+    $self->redirect_to('/');

+    $self->finish_rendering;

+    return;

+  }

+%>

+

 % layout 'common';

   %= include '/include/header';

@@ -5,6 +5,7 @@ use utf8;

 use lib "$FindBin::Bin/../mojo/lib";

 use lib "$FindBin::Bin/../lib";

 use lib "$FindBin::Bin/../extlib/lib/perl5";

+use File::Path 'rmtree';

 use Encode qw/encode decode/;

 use Test::Mojo;

@@ -268,3 +269,71 @@ note 'Reset password';

   $t->post_ok('/_login?op=login', form => {id => 'kimoto1', password => 'b'});

   $t->get_ok('/')->content_like(qr/kimoto1/);

 }

+

+note 'User Account Settings';

+{

+  unlink $db_file;

+  rmtree $rep_home;

+

+  my $app = Gitprep->new;

+  my $t = Test::Mojo->new($app);

+  $t->ua->max_redirects(3);

+

+  # Create admin user

+  $t->post_ok('/_start?op=create', form => {password => 'a', password2 => 'a'})

+    ->content_like(qr/Login Page/);

+  ;

+

+  # Login as admin

+  $t->post_ok('/_login?op=login', form => {id => 'admin', password => 'a'});

+

+  # Create user

+  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto1', password => 'a', password2 => 'a'})

+    ->content_like(qr/kimoto1/);

+  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto2', password => 'a', password2 => 'a'})

+    ->content_like(qr/kimoto2/);

+  

+  # Login as kimoto1

+  $t->post_ok('/_login?op=login', form => {id => 'kimoto1', password => 'a'});

+

+  # User account settings

+  $t->get_ok('/kimoto1/_settings')

+    ->content_like(qr/User Account Settings/)

+  ;

+  

+  # Other user can't access

+  $t->get_ok('/kimoto2/_settings')

+    ->content_like(qr/Users/)

+  ;

+  

+  note 'Create repository';

+  {

+    # Create repository page

+    $t->get_ok('/_new')

+      ->content_like(qr/Create repository/)

+    ;

+    

+    # Not logined user can't access

+    $t->get_ok('/_logout');

+    $t->get_ok('/_new')

+      ->content_like(qr/Users/)

+    ;

+    $t->post_ok('/_login?op=login', form => {id => 'kimoto1', password => 'a'});

+    

+    # Create repository

+    $t->post_ok('/_new?op=create', form => {project => 't1', description => 'Hello'})

+      ->content_like(qr/Create a new repository on the command line/)

+      ->content_like(qr/t1\.git/)

+      ->content_like(qr/Hello/)

+    ;

+

+    # Create repository(with readme)

+    $t->post_ok('/_new?op=create', form => {project => 't2', description => 'Hello', readme => 1})

+      ->content_like(qr/first commit/)

+      ->content_like(qr/t2\.git/)

+      ->content_like(qr/README/)

+    ;    

+  }

+}

+

+