Revize 3aa5f2d2

Re #7329 upravení identity a přidání enumu s rolemi

app/enum/EUserRole.php

@@ +1 @@
+<?php
+
+
+namespace App\Enum;
+
+
+class EUserRole
+{
+    const ADMIN = 'admin';
+    const USER = 'user';
+    const BASIC_USER = 'basic user';
+}

app/model/Authenticator.php

@@ -2 +2 @@
 
 namespace App\Model;
 
+use App\Model\Repository\RoleRepository;
 use App\Model\Repository\UserRepository;
 use App\Model\Repository\UserRoleRepository;
 use Nette\Security\AuthenticationException;
@@ -46 +47 @@
             throw new AuthenticationException('Nesprávné heslo.');
         }
 
-        $roles = $row->related(UserRoleRepository::TABLE_NAME, UserRoleRepository::COLUMN_USER_ID)
-            ->fetchField(UserRoleRepository::COLUMN_ROLE_ID);
+        $userRoles = $row->related(UserRoleRepository::TABLE_NAME, UserRoleRepository::COLUMN_USER_ID)->fetchAll();
+        foreach ($userRoles as $userRole)
+        {
+            $roles[] = $userRole->ref(RoleRepository::TABLE_NAME, UserRoleRepository::COLUMN_ROLE_ID)->{RoleRepository::COLUMN_NAME};
+        }
 
-        return new UserIdentity($row->{UserRepository::COLUMN_ID}, $row->{UserRepository::COLUMN_USERNAME}, $roles);
+        return new Identity($row->{UserRepository::COLUMN_ID}, $roles, $row);
     }
 }

app/model/UserIdentity.php

@@ -1 @@
-<?php
-
-namespace App\Model;
-
-use Nette\Security\Identity;
-
-/**
- * Rozšíření identity o jméno uživatele
- *
- * @package App\Model
- */
-class UserIdentity extends Identity
-{
-    /** @property */
-    public $username;
-
-    public function __construct($id, $username, $roles = null, $data = null)
-    {
-        parent::__construct($id, $roles, $data);
-
-        $this->username = $username;
-    }
-
-    /**
-     * Vrací uživatelské jméno
-     *
-     * @return string
-     */
-    public function getUsername()
-    {
-        return $this->username;
-    }
-}