fix: Extension role changing keeps functions

app/Http/Controllers/API/Settings/RoleController.php

@@ -255,11 +255,16 @@ public function extensions(Request $request)
      */
     public function setExtensions(Request $request)
     {
-        Permission::where([
+        $extensions = Permission::where([
             'morph_id' => $request->role_id,
             'type' => 'extension',
             'key' => 'id',
-        ])->delete();
+        ]);
+
+        $role = Role::find($request->role_id);
+        $oldExtensions = $role->permissions->where('type', 'extension')->pluck('value')->toArray();
+
+        $extensions->delete();
 
         foreach ($request->extensions as $extension) {
             Permission::grant(
@@ -272,6 +277,17 @@ public function setExtensions(Request $request)
             );
         }
 
+        // Detect removed extensions and remove their functions
+        $newExtensions = $request->extensions;
+        $removedExtensions = array_diff($oldExtensions, $newExtensions);
+        foreach ($removedExtensions as $extension) {
+            Permission::where([
+                'morph_id' => $request->role_id,
+                'type' => 'function',
+                'value' => Extension::find($extension)->name,
+            ])->delete();
+        }
+
         AuditLog::write(
             'role',
             'edit',

app/Models/Extension.php

@@ -67,21 +67,6 @@ public function license()
         return $this->hasOne('App\Models\License', 'extension_id');
     }
 
-    /**
-     * Boot model
-     *
-     * @return void
-     */
-    protected static function boot()
-    {
-        parent::boot();
-        static::addGlobalScope('extensions', function (
-            \Illuminate\Database\Eloquent\Builder $builder
-        ) {
-            $builder->orderBy('order');
-        });
-    }
-
     /**
      * Get extension servers
      *

storage/VERSION

@@ -1 +1 @@
-2.0.3
+2.1-dev