diff --git a/be/app/Http/Middleware/Authenticate.php b/be/app/Http/Middleware/Authenticate.php index 704089a..bb3e518 100644 --- a/be/app/Http/Middleware/Authenticate.php +++ b/be/app/Http/Middleware/Authenticate.php @@ -15,7 +15,7 @@ class Authenticate extends Middleware protected function redirectTo($request) { if (! $request->expectsJson()) { - return route('login'); + return '/unauthenticated'; } } } diff --git a/be/routes/api.php b/be/routes/api.php index 09efa65..97146f0 100644 --- a/be/routes/api.php +++ b/be/routes/api.php @@ -19,6 +19,7 @@ use App\Models\SubTask; use App\Models\Team; use App\Models\User; use Illuminate\Support\Facades\Route; +use Illuminate\Http\Request; /* |-------------------------------------------------------------------------- @@ -31,9 +32,9 @@ use Illuminate\Support\Facades\Route; | */ -//Route::middleware('auth:sanctum')->get('/user', function (Request $request) { -// return $request->user(); -//}); +Route::middleware('auth:sanctum')->get('/user', function (Request $request) { + return $request->user(); +}); Route::get('/v1/teams', function () { return new TeamCollection(Team::all()); @@ -60,7 +61,7 @@ Route::get('/v1/mastertasks', function () { return new MasterTaskCollection( MasterTask::all()); }); -Route::get('/v1/mastertasks/{id}', function ($id) { +Route::middleware('auth:sanctum')->get('/v1/mastertasks/{id}', function ($id) { return new MasterTaskResource( MasterTask::find($id)); }); @@ -87,13 +88,12 @@ Route::get('/v1/subtasks',SubTaskController::class . '@index'); Route::delete('/v1/subtasks/{id}', SubTaskController::class . '@delete'); +Route::post('/v1/tokens/create', function (Request $request) { + $user = User::find($request->all()['data']['user_id']); -//Route::post('/v1/subtasks/{id}/timesheet', function () { -// return new MasterTaskResource( SubTaskController::class . '@storeTimesheet'); -//}); -// -//Route::delete('/v1/subtasks/{id}/timesheet/{}', function () { -// return new MasterTaskResource( SubTaskController::class . '@storeTimesheet'); -//}); + $token = $user->createToken('token name'); + + return ['token' => $token->plainTextToken]; +}); diff --git a/be/routes/web.php b/be/routes/web.php index 7b62a12..0d501f1 100644 --- a/be/routes/web.php +++ b/be/routes/web.php @@ -19,6 +19,12 @@ Route::get('/', function () { return view('welcome'); }); +Route::get('/unauthenticated', function () { + return response()->json([ + 'message' => 'Bearer missing or invalid', + ], 401); +}); + Route::prefix('be')->group(function () { Route::get('/test', function () { $subtask = \App\Models\SubTask::with('mastertask')->find(1);