Merge pull request #880 from bakaphp/fix-guard-admin-directory

fix: get companies if i'm admin
bakaphp · Jan 31, 2024 · 745330d · 745330d
2 parents 44f8b9d + 2d7f4c6
commit 745330d
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 6 deletions.
diff --git a/app/GraphQL/Ecosystem/Queries/Companies/UserManagementQuery.php b/app/GraphQL/Ecosystem/Queries/Companies/UserManagementQuery.php
@@ -17,6 +17,8 @@ class UserManagementQuery
      */
     public function getAllCompanyUsers(mixed $root, array $args, GraphQLContext $context, ResolveInfo $resolveInfo): Builder
     {
+        $companiesId = auth()->user()->isAdmin() && ! empty($args['companies_id']) ? $args['companies_id'] : auth()->user()->currentCompanyId();
+
         /**
          * @var Builder
          */
@@ -28,7 +30,7 @@ public function getAllCompanyUsers(mixed $root, array $args, GraphQLContext $con
                 )
                 ->where(
                     'users_associated_company.companies_id',
-                    auth()->user()->currentCompanyId()
+                    $companiesId
                 )
                 ->where(
                     'users_associated_company.is_deleted',
@@ -42,6 +44,8 @@ public function getAllCompanyUsers(mixed $root, array $args, GraphQLContext $con
      */
     public function getAllCompanyBranchUsers(mixed $root, array $args, GraphQLContext $context, ResolveInfo $resolveInfo): Builder
     {
+        $companiesId = auth()->user()->isAdmin() && ! empty($args['companies_id']) ? $args['companies_id'] : auth()->user()->currentCompanyId();
+
         /**
          * @var Builder
          */
@@ -56,7 +60,7 @@ public function getAllCompanyBranchUsers(mixed $root, array $args, GraphQLContex
         )
         ->where(
             'users_associated_company.companies_branches_id',
-            auth()->user()->currentBranchId()
+            $companiesId
         );
     }
 }
diff --git a/graphql/schemas/Ecosystem/company.graphql b/graphql/schemas/Ecosystem/company.graphql
@@ -14,6 +14,7 @@ type Company {
     branches: [CompanyBranch!]! @hasMany(relation: "branches") #need to filter by the branches the user has access to
     photo: Filesystem @method(name: "getPhoto")
     is_active: Boolean!
+    users: [User] @HasManyThrough
     files: [Filesystem!]!
         @paginate(
             defaultCount: 25
@@ -124,10 +125,12 @@ extend type Query @guard {
                     "language"
                     "timezone"
                     "phone"
-                    "country_code",
+                    "country_code"
                     "is_active"
                 ]
             )
+        hasUsers: _
+            @whereHasConditions(columns: ["id", "uuid", "displayname", "email"])
         orderBy: _ @orderBy(columns: ["id"])
     ): [Company!]!
         @paginate(
@@ -162,6 +165,7 @@ extend type Query @guard {
             @whereConditions(
                 columns: [
                     "id"
+                    "companies_id"
                     "uuid"
                     "firstname"
                     "lastname"
@@ -185,6 +189,7 @@ extend type Query @guard {
                 columns: [
                     "id"
                     "uuid"
+                    "companies_id"
                     "firstname"
                     "lastname"
                     "displayname"

diff --git a/src/Kanvas/Companies/Models/Companies.php b/src/Kanvas/Companies/Models/Companies.php
@@ -10,6 +10,7 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasManyThrough;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Support\Facades\Auth;
 use Kanvas\Apps\Models\Apps;
@@ -111,6 +112,20 @@ public function groups(): BelongsToMany
         return $this->belongsToMany(CompaniesGroups::class, 'companies_associations');
     }
 
+    public function users(): HasManyThrough
+    {
+        return $this->hasManyThrough(
+            Users::class,
+            UsersAssociatedApps::class,
+            'companies_id',
+            'id',
+            'id',
+            'users_id'
+        )->when(app(Apps::class), function ($query, $app) {
+            $query->where('users_associated_apps.apps_id', $app->getId());
+        });
+    }
+
     /**
      * Users relationship.
      */
@@ -261,10 +276,11 @@ public function scopeUserAssociated(Builder $query): Builder
                 'users_associated_apps.companies_id',
                 '=',
                 'companies.id'
-            )
-            ->where('users_associated_company.users_id', '=', $user->getKey())
+            )->when(! $user->isAdmin(), function ($query) use ($user) {
+                $query->where('users_associated_company.users_id', '=', $user->getKey())
+                ->where('users_associated_apps.users_id', '=', $user->getKey());
+            })
             ->where('users_associated_company.is_deleted', '=', StateEnums::NO->getValue())
-            ->where('users_associated_apps.users_id', '=', $user->getKey()) // Assuming you want to filter by the same user
             ->where('users_associated_apps.is_deleted', '=', StateEnums::NO->getValue())
             ->where('users_associated_apps.apps_id', '=', $app->getKey())
             ->where('companies.is_deleted', '=', StateEnums::NO->getValue())