1 files changed, 50 insertions, 6 deletions

diff --git a/public/app/controllers/Auth.php b/public/app/controllers/Auth.php
index f1e9819..e191c53 100644
--- a/public/app/controllers/Auth.php
+++ b/public/app/controllers/Auth.php
@@ -45,7 +45,16 @@ class Auth {
             ->setName($record['first_name'] .' '. $record['last_name'])
             ->setPassword($record['password'])
             ->setRoles([ $record['role_id'] ])      // roles is an array
-            ->setEnabled($record['active']);
+            ->setEnabled( ($record['active'] == 0) ? false : true )
+            ->set('prefix', $record['prefix'])
+            ->set('first_name', $record['first_name'])
+            ->set('last_name', $record['last_name'])
+            ->set('father_name', $record['father_name'])
+            ->set('email', $record['email'])
+            ->set('sector', $record['sector'])
+            ->set('position', $record['position'])
+            ->set('registration_number', $record['registration_number'])
+            ->set('belonging_school', $record['belonging_school']);
 
 
         // let user manager to validate user credentials
@@ -79,7 +88,7 @@ class Auth {
             $userManager->createUserToken($user);
             return [
                 'success' => true,
-                'goto' => '/admin/panel'
+                'goto' => '/panel'
             ];
     
         } else {
@@ -106,13 +115,13 @@ class Auth {
         $check = Access_model::activate_set_password($req->POST, $password);
 
         if ($check != 0) {
-            Render::view('/error/general', [
+            Render::json([
                 'title' => ACCOUNT_ACTIVATED_TITLE,
                  'message' => ACCOUNT_ACTIVATED_MESSAGE . '<br>(msg code: '. $check .')'
             ]);
 
         } else  {
-            Render::view('/error/general', [
+            Render::json([
                 'title' => NOT_VALID_ACTIVATION_TITLE,
                  'message' => NOT_VALID_ACTIVATION_MESSAGE
             ]);
@@ -199,15 +208,50 @@ class Auth {
         $manager = new App_manager();
         if ($manager->hasUserToken()) {
 
+            return true;
+
+        } else {
+            // user is not connected;
+            return false;
+        }
+    }
+
+
+    /** user_data 
+     * returns user's public data
+     */
+    public static function user_data()
+    {
+        $manager = new App_manager();
+        if ($manager->hasUserToken()) {
+
             // user is connected;
             $token = $manager->getUserToken();
             $user = $token->getUser();
 
-            return $user;
+            return [
+                'id' => $user->getID(),
+                'name' => $user->getName(),
+                'roles' => $user->getRoles(),
+
+                'sex' => $user->getSex(),
+                'active' => $user->isEnabled(),
+                'prefix' => $user->get('prefix'),
+                'first_name' => $user->get('first_name'),
+                'last_name' => $user->get('last_name'),
+                'father_name' => $user->get('father_name'),
+                'email' => $user->get('email'),
+                'sector' => $user->get('sector'),
+                'position' => $user->get('position'),
+                'registration_number' => $user->get('registration_number'),
+                'belonging_school' => $user->get('belonging_school')
+
+                // 'token' => $token->serialize()
+            ];
 
         } else {
             // user is not connected;
-            return false;
+            return [ 'user' => 0 ];
         }
     }