Version 1.x

.github/workflows/ec2-deploy.yaml

@@ -55,8 +55,11 @@ jobs:
             docker restart queue-notifications
             docker restart queue-social
             docker restart laravel-scheduler
+            docker restart batch-logger-queue
             if [ "docker-compose.${{ github.ref_name }}.yml" == "docker-compose.1.x.yml" ]; then
               docker restart queue4
               docker restart queue5
               docker restart queue6
             fi
+
+            docker exec -i phpkanvas-ecosystem php artisan octane:reload

.github/workflows/tests.yml

@@ -56,7 +56,7 @@ jobs:
       MEILISEARCH_HOST: http://localhost:7700
       MEILISEARCH_KEY: masterKey
       SCOUT_QUEUE: false
-      #APP_DEBUG: true
+      # APP_DEBUG: true
 
       #third party integration
       TEST_ZOHO_CLIENT_ID: ${{ secrets.TEST_ZOHO_CLIENT_ID }}

.gitignore

@@ -25,3 +25,7 @@ service-account.json
 /tools/*
 /tools/php-cs-fixer/*
 /tools/php-cs-fixer/vendor/*
+
+/caddy
+frankenphp
+frankenphp-worker.php

1.x.Dockerfile

@@ -52,4 +52,4 @@ RUN chmod -R 777 /var/www/html/storage/logs/
 
 RUN composer install --no-dev --optimize-autoloader
 
-EXPOSE 8080
+EXPOSE 8000

Caddyfile

@@ -12,6 +12,19 @@ http://localhost {
 	# Enable compression (optional)
 	encode zstd br gzip
 
+	@options_method {
+        method OPTIONS
+    }
+
+    handle @options_method {
+        header Access-Control-Allow-Origin "*"
+        header Access-Control-Allow-Methods "GET, POST, OPTIONS, PUT, DELETE"
+        header Access-Control-Allow-Headers "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range,Public-Key,Authorization,X-Kanvas-App,X-Kanvas-Key,X-Kanvas-Location"
+        header Access-Control-Max-Age "1728000"
+        header Content-Type "text/plain charset=UTF-8"
+        respond "" 204
+    }
+
 	php_fastcgi /php-fpm
 	# Execute PHP files from the public/ directory and serve assets
 	php_server

README.md

@@ -101,7 +101,7 @@ DB_CRM_PASSWORD=password
 
 ## Running the project with Laravel Octane
 
-After doing all the steps above, you could run the project with Laravel Octane by using the command ```php artisan octane:start --port 8080 --host=0.0.0.0```. 
+After doing all the steps above, you could run the project with Laravel Octane by using the command ```php artisan octane:start --server=swoole --host=0.0.0.0 --port=8000```. 
 
 Use `--watch` in development allowing you to refresh modified files, this works assuming to have `npm install chokidar` installed in the project.
 ****
@@ -116,12 +116,3 @@ Note:
 - To install Swoole you can use the command ```pecl install swoole``` 
 - For production remove `--watch` from the command.
 - roles_kanvas_legacy will be deleted in the future.
-
-
-## Feature Labs
-
-### Run the project using FrankenPHP
-
-``` sh
-docker compose -f docker-compose.franken.yml up -d --build
-```

app/Console/Commands/AccessControl/UpdateAbilitiesCommand.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Console\Commands\AccessControl;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Redis;
+use Kanvas\AccessControlList\Actions\CreateAbilitiesByModule;
+use Kanvas\Apps\Models\Apps;
+use Kanvas\AccessControlList\Enums\ModuleEnum;
+use Kanvas\AccessControlList\Repositories\RolesRepository;
+
+class UpdateAbilitiesCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'kanvas:update-abilities {app?}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        if ($key = $this->argument('app')) {
+            $apps = Apps::where('key', $key)->get();
+        } else {
+            $apps = Apps::all();
+        }
+        foreach ($apps as $app) {
+            (new CreateAbilitiesByModule($app))->execute();
+        }
+    }
+}

app/Console/Commands/Connectors/Shopify/ShopifyInventorySyncCommand.php

@@ -13,6 +13,7 @@
 use Kanvas\Inventory\Products\Models\Products;
 use Kanvas\Inventory\Warehouses\Models\Warehouses;
 use Kanvas\Users\Models\UserCompanyApps;
+use Throwable;
 
 class ShopifyInventorySyncCommand extends Command
 {
@@ -53,11 +54,16 @@ public function handle()
                     ->get();
 
         foreach ($products as $product) {
-            $this->info("Checking product {$product->getId()} {$product->name} \n");
+            try {
+                $this->info("Checking product {$product->getId()} {$product->name} \n");
 
-            $shopifyService = new ShopifyInventoryService($product->app, $product->company, $warehouses);
-            $shopifyService->saveProduct($product, StatusEnum::ACTIVE, $channel);
+                $shopifyService = new ShopifyInventoryService($product->app, $product->company, $warehouses);
+                $shopifyService->saveProduct($product, StatusEnum::ACTIVE, $channel);
+            } catch (Throwable $e) {
+                $this->error("Error syncing product {$product->getId()} {$product->name} \n");
+            }
         }
+
         return;
     }
 }

app/Console/Commands/Connectors/Zoho/ZohoLeadsDownloadCommand.php

@@ -43,7 +43,11 @@ public function handle()
         $leadsPerPage = (int) $this->argument('leadsPerPage');
 
         $downloadAllLeads = new DownloadAllZohoLeadAction($app, $company, $leadReceiver);
-        $downloadAllLeads->execute($page, $leadsPerPage);
+        $leads = $downloadAllLeads->execute($page, $leadsPerPage);
+
+        foreach ($leads as $lead) {
+            echo 'Lead ' . $lead->id . ' downloaded' . PHP_EOL;
+        }
 
         $this->info($downloadAllLeads->getTotalLeadsProcessed() . ' leads downloaded from Zoho to ' . $leadReceiver->name);
 

app/GraphQL/Connector/Shopify/Mutations/ShopifyMutation.php

@@ -6,6 +6,7 @@
 
 use Kanvas\Apps\Models\Apps;
 use Kanvas\Companies\Models\Companies;
+use Kanvas\Connectors\Shopify\Client;
 use Kanvas\Connectors\Shopify\DataTransferObject\Shopify as ShopifyDto;
 use Kanvas\Connectors\Shopify\ShopifyService;
 use Kanvas\Users\Repositories\UsersRepository;
@@ -22,6 +23,8 @@ public function shopifySetup(mixed $root, array $request): bool
 
         $shopifyDto = ShopifyDto::viaRequest($request['input'], $app, $company);
 
-        return ShopifyService::shopifySetup($shopifyDto);
+        ShopifyService::shopifySetup($shopifyDto);
+
+        return ! empty(Client::getInstance($app, $company, $shopifyDto->region)->Shop->get());
     }
 }

app/GraphQL/Ecosystem/Mutations/Auth/AuthManagementMutation.php

@@ -14,6 +14,7 @@
 use Kanvas\Auth\Actions\SocialLoginAction;
 use Kanvas\Auth\DataTransferObject\LoginInput;
 use Kanvas\Auth\DataTransferObject\RegisterInput;
+use Kanvas\Auth\Services\AuthenticationService;
 use Kanvas\Auth\Services\ForgotPassword as ForgotPasswordService;
 use Kanvas\Auth\Socialite\SocialManager;
 use Kanvas\Auth\Traits\AuthTrait;
@@ -122,12 +123,7 @@ public function register(
         )->validate();
         PasswordValidation::validateArray($request['data'], $app);
 
-        $userRegistrationAssignToAppDefaultCompanyBranch = $app->get(AppSettingsEnums::GLOBAL_USER_REGISTRATION_ASSIGN_GLOBAL_COMPANY->getValue());
-        $branch = null;
-        if ($userRegistrationAssignToAppDefaultCompanyBranch) {
-            $branch = CompaniesBranches::getById($userRegistrationAssignToAppDefaultCompanyBranch);
-        }
-
+        $branch = AuthenticationService::getAppDefaultAssignCompanyBranch($app);
         $data = RegisterInput::fromArray($request['data'], $branch);
         $user = new RegisterUsersAction($data);
         $request = request();

app/GraphQL/Ecosystem/Mutations/Filesystem/FilesystemManagementMutation.php

@@ -44,27 +44,47 @@ public function attachFile(mixed $rootValue, array $request): string
      */
     public function deAttachFile(mixed $rootValue, array $request): bool
     {
+        $app = app(Apps::class);
+        $user = auth()->user();
+
         $fileEntity = FilesystemEntities::where('uuid', $request['uuid'])
-            ->fromCompany(auth()->user()->getCurrentCompany())
+            ->when(! $user->isAdmin(), function ($query) use ($user) {
+                $query->fromCompany($user->getCurrentCompany());
+            })
             ->notDeleted()
             ->firstOrFail();
 
+        if ($fileEntity->filesystem->apps_id != $app->getId()) {
+            return false;
+        }
+
         return $fileEntity->softDelete();
     }
 
     public function deAttachFiles(mixed $rootValue, array $request): bool
     {
-        $company = auth()->user()->getCurrentCompany();
+        $app = app(Apps::class);
+        $user = auth()->user();
+        $i = 0;
+
         $fileEntities = FilesystemEntities::whereIn('uuid', $request['uuids'])
-            ->fromCompany($company)
+            ->when(! $user->isAdmin(), function ($query) use ($user) {
+                $query->fromCompany($user->getCurrentCompany());
+            })
             ->notDeleted()
             ->get();
 
         foreach ($fileEntities as $fileEntity) {
-            $fileEntity->softDelete();
+            if ($fileEntity->filesystem->apps_id != $app->getId()) {
+                continue;
+            }
+
+            if ($fileEntity->softDelete()) {
+                $i++;
+            }
         }
 
-        return true;
+        return $i == count($request['uuids']);
     }
 
     /**

app/GraphQL/Ecosystem/Mutations/Roles/RolesManagementMutation.php

@@ -6,6 +6,7 @@
 
 use Baka\Support\Str;
 use Bouncer;
+use Illuminate\Support\Facades\Redis;
 use Kanvas\AccessControlList\Actions\AssignRoleAction;
 use Kanvas\AccessControlList\Actions\CreateRoleAction;
 use Kanvas\AccessControlList\Actions\UpdateRoleAction;
@@ -14,6 +15,7 @@
 use Kanvas\AccessControlList\Repositories\RolesRepository;
 use Kanvas\Apps\Models\Apps;
 use Kanvas\Exceptions\ValidationException;
+use Kanvas\SystemModules\Repositories\SystemModulesRepository;
 use Kanvas\Users\Repositories\UsersRepository;
 use Nuwave\Lighthouse\Exceptions\AuthorizationException;
 use Silber\Bouncer\Database\Role as SilberRole;
@@ -59,7 +61,7 @@ public function removeRoleFromUser(mixed $rootValue, array $request): bool
 
         $role = RolesRepository::getByMixedParamFromCompany($request['role']);
 
-        if ($auth->isAppOwner()) {
+        if ($auth->isAdmin()) {
             $user = UsersRepository::getUserOfAppById($userId, $app);
         } else {
             $user = UsersRepository::getUserOfCompanyById($company, $userId);
@@ -70,6 +72,28 @@ public function removeRoleFromUser(mixed $rootValue, array $request): bool
         return true;
     }
 
+    public function givePermissionToRole(mixed $rootValue, array $request): bool
+    {
+        $systemModule = SystemModulesRepository::getByModelName($request['systemModule'], app(Apps::class));
+        Bouncer::allow($request['role'])->to($request['permission'], $systemModule->model_name);
+
+        $roles = RolesRepository::getMapAbilityInModules($request['role']);
+        Redis::set(RolesEnums::KEY_MAP->value, $roles);
+
+        return true;
+    }
+
+    public function removePermissionToRole(mixed $rootValue, array $request): bool
+    {
+        $systemModule = SystemModulesRepository::getByModelName($request['systemModule'], app(Apps::class));
+        Bouncer::disallow($request['role'])->to($request['permission'], $systemModule->model_name);
+
+        $roles = RolesRepository::getMapAbilityInModules($request['role']);
+        Redis::set(RolesEnums::KEY_MAP->value, $roles);
+
+        return true;
+    }
+
     /**
      * givePermissionToUser.
      */
@@ -85,8 +109,7 @@ public function givePermissionToUser(mixed $rootValue, array $request): bool
         } else {
             $user = UsersRepository::getUserOfCompanyById($company, $userId);
         }
-
-        Bouncer::allow($user)->to(Str::slug($request['permission']));
+        Bouncer::allow($user)->to(Str::simpleSlug($request['permission']));
 
         return true;
     }

app/GraphQL/Ecosystem/Queries/Roles/RoleAbilitiesQuery.php

@@ -4,15 +4,20 @@
 
 namespace App\GraphQL\Ecosystem\Queries\Roles;
 
+use Illuminate\Support\Facades\Redis;
+use Kanvas\AccessControlList\Repositories\RolesRepository;
+use Kanvas\Companies\Repositories\CompaniesRepository;
 use Kanvas\Users\Repositories\UsersRepository;
+use Kanvas\AccessControlList\Enums\RolesEnums;
 
 class RoleAbilitiesQuery
 {
     public function getAllAbilities(mixed $root, array $query): array
     {
+        $company = $query['companyId'] ? CompaniesRepository::getById((int)$query['companyId']) : auth()->user()->getCurrentCompany();
         $abilities = UsersRepository::getUserOfCompanyById(
-            auth()->user()->getCurrentCompany(),
-            $query['userId']
+            $company,
+            (int)$query['userId']
         )->getAbilities();
 
         $mapAbilities = $abilities->map(function ($ability) {
@@ -21,4 +26,14 @@ public function getAllAbilities(mixed $root, array $query): array
 
         return $mapAbilities->all();
     }
+
+    public function getAllAbilitiesByRoles(mixed $root, array $request): array
+    {
+        $roles = RolesRepository::getMapAbilityInModules($request['role']);
+        if ($map = Redis::get(RolesEnums::KEY_MAP->value)) {
+            return $map;
+        }
+        Redis::set(RolesEnums::KEY_MAP->value, $roles);
+        return $roles;
+    }
 }

app/GraphQL/Ecosystem/Queries/Users/UsersListQuery.php

@@ -4,7 +4,9 @@
 
 namespace App\GraphQL\Ecosystem\Queries\Users;
 
+use Kanvas\Apps\Models\Apps;
 use Kanvas\Users\Models\Users;
+use Kanvas\Users\Models\UsersAssociatedApps;
 use Kanvas\Users\Repositories\UsersRepository;
 
 class UsersListQuery
@@ -21,4 +23,20 @@ public function getFromCurrentCompany($rootValue, array $request): Users
             (int) $request['id']
         );
     }
+
+    public function getByDisplayNameFromApp($rootValue, array $request): Users
+    {
+        $app = app(Apps::class);
+        $user = auth()->user();
+
+        $displayname = $request['displayname'];
+        if (! $user->isAppOwner()) {
+            $displayname = $user->displayname;
+        }
+
+        return UsersAssociatedApps::where('displayname', $displayname)
+            ->fromApp($app)
+            ->firstOrFail()
+            ->user;
+    }
 }

app/GraphQL/Inventory/Mutations/Products/Products.php

@@ -55,9 +55,9 @@ public function update(mixed $root, array $req): ProductsModel
 
         $product = ProductsRepository::getById((int) $req['id'], $company);
         $productDto = ProductDto::viaRequest($req['input'], $product->company);
-        $action = new UpdateProductAction($product, $productDto, auth()->user());
+        $productModel = (new UpdateProductAction($product, $productDto, auth()->user()))->execute();
 
-        return $action->execute();
+        return $productModel;
     }
 
     /**