2 files changed, 20 insertions, 3 deletions
diff --git a/public/app/routes/frontend.php b/public/app/routes/frontend.php
index 47b1816..14152c1 100644
--- a/public/app/routes/frontend.php
+++ b/public/app/routes/frontend.php
@@ -14,7 +14,10 @@ Route::add('/', function() { Render::view('user/login'); });
 
 
 Route::add('/invitation/([0-9]*)', function($id) {
-    Auth::invitation($id);
+    if ($id == "" || $id == "0") { Render::view('error/404');
+    } else {
+        Auth::invitation($id);
+    }
 });
 
 // new petition
@@ -27,6 +30,8 @@ Route::add('/petition/([0-9a-z\-_]*)/([0-9a-f]*)', function($tag) {
     Office::filter_request_petition($tag, $id);
 });
 
+
+
 // Error pages
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/public/app/routes/user.php b/public/app/routes/user.php
index a2d48d6..aa3b319 100644
--- a/public/app/routes/user.php
+++ b/public/app/routes/user.php
@@ -3,6 +3,7 @@
 use app\controllers\Auth;
 use app\controllers\Classroom_user;
 
+
 /** User Connection Management Routes
  * -----------------------------------------------------------------------------
  */
@@ -11,7 +12,12 @@ use app\controllers\Classroom_user;
 // --- -- -- - - -
 
 // request login ... -> then sends to POST:/account/check-login
-Route::add('/login', function() { Render::view('user/login'); });
+Route::add('/login', function() {
+    if (Auth::is_connected()) { header('Location: /panel');
+    } else {
+        Render::view('user/login');
+    }
+});
 
 // request logout
 Route::add('/logout', function() {
@@ -33,9 +39,13 @@ Route::add('/invite', function() {
 });
 
 Route::add('/panel', function() {
-    Render::json(['connected' => Auth::is_connected()]);
+    Render::json([
+        'connected' => Auth::is_connected(),
+        'user' => Auth::user_data(),
+    ]);
 });
 
+
 // Replies to common requests (POST method)
 // --- -- -- - - -
 
@@ -81,7 +91,9 @@ Route::add('/account/profile', function() {
 
 // test connection
 if (!PRODUCTION) {
+
     Route::add('/check/connection', function() { Auth::is_connected(); });
+
 }