[#34722] Add Authentication and Authorization to api routes

.env.example

@@ -20,6 +20,7 @@ CACHE_DRIVER=file
 QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
+SESSION_DOMAIN=.ddev.site
 
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null

.gitignore

@@ -9,6 +9,7 @@
 .env
 .env.backup
 .phpunit.result.cache
+.phpunit.cache
 Homestead.json
 Homestead.yaml
 npm-debug.log

app/Console/Commands/AddUser.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use App\Models\User;
+use App\Models\Role;
+
+class AddUser extends Command
+{
+    protected $signature = 'user:add';
+
+    protected $description = 'Add a new user with a role';
+
+    public function handle()
+    {
+        $firstName = $this->ask('Enter the user\'s first name');
+        $lastName = $this->ask('Enter the user\'s last name');
+        $email = $this->ask('Enter the user\'s email');
+
+        // Fetch available roles
+        $roles = Role::all()->pluck('label')->toArray();
+        $role = $this->choice('Select a role for the user', $roles);
+
+        // Create the user
+        $user = User::create([
+            'first' => $firstName,
+            'last' => $lastName,
+            'fullname' => "{$firstName} {$lastName}",
+            'email' => $email,
+            'username' => $email,
+        ]);
+
+        // Assign the role to the user
+        $user->assignRole($role); // Ensure you have a method to assign roles
+
+        $this->info("User {$firstName} {$lastName} with role {$role} has been created successfully.");
+    }
+}

app/Console/Kernel.php

@@ -13,7 +13,7 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     protected $commands = [
-        //
+        \App\Console\Commands\AddUser::class,
     ];
 
     /**

app/Http/Controllers/API/ConceptController.php

@@ -13,6 +13,17 @@
 
 class ConceptController extends Controller
 {
+    /**
+     * Instantiate a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth:sanctum')->except(['index', 'show', 'reconcile']);
+        $this->authorizeResource(Concept::class);
+    }
+
     /**
      * Display a listing of the resource.
      *
@@ -102,7 +113,7 @@ public function store(ConceptStoreRequest $request)
             DB::commit();
             return response()->json([
                 "id" => $concept->id,
-            ]);
+            ], 201);
         } catch (\Throwable $th) {
             DB::rollback();
 
@@ -116,24 +127,23 @@ public function store(ConceptStoreRequest $request)
     /**
      * Display the specified resource.
      *
-     * @param  int  $id
+     * @param  \App\Concept  $concept
      * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show(Concept $concept)
     {
-        return Concept::findOrFail($id);
+        return $concept;
     }
 
     /**
      * Update the specified resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
+     * @param  \App\Concept  $concept
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, int $id)
+    public function update(Request $request, Concept $concept)
     {
-        $concept = Concept::findOrFail($id);
         $attributes = $request->all();
 
         // Sync concept categories
@@ -152,15 +162,50 @@ public function update(Request $request, int $id)
         return new Response($concept);
     }
 
+    /**
+     * Relate Concepts
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Concept  $concept
+     * @return \Illuminate\Http\Response
+     */
+    public function relateConcepts(Request $request, Concept $concept)
+    {
+        if ($request->user()->cannot('update', $concept)) {
+            abort(403);
+        }
+
+        $relation_type = $request->input('relation_type');
+        $related_id = $request->input('related_id');
+
+        switch ($relation_type) {
+            case "broader":
+                $concept->addBroader($related_id);
+                break;
+            case "narrower":
+                $concept->addNarrower($related_id);
+                break;
+            case "related":
+                $concept->addRelated($related_id);
+                break;
+        }
+
+        return $concept;
+    }
+
     /**
      * Display the specified resource.
      *
-     * @param  int  $id
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Concept  $concept
      * @return \Illuminate\Http\Response
      */
-    public function deprecate(Request $request, $id)
+    public function deprecate(Request $request, Concept $concept)
     {
-        $concept = Concept::findOrFail($id);
+        if ($request->user()->cannot('update', $concept)) {
+            abort(403);
+        }
+
         $to = $request->input('to');
         if ($to) {
             $replaceConcept = Concept::findOrFail($to);
@@ -169,18 +214,23 @@ public function deprecate(Request $request, $id)
             $concept->deprecated = !$concept->deprecated;
             $concept->save();
         }
-        return $concept->deprecated ? 'true' : 'false';
+
+        return response()->json($concept, 200);
     }
 
     /**
      * Remove the specified resource from storage.
      *
-     * @param  int  $id
+     * @param  \App\Concept  $concept
      * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy(Concept $concept)
     {
-        //
+        $concept->conceptCategories()->detach();
+        $concept->terms()->delete();
+        $concept->delete();
+
+        return response('Deleted ' . $concept->id, 204);
     }
 
     /**
@@ -199,11 +249,9 @@ public function reconcile(Request $request)
             'category' => 'required',
         ]);
 
-        if (isset($request['category'])) {
-            $category_id = config('cache.category_ids')[$request['category']] ?? null;
-            $category = isset($category_id) ? $request['category'] : null;
-        }
-        $term = $_GET["term"];
+        $category_id = config('cache.category_ids')[$request->input('category')] ?? null;
+        $category = $category_id ? $request->input('category') : null;
+        $term = $request->input('term');
 
         $terms = DB::table('concepts')->select('concepts.id as id', 'text as name')
             ->addSelect(DB::raw("true as match, 100 as score, '$category' as type"))

app/Http/Controllers/API/ConceptSourceController.php

@@ -10,6 +10,17 @@
 
 class ConceptSourceController extends Controller
 {
+    /**
+     * Instantiate a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth:sanctum')->except(['index', 'show']);
+        $this->authorizeResource(ConceptSource::class);
+    }
+
     /**
      * Display a listing of the resource.
      *
@@ -62,37 +73,36 @@ public function store(Request $request)
     /**
      * Display the specified resource.
      *
-     * @param  int  $id
+     * @param  ConceptSource  $conceptSource
      * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show(ConceptSource $conceptSource)
     {
-        return ConceptSource::findOrFail($id);
+        return $conceptSource;
     }
 
     /**
      * Update the specified resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
+     * @param  ConceptSource  $conceptSource
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, ConceptSource $conceptSource)
     {
-        $source = ConceptSource::findOrFail($id);
-        $source->update($request->all());
-        return $source;
+        $conceptSource->update($request->all());
+        return $conceptSource;
     }
 
     /**
      * Remove the specified resource from storage.
      *
-     * @param  int  $id
+     * @param  ConceptSource  $conceptSource
      * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy(ConceptSource $conceptSource)
     {
-        $source = ConceptSource::findOrFail($id)->delete();
-        return response('Deleted' . $id, 204);
+        $conceptSource->delete();
+        return response('Deleted ' . $conceptSource->id, 204);
     }
 }

app/Http/Controllers/API/TermController.php

@@ -9,6 +9,17 @@
 
 class TermController extends Controller
 {
+    /**
+     * Instantiate a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth:sanctum')->except(['index', 'show']);
+        $this->authorizeResource(Term::class);
+    }
+
     /**
      * Display a listing of the resource.
      *
@@ -54,38 +65,37 @@ public function store(Request $request)
     /**
      * Display the specified resource.
      *
-     * @param  int  $id
+     * @param  \App\Models\Term  $term
      * @return \Illuminate\Http\Response
      */
-    public function show($id)
+    public function show(Term $term)
     {
-        return Term::findOrFail($id);
+        return $term;
     }
 
     /**
      * Update the specified resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  int  $id
+     * @param  \App\Models\Term  $term
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $id)
+    public function update(Request $request, Term $term)
     {
-        $term = Term::findOrFail($id);
         $term->update($request->all());
         return $term;
     }
 
     /**
      * Remove the specified resource from storage.
      *
-     * @param  int  $id
+     * @param  \App\Models\Term  $term
      * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy(Term $term)
     {
-        $term = Term::findOrFail($id)->delete();
-        return response('Deleted', 204);
-
+        $term->delete();
+
+        return response('Deleted ' . $term->id, 204);
     }
 }

app/Http/Controllers/ConceptController.php

@@ -223,33 +223,4 @@ public function search(Concept $concept)
 
         return $terms->get();
     }
-
-    /**
-     * Relate Concepts
-     *
-     * @param  \App\Concept  $concept
-     * @return \Illuminate\Http\Response
-     */
-    public function relateConcepts($concept_id)
-    {
-        $relation_type = $_GET["relation_type"];
-        $related_id = $_GET["related_id"];
-
-        $concept = Concept::findOrFail($concept_id);
-
-        switch ($relation_type) {
-            case "broader":
-                $concept->addBroader($related_id);
-                break;
-            case "narrower":
-                $concept->addNarrower($related_id);
-                break;
-            case "related":
-                $concept->addRelated($related_id);
-                break;
-        }
-
-        return $concept;
-    }
-
 }