@@ -9,6 +9,7 @@

     and move this feature to project settings page.

   - setup.sh is renamed to setup_module

   - separete database creating logic to setup_database script

+  - add name and mail column to user table. mail is required for user registration.

 1.12 (7 Feb 2016)

   - Catch up latest Github design.

@@ -1,8 +0,0 @@

-Copyright 2012-2013 Yuki Kimoto. All rights reserved.

-

-This program is free software; you can redistribute it and/or modify it

-under the same terms of either:

-

-  a) the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) any later version, or

-

-  b) the "Artistic License". 

@@ -446,6 +446,13 @@ If you install perl 5.10.1+ by perlbrew, you can install latest GitPrep.

 ### I know information about GitPrep 2.0 upgrading.

+You can upgrade GitPrep 2.0 the following command.

+

+    ./setup_module

+    ./setup_database

+

+And you should know the following small changes.

+

 **1. X-Forwarded-HTTPS header is deprecated. use  X-Forwarded-Proto header.**

     # This is deprecated in GitPrep 2.0

@@ -462,7 +469,7 @@ and move this feature to project settings page.

     # Go to settings page in your project

     /kimoto/gitprep/settings

-**2. remove [basic]show_ignore_space_change_link option**

+**3. remove [basic]show_ignore_space_change_link option**

 remove [basic]show_ignore_space_change_link option.

 but enable this feature on in project settings page.

@@ -470,7 +477,7 @@ but enable this feature on in project settings page.

     # Go to settings page in your project

     /kimoto/gitprep/settings

-**3. remove [basic]encoding_suspects option**

+**4. remove [basic]encoding_suspects option**

 remove [basic]encoding_suspects option

 and move this feature to project settings page.

@@ -478,6 +485,10 @@ and move this feature to project settings page.

     # Go to settings page in your project

     /kimoto/gitprep/settings

+**5. mail is required for user registration.

+

+mail address is require for user registration.

+

 ## For Developer

 If you are a developer, you can start the application in development mode.

@@ -311,6 +311,13 @@ create table user (

 EOS

     $dbi->execute($sql);

   };

+  

+  # Check mail column

+  my $not_exists_user_mail;

+  eval { $dbi->select('mail', table => 'user') };

+  if ($@) {

+    $not_exists_user_mail = 1;

+  }

   # Create user columns

   my $user_columns = [

@@ -323,7 +330,7 @@ EOS

   for my $column (@$user_columns) {

     eval { $dbi->execute("alter table user add column $column") };

   }

-  

+

   # Check user table

   eval { $dbi->select([qw/row_id id admin password salt mail name/], table => 'user') };

   if ($@) {

@@ -331,7 +338,20 @@ EOS

     $self->app->log->error($error);

     croak $error;

   }

-

+  

+  # If mail is empty, id is copied to mail for uniqueness

+  my $user_ids = $dbi->select('id', table => 'user', where => {mail => ''})->values;

+  for my $user_id (@$user_ids) {

+    $dbi->update({mail => "$user_id\@gitprep.example"}, table => 'user', where => {id => $user_id});

+  }

+  

+  # add unique to mail

+  eval { $dbi->execute("create unique index user__mail on user(mail)") };

+  my $created_user_mail_index = $dbi->execute("select * from sqlite_master where type = 'index' and name = 'user__mail'")->one;

+  unless ($created_user_mail_index) {

+    croak "Can't create user__mail index";

+  }

+  

   # Create ssh_public_key table

   eval {

     my $sql = <<"EOS";

@@ -8,6 +8,8 @@

     # Parameters

     my $id = param('id');

+    my $name = param('name');

+    my $mail = param('mail');

     my $password = param('password');

     my $password2 = param('password2');

@@ -34,6 +36,23 @@

       }

     }

+    # "name" check

+    $name //= '';

+    

+    # "mail" check

+    if (!(defined $mail && length $mail)) {

+      $validation->add_failed(mail => "Mail must be not empty");

+    }

+    elsif ($mail !~ /\@/) {

+      $validation->add_failed(mail => "Invalid mail address");

+    }

+    else {

+      my $row = app->dbi->model('user')->select(where => {mail => $mail})->one;

+      if ($row) {

+        $validation->add_failed(id => "Mail $mail already exists");

+      }

+    }

+    

     # "password" check

     $password2 ||= '';

     if (!(defined $password && length $password)) {

@@ -53,6 +72,8 @@

       my $params = {};

       $params->{password} = $password_encrypted;

       $params->{salt} = $salt;

+      $params->{name} = $name;

+      $params->{mail} = $mail;

       # Create user

       eval { app->manager->create_user($id, $params) };

@@ -96,9 +117,21 @@

     <form class="user-form" action="<%= url_for->query(op => 'create') %>" method="post">

       <div class="user-form-container">

         <div>

-          <div>User name</div>

+          <div>ID</div>

+          <div>

+            <%= text_field 'id', placeholder => 'ID' %>

+          </div>

+        </div>

+        <div>

+          <div>Name</div>

+          <div>

+            <%= text_field 'name', placeholder => 'Name' %>

+          </div>

+        </div>

+        <div>

+          <div>Mail</div>

           <div>

-            <%= text_field id => $id, placeholder => 'User', id =>'user-name'%>

+            <%= text_field 'mail', placeholder => 'Mail' %>

           </div>

         </div>

         <div>

@@ -40,7 +40,7 @@ note 'import_rep';

   $t->content_like(qr/Admin/);

   # Create user

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

+  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto', mail => 'kimoto@foo.com', password => 'a', password2 => 'a'});

   $t->content_like(qr/Success.*created/);

   # Import repositories

@@ -41,7 +41,7 @@ note 'Smart HTTP';

   $t->content_like(qr/Admin/);

   # Create user

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

+  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto', mail => 'kimoto@foo.com', password => 'a', password2 => 'a'});

   $t->content_like(qr/Success.*created/);

   # Login as kimoto

@@ -150,9 +150,9 @@ note 'Private repository and collaborator';

   $t->content_like(qr/Admin/);

   # Create user

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

+  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto', mail => 'kimoto@foo.com', password => 'a', password2 => 'a'});

   $t->content_like(qr/Success.*created/);

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

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

   $t->content_like(qr/Success.*created/);

   # Login as kimoto

@@ -127,7 +127,7 @@ note 'Admin pages';

     $t->content_like(qr/Two password/);

     # Create user

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

+    $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto', mail => 'kimoto@foo.com', password => 'a', password2 => 'a'});

     $t->content_like(qr/Success.*created/);

   }

@@ -163,7 +163,7 @@ note 'Admin pages';

   note 'Delete user';

   {

     # Create user

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

+    $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto-tmp', mail => 'kimoto-tmp@foo.com', password => 'a', password2 => 'a'});

     $t->content_like(qr/kimoto-tmp/);

     $t->get_ok('/_admin/users');

     $t->content_like(qr/kimoto-tmp/);

@@ -215,9 +215,9 @@ note 'Reset password';

   $t->content_like(qr/Admin/);

   # Create user

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

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

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

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

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

   $t->content_like(qr/kimoto2/);

   # Logout

@@ -262,9 +262,9 @@ note 'Profile';

   $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'});

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

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

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

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

   $t->content_like(qr/kimoto2/);

   # Login as kimoto1

@@ -552,9 +552,9 @@ note 'Private repository and collaborator';

   $t->content_like(qr/Admin/);

   # Create user

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

+  $t->post_ok('/_admin/user/create?op=create', form => {id => 'kimoto', mail => 'kimoto@foo.com', password => 'a', password2 => 'a'});

   $t->content_like(qr/Success.*created/);

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

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

   $t->content_like(qr/Success.*created/);

   # Login as kimoto