+
-
- Create PAT (no edit)
- - name
- - seletc abilities (ENUM - in scope doc for PAT Abilities
+
+
+
+ {{ userToken.name }}
+
+
+
+ - {{ textFormat(ability) }}
+
+
+
+
User does not have PATs.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/js/Pages/Admin/Users/Users.vue b/resources/js/Pages/Admin/Users/Users.vue
index 6a9126c9..26668234 100644
--- a/resources/js/Pages/Admin/Users/Users.vue
+++ b/resources/js/Pages/Admin/Users/Users.vue
@@ -2,6 +2,28 @@
import AuthenticatedLayout from '@/Layouts/AuthenticatedLayout.vue';
import {Head, Link} from '@inertiajs/vue3';
import AdminTopNavigation from "@/Components/Admin/AdminTopNavigation.vue";
+import {onMounted, ref} from "vue";
+import PaginatorComponent from "@/Components/Admin/PaginatorComponent.vue";
+
+
+const users = ref({})
+
+onMounted(() => {
+ getUsers()
+})
+
+function getUsers(page = 1) {
+ axios.get('/admin/users?cached=false&page=' + page + '&relations=currentTeam&orderBy=id,desc').then(response => {
+ users.value = response.data.data
+ }).catch(error => {
+ console.log(error)
+ })
+}
+
+function setDataPage(page) {
+ getUsers(page);
+}
+
@@ -14,7 +36,41 @@ import AdminTopNavigation from "@/Components/Admin/AdminTopNavigation.vue";
- // Users list component, ordered by id desc
+
+
+
+
+
+
+
+ #{{ user.id }}
+
+ {{ user.name }}
+
+
+ {{ user.current_team.name }}
+
+
+ {{ user.email }}
+
+
+
+
+
+
+
+
diff --git a/resources/js/Pages/App/MyTeam.vue b/resources/js/Pages/App/MyTeam.vue
new file mode 100644
index 00000000..4697c589
--- /dev/null
+++ b/resources/js/Pages/App/MyTeam.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+ My Team
+
+
+
+
+
#{{ myTeam.id }}
+
{{ myTeam.name }}
+
+
+
Team members
+
+
+
+
+
+
{{ teamUser.user.name }}
+
+
+
+
+
+
diff --git a/routes/api.php b/routes/api.php
index 69e2db8f..344b3d3a 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -7,7 +7,9 @@
use App\Http\Controllers\Api\V1\Admin\ApiAdminTeamsController;
use App\Http\Controllers\Api\V1\Admin\ApiAdminTeamServiceTeamsController;
use App\Http\Controllers\Api\V1\Admin\ApiAdminTeamUsersController;
+use App\Http\Controllers\Api\V1\Admin\ApiAdminUserPersonalAccessTokensController;
use App\Http\Controllers\Api\V1\Admin\ApiAdminUsersController;
+use App\Http\Controllers\Api\V1\ApiMyTeamController;
use App\Http\Controllers\Api\V1\ApiMyTeamVouchersController;
use App\Http\Controllers\Api\V1\ApiSystemStatisticsController;
use App\Http\Middleware\CheckAdminStatus;
@@ -21,6 +23,8 @@
Route::middleware(['auth:sanctum'])
->group(function () {
+ Route::resource('/my-team', ApiMyTeamController::class)->names('api.v1.my-team');
+
/**
* My Vouchers
*/
@@ -141,6 +145,7 @@
Route::resource('/team-service-teams', ApiAdminTeamServiceTeamsController::class)->names('api.v1.admin.team-service-teams');
Route::resource('/team-users', ApiAdminTeamUsersController::class)->names('api.v1.admin.team-users');
Route::resource('/teams', ApiAdminTeamsController::class)->names('api.v1.admin.teams');
+ Route::resource('/user-personal-access-tokens', ApiAdminUserPersonalAccessTokensController::class)->names('api.v1.admin.tokens');
Route::resource('/users', ApiAdminUsersController::class)->names('api.v1.admin.users');
});
diff --git a/routes/web.php b/routes/web.php
index 62c28e18..b2f47aa3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -2,6 +2,7 @@
use App\Http\Controllers\ProfileController;
use App\Http\Middleware\CheckAdminStatus;
+use App\Http\Middleware\CheckTeamToken;
use Illuminate\Support\Facades\Redirect;
use Illuminate\Support\Facades\Route;
use Inertia\Inertia;
@@ -20,6 +21,12 @@
Route::middleware('auth')->group(function () {
+
+ Route::get('/my-team', function () {
+ return Inertia::render('App/MyTeam');
+ })->name('my-team');
+
+
Route::get('/profile', [ProfileController::class, 'edit'])->name('profile.edit');
Route::patch('/profile', [ProfileController::class, 'update'])->name('profile.update');
Route::delete('/profile', [ProfileController::class, 'destroy'])->name('profile.destroy');
diff --git a/tests/Feature/API/Admin/AdminTeams/AdminTeamsGetTest.php b/tests/Feature/API/Admin/AdminTeams/AdminTeamsGetTest.php
index 5a0e396a..c1585c7f 100644
--- a/tests/Feature/API/Admin/AdminTeams/AdminTeamsGetTest.php
+++ b/tests/Feature/API/Admin/AdminTeams/AdminTeamsGetTest.php
@@ -37,15 +37,12 @@ public function itCanGetAllTeams()
$this->user
);
- $rand = rand(5, 10);
-
- Team::factory($rand)->create();
+ Team::factory()->create();
$response = $this->getJson($this->apiRoot . $this->endpoint);
$responseObj = json_decode($response->getContent());
$response->assertStatus(200);
- $this->assertEquals($rand, $responseObj->data->total);
}
#[Test]
diff --git a/tests/Feature/API/Admin/AdminUserPersonalAccessTokens/AdminTokensDeleteTest.php b/tests/Feature/API/Admin/AdminUserPersonalAccessTokens/AdminTokensDeleteTest.php
new file mode 100644
index 00000000..c4fbcbff
--- /dev/null
+++ b/tests/Feature/API/Admin/AdminUserPersonalAccessTokens/AdminTokensDeleteTest.php
@@ -0,0 +1,47 @@
+user = $this->createUser();
+
+ Sanctum::actingAs($this->user);
+
+ $randomId = $this->faker->randomDigitNotNull();
+
+ $response = $this->deleteJson($this->apiRoot . $this->endpoint . '/' . $randomId);
+
+ $response->assertStatus(401);
+ }
+
+ #[Test]
+ public function itCannotDeleteAToken()
+ {
+ $this->user = $this->createAdminUser();
+
+ Sanctum::actingAs(
+ $this->user
+ );
+
+ $randomId = $this->faker->randomDigitNotNull();
+
+ $response = $this->deleteJson($this->apiRoot . $this->endpoint . '/' . $randomId);
+
+ $response->assertStatus(403);
+ }
+}
diff --git a/tests/Feature/API/Admin/AdminUserPersonalAccessTokens/AdminTokensGetTest.php b/tests/Feature/API/Admin/AdminUserPersonalAccessTokens/AdminTokensGetTest.php
new file mode 100644
index 00000000..c9621ff9
--- /dev/null
+++ b/tests/Feature/API/Admin/AdminUserPersonalAccessTokens/AdminTokensGetTest.php
@@ -0,0 +1,59 @@
+user = $this->createUser();
+
+ Sanctum::actingAs($this->user);
+
+ $response = $this->getJson($this->apiRoot . $this->endpoint);
+
+ $response->assertStatus(401);
+ }
+
+ #[Test]
+ public function itCanNotGetAllTokens()
+ {
+ $this->user = $this->createAdminUser();
+
+ Sanctum::actingAs(
+ $this->user
+ );
+
+ $response = $this->getJson($this->apiRoot . $this->endpoint);
+
+ $response->assertStatus(403);
+ }
+
+ #[Test]
+ public function itCanNotGetASingleToken()
+ {
+ $this->user = $this->createAdminUser();
+
+ Sanctum::actingAs(
+ $this->user
+ );
+
+ $randomId = $this->faker->randomDigitNotNull();
+
+ $response = $this->getJson($this->apiRoot . $this->endpoint . '/' . $randomId);
+
+ $response->assertStatus(403);
+ }
+}
diff --git a/tests/Feature/API/Admin/AdminUserPersonalAccessTokens/AdminTokensPostTest.php b/tests/Feature/API/Admin/AdminUserPersonalAccessTokens/AdminTokensPostTest.php
new file mode 100644
index 00000000..3f2a6058
--- /dev/null
+++ b/tests/Feature/API/Admin/AdminUserPersonalAccessTokens/AdminTokensPostTest.php
@@ -0,0 +1,84 @@
+user = $this->createUser();
+
+ Sanctum::actingAs($this->user);
+
+ $payload = [];
+
+ $response = $this->postJson($this->apiRoot . $this->endpoint, $payload);
+
+ $response->assertStatus(401);
+ }
+
+ #[Test]
+ public function itCanStoreAToken()
+ {
+ $this->user = $this->createAdminUser();
+
+ Sanctum::actingAs(
+ $this->user
+ );
+
+ $tokenAbilities = PersonalAccessTokenAbility::cases();
+ $rand = rand(0, (count($tokenAbilities) - 1));
+
+ $user = User::factory()->create();
+ $tokenAbility = $tokenAbilities[$rand];
+ $tokenAbilitiesArray[] = $tokenAbility->value;
+
+ $payload = [
+ 'user_id' => $user->id,
+ 'name' => $this->faker->word(),
+ 'token_abilities' => $tokenAbilitiesArray,
+ ];
+
+ $response = $this->postJson($this->apiRoot . $this->endpoint, $payload);
+
+ $response->assertStatus(200);
+ }
+
+ #[Test]
+ public function itCanNotStoreATokenIfTokenNotExist()
+ {
+ $this->user = $this->createAdminUser();
+
+ Sanctum::actingAs(
+ $this->user
+ );
+
+ $user = User::factory()->create();
+
+ $tokenAbilitiesArray[] = $this->faker->word();
+
+ $payload = [
+ 'user_id' => $user->id,
+ 'name' => $this->faker->word(),
+ 'token_ability' => $tokenAbilitiesArray,
+ ];
+
+ $response = $this->postJson($this->apiRoot . $this->endpoint, $payload);
+
+ $response->assertStatus(400);
+ }
+}
diff --git a/tests/Feature/API/Admin/AdminUserPersonalAccessTokens/AdminTokensPutTest.php b/tests/Feature/API/Admin/AdminUserPersonalAccessTokens/AdminTokensPutTest.php
new file mode 100644
index 00000000..13a51644
--- /dev/null
+++ b/tests/Feature/API/Admin/AdminUserPersonalAccessTokens/AdminTokensPutTest.php
@@ -0,0 +1,47 @@
+user = $this->createUser();
+
+ Sanctum::actingAs($this->user);
+
+ $randomId = $this->faker->randomDigitNotNull();
+
+ $response = $this->putJson($this->apiRoot . $this->endpoint . '/' . $randomId);
+
+ $response->assertStatus(401);
+ }
+
+ #[Test]
+ public function itCannotUpdateAToken()
+ {
+ $this->user = $this->createAdminUser();
+
+ Sanctum::actingAs(
+ $this->user
+ );
+
+ $randomId = $this->faker->randomDigitNotNull();
+
+ $response = $this->putJson($this->apiRoot . $this->endpoint . '/' . $randomId);
+
+ $response->assertStatus(403);
+ }
+}
diff --git a/tests/Feature/API/Admin/AdminUsers/AdminUsersPostTest.php b/tests/Feature/API/Admin/AdminUsers/AdminUsersPostTest.php
index 193b13d1..fe323f4c 100644
--- a/tests/Feature/API/Admin/AdminUsers/AdminUsersPostTest.php
+++ b/tests/Feature/API/Admin/AdminUsers/AdminUsersPostTest.php
@@ -2,6 +2,7 @@
namespace Tests\Feature\API\Admin\AdminUsers;
+use App\Models\Team;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Foundation\Testing\WithFaker;
use Laravel\Sanctum\Sanctum;
@@ -30,7 +31,7 @@ public function onlyAdminCanAccess(): void
}
#[Test]
- public function itCannotStoreAUser()
+ public function itCanStoreAUser()
{
$this->user = $this->createAdminUser();
@@ -38,10 +39,20 @@ public function itCannotStoreAUser()
$this->user
);
- $payload = [];
+ $team = Team::factory()->create();
- $response = $this->postJson($this->apiRoot . $this->endpoint, $payload);
+ $payload = [
+ 'name' => $this->faker->name(),
+ 'email' => $this->faker->email(),
+ 'current_team_id' => $team->id,
+ ];
+
+ $response = $this->postJson($this->apiRoot . $this->endpoint, $payload);
+ $responseObj = json_decode($response->getContent());
- $response->assertStatus(403);
+ $response->assertStatus(200);
+ $this->assertEquals($payload['name'], $responseObj->data->name);
+ $this->assertEquals($payload['email'], $responseObj->data->email);
+ $this->assertEquals($payload['current_team_id'], $responseObj->data->current_team_id);
}
}
diff --git a/tests/Feature/API/App/SystemStatistics/SystemStatisticPutTest.php b/tests/Feature/API/App/SystemStatistics/SystemStatisticPutTest.php
index 9b3a04c8..1c9ae9d0 100644
--- a/tests/Feature/API/App/SystemStatistics/SystemStatisticPutTest.php
+++ b/tests/Feature/API/App/SystemStatistics/SystemStatisticPutTest.php
@@ -25,7 +25,8 @@ public function authenticationRequired()
$tokenString = $this->user->createToken(
name : 'Token',
- abilities: []
+ abilities: [],
+ teamId: $this->user->current_team_id
)->plainTextToken;
$model = SystemStatistic::factory()->create();
@@ -46,7 +47,8 @@ public function itCannotUpdateAResourceIncorrectAbilities()
name : 'Token',
abilities: [
PersonalAccessTokenAbility::SYSTEM_STATISTICS_DELETE->value,
- ]
+ ],
+ teamId: $this->user->current_team_id
)->plainTextToken;
$model = SystemStatistic::factory()->create();
$payload = [];
diff --git a/tests/Feature/API/App/SystemStatistics/SystemStatisticsDeleteTest.php b/tests/Feature/API/App/SystemStatistics/SystemStatisticsDeleteTest.php
index 246b5cf1..1ef86995 100644
--- a/tests/Feature/API/App/SystemStatistics/SystemStatisticsDeleteTest.php
+++ b/tests/Feature/API/App/SystemStatistics/SystemStatisticsDeleteTest.php
@@ -23,9 +23,13 @@ public function authenticationRequired()
{
$this->user = $this->createUser();
- $tokenString = $this->user->createToken(name: 'Token', abilities: [])->plainTextToken;
- $model = SystemStatistic::factory()->create();
- $payload = [];
+ $tokenString = $this->user->createToken(
+ name: 'Token',
+ abilities: [],
+ teamId: $this->user->current_team_id
+ )->plainTextToken;
+ $model = SystemStatistic::factory()->create();
+ $payload = [];
$response = $this->withToken($tokenString)
->deleteJson($this->apiRoot . $this->endpoint . '/' . $model->id, $payload);
@@ -65,7 +69,8 @@ public function itCannotUpdateAResourceMethodNotAllowed()
name : 'Token',
abilities: [
PersonalAccessTokenAbility::SYSTEM_STATISTICS_DELETE->value,
- ]
+ ],
+ teamId: $this->user->current_team_id
)->plainTextToken;
$model = SystemStatistic::factory()->create();