@@ -63,26 +63,31 @@ sub check_user_and_password {

 }

 sub is_collaborator {

-  my ($self, $user, $project, $session_user) = @_;

-

-  $session_user = $self->cntl->session('user') unless defined $session_user;

-  return unless $session_user;

+  my ($self, $user_id, $project_id, $collaborator_id) = @_;

+  

+  my $user_row_id = $self->get_user_row_id($user_id);

+  my $project_row_id = $self->app->dbi->model('project')->select(

+    where => {user => $user_row_id, id => $project_id}

+  )->value;

+  my $collaborator_row_id = $self->get_user_row_id($collaborator_id);

   my $row = $self->app->dbi->model('collaboration')->select(

-    id => [$user, $project, $session_user]

+    where => {project => $project_row_id, collaborator => $collaborator_row_id}

   )->one;

   return $row ? 1 : 0;

 }

 sub can_access_private_project {

-  my ($self, $user, $project) = @_;

+  my ($self, $user_id, $project_id) = @_;

-  my $session_user = $self->cntl->session('user');

-  $session_user = '' unless defined $session_user;

+  my $session_user_row_id = $self->cntl->session('user_row_id');

+  my $session_user_id = $self->app->dbi->model('user')->select(

+    'id', where => {row_id => $session_user_row_id}

+  )->value;

   my $is_valid =

-    ($user eq $session_user || $self->is_collaborator($user, $project))

+    ($user_id eq $session_user_id || $self->is_collaborator($user_id, $project_id, $session_user_id))

     && $self->logined;

   return $is_valid;

@@ -103,30 +108,42 @@ sub logined_admin {

   my $c = $self->cntl;

   # Check logined as admin

-  my $user = $c->session('user');

+  my $session_user_id = $self->session_user_id;

+  

+  return $self->app->manager->is_admin($session_user_id) && $self->logined($session_user_id);

+}

+

+sub session_user_id {

+  my $self = shift;

+  

+  my $session_user_row_id = $self->cntl->session('user_row_id');

+  my $session_user_id = $self->app->dbi->model('user')->select(

+    'id', where => {row_id => $session_user_row_id}

+  )->value;

-  return $self->app->manager->is_admin($user) && $self->logined($user);

+  return $session_user_id;

 }

 sub logined {

-  my ($self, $user) = @_;

+  my ($self, $user_id) = @_;

   my $c = $self->cntl;

-  

   my $dbi = $c->app->dbi;

-  my $current_user = $c->session('user');

+  my $session_user_row_id = $c->session('user_row_id');

+  my $session_user_id = $self->session_user_id;

   my $password = $c->session('password');

   return unless defined $password;

-  my $correct_password

-    = $dbi->model('user')->select('password', id => $current_user)->value;

+  my $correct_password = $dbi->model('user')->select(

+    'password',

+    where => {row_id => $session_user_row_id}

+  )->value;

   return unless defined $correct_password;

   my $logined;

-  

-  if (defined $user) {

-    $logined = $user eq $current_user && $password eq $correct_password;

+  if (defined $user_id) {

+    $logined = $user_id eq $session_user_id && $password eq $correct_password;

   }

   else {

     $logined = $password eq $correct_password

@@ -56,7 +56,6 @@

       # Login success

       my $password_encrypted = $user->{password};

       my $admin = $user->{admin};

-      session(user => $id); # Deprecated!

       session(user_row_id => $user->{row_id});

       session(password => $password_encrypted);

@@ -1,7 +1,8 @@

 <%

   # API

   my $api = gitprep_api;

-  my $session_user = session('user');

+  my $session_user_row_id = session('user_row_id');

+  my $session_user = app->dbi->model('user')->select(where => {row_id => $session_user_row_id})->one;

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

@@ -14,7 +15,7 @@

   my $errors;

   if ($op eq 'create') {

     # Parameters

-    my $project = param('project');

+    my $project_id = param('project');

     my $description = param('description');

     my $readme = param('readme');

     my $private = param('private');

@@ -26,13 +27,13 @@

     my $validation = $vc->validation;

     # "project"

-    if (!(defined $project && length $project)) {

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

       $validation->add_failed(project => 'Repository name is empty');

     }

-    elsif (!$vc->check($project, 'project_name')) {

+    elsif (!$vc->check($project_id, 'project_name')) {

       $validation->add_failed(project => 'Invalid repository name');

     }

-    elsif (app->manager->exists_project($session_user, $project)) {

+    elsif (app->manager->exists_project($session_user->{id}, $project_id)) {

       $validation->add_failed(project => 'Repository already exists');

     }

@@ -56,8 +57,8 @@

       # Create repository

       eval {

         $manager->create_project(

-          $session_user,

-          $project,

+          $session_user->{id},

+          $project_id,

           {description => $description, readme => $readme, private => $private}

         );

       };

@@ -67,7 +68,7 @@

         $errors = ['Internal error'];

       }

       else {

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

+        $self->redirect_to("/$session_user->{id}/$project_id");

         return;

       }

     }

@@ -112,7 +113,7 @@

           </tr>

           <tr>

             <td>

-              <i class="icon-user"></i><%= $session_user %>

+              <i class="icon-user"></i><%= $session_user->{id} %>

             </td>

             <td style="padding:0 10px">

               /

@@ -2,10 +2,13 @@

   # API

   my $api = gitprep_api;

-  # Paramters

-  my $user = param('user');

-  my $project = param('project');

-  my $current_user = session('user');

+  # Parameters

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

+  my $project_id = param('project');

+  my $session_user_row_id = session('user_row_id');

+  my $session_user = app->dbi->model('user')->select(

+    where => {row_id => $session_user_row_id}

+  )->one;

   # Can fork?

   unless ($api->logined) {

@@ -14,20 +17,20 @@

   }

   # Repository is already exists

-  if (app->manager->exists_project($current_user, $project)) {

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

+  if (app->manager->exists_project($session_user->{id}, $project_id)) {

+    $self->redirect_to("/$session_user->{id}/$project_id");

     return;

   }

   # Fork

   else {

-    eval { app->manager->fork_project($current_user, $user, $project) };

+    eval { app->manager->fork_project($session_user->{id}, $user_id, $project_id) };

     if (my $e = $@) {

       $self->reply->exception('Internal Error');

       app->log->error(url_for . ": $e");

     }

     else {

-      flash(message => "Repository is forked from /$user/$project.");

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

+      flash(message => "Repository is forked from /$user_id/$project_id.");

+      $self->redirect_to("/$session_user->{id}/$project_id");

     }

     return;

   }

@@ -2,8 +2,8 @@

   my $api = gitprep_api;

   my $logined = $api->logined;

-  my $current_user_row_id = session('user_row_id');

-  my $current_user = app->dbi->model('user')->select(where => {row_id => $current_user_row_id})->one;

+  my $session_user_row_id = session('user_row_id');

+  my $session_user = app->dbi->model('user')->select(where => {row_id => $session_user_row_id})->one;

   my $user_id = $self->param('user');

@@ -33,21 +33,21 @@

     <div class="header-right">

       <div class="header-rigth-container">

         % if ($api->logined) {

-          % unless ($current_user->{id} eq 'admin') {

+          % unless ($session_user->{id} eq 'admin') {

             <div class="header-btn-container">

               <a class="btn btn-small" href="<%= url_for("/_new") %>">Create a new repo</a>

             </div>

             <div class="header-btn-container">

-              <a class="btn btn-small" href="<%= url_for("/$current_user->{id}/_settings") %>">Account Settings</a>

+              <a class="btn btn-small" href="<%= url_for("/$session_user->{id}/_settings") %>">Account Settings</a>

             </div>

           % }

           % my $url = url_with->to_abs;

           <div class="header-btn-container">

             <a class="btn btn-small" href="<%= url_for("/_logout?from=$url") %>">Sign out</a>

           </div>

-          <!-- Logined as <%= $current_user->{id} %> -->

+          <!-- Logined as <%= $session_user->{id} %> -->

           <div class="header-login-container">

-            <i class="icon-user"></i><a href="<%= url_for("/$current_user->{id}") %>"><%= $current_user->{id} %></a>

+            <i class="icon-user"></i><a href="<%= url_for("/$session_user->{id}") %>"><%= $session_user->{id} %></a>

           </div>

         % } else {

           <div class="header-btn-container">

@@ -92,7 +92,7 @@

         <div class="project-header-right-container">

           % if (defined $project_id) {

             <div class="project-header-btn-container">

-              % if ($logined && $current_user->{id} ne $user_id ) {

+              % if ($logined && $session_user->{id} ne $user_id ) {

                 <a href="<%= url_for("/$user_id/$project_id/fork") %>" class="btn">Fork</a>

               % } else {

                 <button class="btn disabled" disabled>Fork</button>

@@ -128,7 +128,7 @@

                   Graph

                 </a>

               </li>

-              % if ($logined && $user_id eq session('user')) {

+              % if ($logined && $user_id eq $session_user->{id}) {

                 <li class="<%= $tab eq 'settings' ? 'active' :  '' %>">

                   <a href="<%= url_for("/$user_id/$project_id/settings") %>">

                     <i class="icon-cog"></i>