=

arikaim · Feb 28, 2020 · e79a5ac · e79a5ac
1 parent be65988
commit e79a5ac
Show file tree

Hide file tree

Showing 10 changed files with 152 additions and 25 deletions.
diff --git a/App/ArikaimStore.php b/App/ArikaimStore.php
@@ -19,7 +19,7 @@ class ArikaimStore
     /**
      *  Arikaim store host
      */
-    const HOST = 'http://arikaim.com';
+    const HOST       = 'http://arikaim.com';
     const SIGNUP_URL =  Self::HOST . '/signup';
 
     /**

diff --git a/App/Install.php b/App/Install.php
@@ -84,8 +84,10 @@ public function install()
 
         // add control panel permisison item 
         $result = Arikaim::access()->addPermission(Access::CONTROL_PANEL,Access::CONTROL_PANEL,'Arikaim control panel access.');
-        if ($result == false) {          
-            $this->addError("Can't create contorl panel permission");
+        if ($result == false) {    
+            if (Model::Permissions()->has(Access::CONTROL_PANEL) == false) {
+                $this->addError("Can't create contorl panel permission");
+            }           
         }   
 
         // register core events
@@ -193,7 +195,7 @@ private function createDefaultAdminUser()
                 return false;
             }    
         }
-
+              
         return Model::PermissionRelations()->setUserPermission(Access::CONTROL_PANEL,Access::FULL,$user->id);
     }
 
@@ -265,13 +267,13 @@ private function createDbTables()
 
         foreach ($classes as $class) {        
             $installed = Schema::install($class);
-
+                  
             if ($installed == false) {
                 $errors++;       
                 $error = 'Error create database table "' . Schema::getTable($class) . '"';
                 $this->addError($error);
             } 
-        }
+        }      
 
         return ($errors == 0);   
     }

diff --git a/Extension/Extension.php b/Extension/Extension.php
@@ -196,6 +196,23 @@ public function installDriver($name, $class = null, $category = null, $title = n
         return $result;
     }
 
+    /**
+     * Uninstall driver
+     *
+     * @param string $name Driver name   
+     * @return boolean
+    */
+    public function unInstallDriver($name)
+    {
+        $result = Arikaim::driver()->unInstall($name);
+        if ($result !== true) {
+            // add error
+            $this->addError(Arikaim::errors()->getError("ERROR_UNINSTALL_DRIVER",['name' => $name]));
+        } 
+
+        return $result;
+    }
+
     /**
      * Return extension name
      *

diff --git a/Models/PermissionRelations.php b/Models/PermissionRelations.php
@@ -101,20 +101,34 @@ public function getUserPermissions($userId)
         return $query->get();
     }
 
+    /**
+     * Get user group permisssions
+     *
+     * @param integer $groupId
+     * @return mixed
+     */
+    public function getGroupPermissions($groupId)
+    {
+        $query = $this->getRelationsQuery($groupId,'group');
+
+        return $query->get();
+    }
+
     /**
      * Set user permission
      *
      * @param string $name
      * @param array $permissions
      * @param integer|string|null $id
-     * @return bool
+     * @return Model|bool
      */
     public function setUserPermission($name, $permissions, $id = null) 
     {
         if (is_string($id) == true) {
             $model = DbModel::Users()->findById($id);
             $id = (is_object($model) == true) ? $model->id : null; 
         }
+
         return $this->setPermission($name,$permissions,$id,Self::USER);
     }
 
@@ -124,14 +138,15 @@ public function setUserPermission($name, $permissions, $id = null)
      * @param string $name
      * @param array $permissions
      * @param integer|string $id
-     * @return bool
+     * @return Model|bool
      */
     public function setGroupPermission($name, $permissions, $id)
     {
         if (is_string($id) == true) {
             $model = DbModel::UserGroups()->findById($id);
             $id = (is_object($model) == true) ? $model->id : null;
         }
+
         return $this->setPermission($name,$permissions,$id,Self::GROUP);
     }
 
@@ -220,21 +235,24 @@ public function getPermission($name, $id, $type = Self::USER)
      * @param array $access - ['read','write','delete','execute]
      * @param integer|null $id user Id or group Id 
      * @param integer $type
-     * @return bool
+     * @return Model|bool
      */
     public function setPermission($name, $access, $id = null, $type = Self::USER) 
     {
         $permissions = $this->resolvePermissions($access); 
         $id = ($id == null && $type == Self::USER) ? Arikaim::access()->getId() : $id;
-        $relationId = DbModel::Permissions()->getId($name);       
-        if (empty($relationId) == true) {
+        $permissionId = DbModel::Permissions()->getId($name);     
+        if (empty($permissionId) == true) {
             return false;
         }
-        $model = $this->saveRelation($id,$type,$relationId);
-
-        $result = (is_object($model) == true) ? $model->update($permissions) : false;        
+        $model = $this->saveRelation($permissionId,$type,$id);
+
+        if (is_object($model) == false) {
+            $model = $this->getRelation($permissionId,$type,$id);           
+        }        
+        $result = $model->update($permissions);  
 
-        return $result;
+        return ($result === false) ? false : $model;
     }
 
     /**
@@ -336,6 +354,7 @@ public function hasFull()
         $count += ($this->hasPermission('write') == false) ? 0 : 1;
         $count += ($this->hasPermission('delete') == false) ? 0 : 1;
         $count += ($this->hasPermission('execute') == false) ? 0 : 1;
+
         return ($count == 4) ? true : false;
     }
 }
diff --git a/Models/Permissions.php b/Models/Permissions.php
@@ -11,15 +11,19 @@
 
 use Illuminate\Database\Eloquent\Model;
 
+use Arikaim\Core\Access\Access;
+
 use Arikaim\Core\Db\Traits\Uuid;
 use Arikaim\Core\Db\Traits\Find;
+use Arikaim\Core\Db\Traits\Slug;
 
 /**
  * Permissions database model
  */
 class Permissions extends Model  
 {
     use Uuid,
+        Slug,
         Find;
 
     /**
@@ -29,9 +33,12 @@ class Permissions extends Model
     */
     protected $fillable = [
         'name',
+        'slug',
+        'editable',
         'title',
         'description',
-        'extension_name'
+        'extension_name',
+        'validator_class'
     ];
 
     /**
@@ -48,6 +55,13 @@ class Permissions extends Model
      */
     protected $table = 'permissions';
 
+    /**
+     * Slug source column
+     *
+     * @var string
+    */
+    protected $slugSourceColumn = 'name';
+
     /**
      * Mutator (get) for title attribute.
      *
@@ -67,6 +81,7 @@ public function getTitleAttribute()
     public function has($name)
     {
         $model = $this->where('name','=',$name)->first();
+
         return (is_object($model) == false) ? false : true;            
     }
 
@@ -79,6 +94,17 @@ public function has($name)
     public function getId($name)
     {
         $model = $this->where('name','=',$name)->first();
+
         return  (is_object($model) == true) ? $model->id : false;    
     }
+
+    /**
+     * Get permisisons list query
+     *
+     * @return Builder
+     */
+    public function getListQuery()
+    {
+        return $this->where('name','<>',Access::CONTROL_PANEL)->orderBy('name');
+    }
 }
diff --git a/Models/Schema/PermissionsSchema.php b/Models/Schema/PermissionsSchema.php
@@ -35,9 +35,12 @@ public function create($table)
         $table->id();
         $table->prototype('uuid');            
         $table->string('name')->nullable(false);
+        $table->slug();
+        $table->integer('editable')->nullable(true);  
         $table->string('extension_name')->nullable(true);
         $table->string('title')->nullable(true);
-        $table->string('description')->nullable(true);        
+        $table->string('description')->nullable(true);     
+        $table->string('validator_class')->nullable(true);                
         // indexes         
         $table->unique('name');
         $table->index('extension_name');
@@ -50,6 +53,15 @@ public function create($table)
      * @return void
      */
     public function update($table) 
-    {       
+    {   
+        if ($this->hasColumn('validator_class') == false) {
+            $table->string('validator_class')->nullable(true);     
+        } 
+        if ($this->hasColumn('slug') == false) {
+            $table->slug(); 
+        }     
+        if ($this->hasColumn('editable') == false) {
+            $table->integer('editable')->nullable(true);     
+        } 
     }
 }
diff --git a/Models/Schema/UserGroupMembersSchema.php b/Models/Schema/UserGroupMembersSchema.php
@@ -35,7 +35,8 @@ public function create($table)
         $table->id();            
         $table->userId();
         $table->relation('group_id','user_groups',false);
-
+        $table->prototype('uuid');     
+
         // date time   
         $table->dateCreated();
         $table->dateUpdated();
@@ -52,5 +53,8 @@ public function create($table)
      */
     public function update($table) 
     {        
+        if ($this->hasColumn('uuid') == false) {
+            $table->prototype('uuid');    
+        } 
     }
 }
diff --git a/Models/Schema/UserGroupsSchema.php b/Models/Schema/UserGroupsSchema.php
@@ -34,6 +34,8 @@ public function create($table)
         // columns
         $table->id();
         $table->prototype('uuid');     
+        $table->status();
+        $table->slug();
         $table->string('title')->nullable(false);
         $table->string('description')->nullable(true);   
         // unique indexes
@@ -46,7 +48,13 @@ public function create($table)
      * @param \Arikaim\Core\Db\TableBlueprint $table
      * @return void
      */
-    public function update($table) 
+    public function update($table)     
     {        
+        if ($this->hasColumn('status') == false) {
+            $table->status();
+        } 
+        if ($this->hasColumn('slug') == false) {
+            $table->slug();
+        }
     }
 }
diff --git a/Models/UserGroupMembers.php b/Models/UserGroupMembers.php
@@ -15,6 +15,7 @@
 use Arikaim\Core\Models\UserGroups;
 
 use Arikaim\Core\Db\Traits\Uuid;
+use Arikaim\Core\Db\Traits\Find;
 use Arikaim\Core\Db\Traits\DateCreated;
 
 /**
@@ -23,6 +24,7 @@
 class UserGroupMembers extends Model  
 {
     use Uuid,
+        Find,
         DateCreated;
 
     /**
@@ -32,8 +34,9 @@ class UserGroupMembers extends Model
     */
     protected $fillable = [        
         'user_id',
-        'groupd_id',
-        'date_expire'
+        'group_id',
+        'date_expire',
+        'date_created'
     ];
 
     /**
@@ -67,6 +70,35 @@ public function group()
      */
     public function user()
     {
-        return $this->hasOne(Users::class,'user_id','id');     
+        return $this->belongsTo(Users::class,'user_id');     
+    }
+
+    /**
+     * Add member to group
+     *
+     * @param string|integer $userId
+     * @param string|integer $groupId
+     * @return Model|false
+     */
+    public function addMember($userId, $groupId)
+    {
+        $user = new Users();
+        $user = $user->findById($userId);
+        if (is_object($user) == false) {
+            return false;
+        }
+
+        $group = new UserGroups();
+        $group = $group->findById($groupId);
+        if (is_object($group) == false) {
+            return false;
+        }
+
+        $member = $this->create([
+            'user_id'  => $user->id,
+            'group_id' => $group->id
+        ]);
+
+        return (is_object($member) == true) ? $member : false;
     }
 }