msb-public
/
hydra
mirror of https://github.com/hasinhayder/hydra
1
0
Code Issues Projects Releases Wiki Activity

Code Format

Browse Source
pull/29/head
Hasin Hayder 9 months ago
parent f9c7bbe77d
commit 677d991ed2
9 changed files with 29 additions and 52 deletions
Show Stats Download Patch File Download Diff File

1
app/Console/Kernel.php
Unescape View File

@ -9,7 +9,6 @@ class Kernel extends ConsoleKernel {
/** /**
* Define the application's command schedule. * Define the application's command schedule.
* *
* @param \Illuminate\Console\Scheduling\Schedule $schedule
* @return void * @return void
*/ */
protected function schedule(Schedule $schedule) { protected function schedule(Schedule $schedule) {

7
app/Http/Controllers/RoleController.php
Unescape View File

@ -18,7 +18,6 @@ class RoleController extends Controller {
/** /**
* Store a newly created resource in storage. * Store a newly created resource in storage.
* *
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function store(Request $request) { public function store(Request $request) {
@ -44,7 +43,6 @@ class RoleController extends Controller {
/** /**
* Display the specified resource. * Display the specified resource.
* *
* @param \App\Models\Role $role
* @return \App\Models\Role $role * @return \App\Models\Role $role
*/ */
public function show(Role $role) { public function show(Role $role) {
@ -54,11 +52,9 @@ class RoleController extends Controller {
/** /**
* Update the specified resource in storage. * Update the specified resource in storage.
* *
* @param \Illuminate\Http\Request $request
* @param \App\Models\Role $role
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response|Role * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response|Role
*/ */
public function update(Request $request, Role $role = null) { public function update(Request $request, ?Role $role = null) {
if (! $role) { if (! $role) {
return response(['error' => 1, 'message' => 'role doesn\'t exist'], 404); return response(['error' => 1, 'message' => 'role doesn\'t exist'], 404);
} }
@ -80,7 +76,6 @@ class RoleController extends Controller {
/** /**
* Remove the specified resource from storage. * Remove the specified resource from storage.
* *
* @param \App\Models\Role $role
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function destroy(Role $role) { public function destroy(Role $role) {

11
app/Http/Controllers/UserController.php
Unescape View File

@ -21,7 +21,6 @@ class UserController extends Controller {
/** /**
* Store a newly created resource in storage. * Store a newly created resource in storage.
* *
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function store(Request $request) { public function store(Request $request) {
@ -51,7 +50,6 @@ class UserController extends Controller {
/** /**
* Authenticate an user and dispatch token. * Authenticate an user and dispatch token.
* *
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function login(Request $request) { public function login(Request $request) {
@ -73,13 +71,12 @@ class UserController extends Controller {
$plainTextToken = $user->createToken('hydra-api-token', $roles)->plainTextToken; $plainTextToken = $user->createToken('hydra-api-token', $roles)->plainTextToken;
return response(['error' => 0, 'id' => $user->id, 'token' => $plainTextToken], 200); return response(['error' => 0, 'id' => $user->id, 'name' => $user->name, 'token' => $plainTextToken], 200);
} }
/** /**
* Display the specified resource. * Display the specified resource.
* *
* @param \App\Models\User $user
* @return \App\Models\User $user * @return \App\Models\User $user
*/ */
public function show(User $user) { public function show(User $user) {
@ -89,8 +86,6 @@ class UserController extends Controller {
/** /**
* Update the specified resource in storage. * Update the specified resource in storage.
* *
* @param \Illuminate\Http\Request $request
* @param \App\Models\User $user
* @return User * @return User
* *
* @throws MissingAbilityException * @throws MissingAbilityException
@ -118,7 +113,6 @@ class UserController extends Controller {
/** /**
* Remove the specified resource from storage. * Remove the specified resource from storage.
* *
* @param \App\Models\User $user
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function destroy(User $user) { public function destroy(User $user) {
@ -128,7 +122,7 @@ class UserController extends Controller {
if ($userRoles->contains($adminRole)) { if ($userRoles->contains($adminRole)) {
//the current user is admin, then if there is only one admin - don't delete //the current user is admin, then if there is only one admin - don't delete
$numberOfAdmins = Role::where('slug', 'admin')->first()->users()->count(); $numberOfAdmins = Role::where('slug', 'admin')->first()->users()->count();
if (1 == $numberOfAdmins) { if ($numberOfAdmins == 1) {
return response(['error' => 1, 'message' => 'Create another admin before deleting this only admin user'], 409); return response(['error' => 1, 'message' => 'Create another admin before deleting this only admin user'], 409);
} }
} }
@ -141,7 +135,6 @@ class UserController extends Controller {
/** /**
* Return Auth user * Return Auth user
* *
* @param Request $request
* @return mixed * @return mixed
*/ */
public function me(Request $request) { public function me(Request $request) {

5
app/Http/Controllers/UserRoleController.php
Unescape View File

@ -10,7 +10,6 @@ class UserRoleController extends Controller {
/** /**
* Display a listing of the resource. * Display a listing of the resource.
* *
* @param \App\Models\User $user
* @return \App\Models\User $user * @return \App\Models\User $user
*/ */
public function index(User $user) { public function index(User $user) {
@ -20,8 +19,6 @@ class UserRoleController extends Controller {
/** /**
* Store a newly created resource in storage. * Store a newly created resource in storage.
* *
* @param \Illuminate\Http\Request $request
* @param \App\Models\User $user
* @return \App\Models\User $user * @return \App\Models\User $user
*/ */
public function store(Request $request, User $user) { public function store(Request $request, User $user) {
@ -39,8 +36,6 @@ class UserRoleController extends Controller {
/** /**
* Remove the specified resource from storage. * Remove the specified resource from storage.
* *
* @param \App\Models\User $user
* @param \App\Models\Role $role
* @return \App\Models\User $user * @return \App\Models\User $user
*/ */
public function destroy(User $user, Role $role) { public function destroy(User $user, Role $role) {

1
app/Http/Middleware/HydraLog.php
Unescape View File

@ -10,7 +10,6 @@ class HydraLog {
/** /**
* Handle an incoming request. * Handle an incoming request.
* *
* @param \Illuminate\Http\Request $request
* @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
* @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
*/ */

1
app/Http/Middleware/RedirectIfAuthenticated.php
Unescape View File

@ -11,7 +11,6 @@ class RedirectIfAuthenticated {
/** /**
* Handle an incoming request. * Handle an incoming request.
* *
* @param \Illuminate\Http\Request $request
* @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
* @param string|null ...$guards * @param string|null ...$guards
* @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse

9
database/migrations/2024_01_07_095037_add_expires_at_to_personal_access_token_table.php
Unescape View File

@ -4,15 +4,13 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
return new class extends Migration return new class extends Migration {
{
/** /**
* Run the migrations. * Run the migrations.
* *
* @return void * @return void
*/ */
public function up() public function up() {
{
Schema::table('personal_access_tokens', function (Blueprint $table) { Schema::table('personal_access_tokens', function (Blueprint $table) {
$table->timestamp('expires_at')->nullable()->after('last_used_at'); $table->timestamp('expires_at')->nullable()->after('last_used_at');
}); });
@ -23,8 +21,7 @@ return new class extends Migration
* *
* @return void * @return void
*/ */
public function down() public function down() {
{
Schema::table('personal_access_token', function (Blueprint $table) { Schema::table('personal_access_token', function (Blueprint $table) {
$table->dropColumn('expires_at'); $table->dropColumn('expires_at');
}); });

16
tests/Feature/AdminLoginTest.php
Unescape View File

@ -18,10 +18,10 @@ class AdminLoginTest extends TestCase {
]); ]);
$response $response
->assertJson(fn (AssertableJson $json) => $json->where('error', 0) ->assertJson(fn (AssertableJson $json) => $json->where('error', 0)
->has('token') ->has('token')
->etc() ->etc()
); );
} }
public function test_admin_login_fail() { public function test_admin_login_fail() {
@ -31,9 +31,9 @@ class AdminLoginTest extends TestCase {
]); ]);
$response $response
->assertJson(fn (AssertableJson $json) => $json->where('error', 1) ->assertJson(fn (AssertableJson $json) => $json->where('error', 1)
->missing('token') ->missing('token')
->has('message') ->has('message')
); );
} }
} }

30
tests/Feature/RoleTest.php
Unescape View File

@ -55,8 +55,8 @@ class RoleTest extends TestCase {
$response $response
->assertJson( ->assertJson(
fn (AssertableJson $json) => $json->where('name', 'Chief Editor') fn (AssertableJson $json) => $json->where('name', 'Chief Editor')
->missing('error') ->missing('error')
->etc() ->etc()
); );
} }
@ -78,8 +78,8 @@ class RoleTest extends TestCase {
$response $response
->assertJson( ->assertJson(
fn (AssertableJson $json) => $json->where('slug', 'chief-editor') fn (AssertableJson $json) => $json->where('slug', 'chief-editor')
->missing('error') ->missing('error')
->etc() ->etc()
); );
} }
@ -102,9 +102,9 @@ class RoleTest extends TestCase {
$response $response
->assertJson( ->assertJson(
fn (AssertableJson $json) => $json->where('name', 'Editor X') fn (AssertableJson $json) => $json->where('name', 'Editor X')
->where('slug', 'editor-x') ->where('slug', 'editor-x')
->missing('error') ->missing('error')
->etc() ->etc()
); );
} }
@ -126,8 +126,8 @@ class RoleTest extends TestCase {
$response $response
->assertJson( ->assertJson(
fn (AssertableJson $json) => $json fn (AssertableJson $json) => $json
->where('slug', 'admin') ->where('slug', 'admin')
->etc() ->etc()
); );
} }
@ -150,9 +150,9 @@ class RoleTest extends TestCase {
$response $response
->assertJson( ->assertJson(
fn (AssertableJson $json) => $json->where('name', 'New Role') fn (AssertableJson $json) => $json->where('name', 'New Role')
->where('slug', 'new-role') ->where('slug', 'new-role')
->missing('error') ->missing('error')
->etc() ->etc()
); );
} }
@ -175,7 +175,7 @@ class RoleTest extends TestCase {
$response $response
->assertJson( ->assertJson(
fn (AssertableJson $json) => $json->where('error', 1) fn (AssertableJson $json) => $json->where('error', 1)
->etc() ->etc()
); );
} }
@ -197,7 +197,7 @@ class RoleTest extends TestCase {
$response $response
->assertJson( ->assertJson(
fn (AssertableJson $json) => $json->where('error', 0) fn (AssertableJson $json) => $json->where('error', 0)
->has('message') ->has('message')
); );
} }
@ -219,7 +219,7 @@ class RoleTest extends TestCase {
$response $response
->assertJson( ->assertJson(
fn (AssertableJson $json) => $json->where('error', 1) fn (AssertableJson $json) => $json->where('error', 1)
->has('message') ->has('message')
); );
} }
} }

Write Preview
Loading…
Cancel
Save