get Coterm working again!

ConvoyPanel · Dec 1, 2023 · bafb77b · bafb77b
1 parent d5908d2
commit bafb77b
Show file tree

Hide file tree

Showing 30 changed files with 829 additions and 290 deletions.
diff --git a/app/Http/Controllers/Admin/CotermController.php b/app/Http/Controllers/Admin/CotermController.php
@@ -3,12 +3,14 @@
 namespace Convoy\Http\Controllers\Admin;
 
 use Convoy\Http\Controllers\ApiController;
+use Convoy\Http\Requests\Admin\Coterms\DeleteCotermRequest;
 use Convoy\Http\Requests\Admin\Coterms\StoreCotermRequest;
 use Convoy\Http\Requests\Admin\Coterms\UpdateAttachedNodesRequest;
 use Convoy\Http\Requests\Admin\Coterms\UpdateCotermRequest;
 use Convoy\Models\Coterm;
 use Convoy\Models\Filters\FiltersCoterm;
 use Convoy\Models\Filters\FiltersNode;
+use Convoy\Models\Node;
 use Convoy\Services\Coterm\CotermTokenCreationService;
 use Convoy\Transformers\Admin\CotermTransformer;
 use Convoy\Transformers\Admin\NodeTransformer;
@@ -48,20 +50,31 @@ public function show(Coterm $coterm)
 
     public function store(StoreCotermRequest $request)
     {
-        $coterm = Coterm::create($request->safe()->except('node_ids'));
+        $creds = $this->cotermTokenCreator->handle();
+        $coterm = Coterm::create([
+            ...$request->safe()->except('node_ids'),
+            ...$creds,
+        ]);
         if ($request->node_ids !== null) {
-            $coterm->nodes()->attach($request->node_ids);
+            Node::whereIn('id', $request->node_ids)->whereNull('coterm_id')->update(
+                ['coterm_id' => $coterm->id],
+            );
         }
         $coterm->loadCount(['nodes']);
 
-        return fractal($coterm, new CotermTransformer())->respond();
+        return fractal($coterm, new CotermTransformer(includeToken: true))->respond();
     }
 
     public function update(UpdateCotermRequest $request, Coterm $coterm)
     {
         $coterm->update($request->validated());
         if ($request->node_ids !== null) {
-            $coterm->nodes()->sync($request->node_ids);
+            Node::whereIn('id', $request->node_ids)->whereNull('coterm_id')->update(
+                ['coterm_id' => $coterm->id],
+            );
+            Node::where('coterm_id', $coterm->id)->whereNotIn('id', $request->node_ids)->update(
+                ['coterm_id' => null],
+            );
         }
         $coterm->loadCount(['nodes']);
 
@@ -86,7 +99,12 @@ public function getAttachedNodes(Request $request, Coterm $coterm)
 
     public function updateAttachedNodes(UpdateAttachedNodesRequest $request, Coterm $coterm)
     {
-        $coterm->nodes()->sync($request->node_ids);
+        Node::whereIn('id', $request->node_ids)->whereNull('coterm_id')->update(
+            ['coterm_id' => $coterm->id],
+        );
+        Node::where('coterm_id', $coterm->id)->whereNotIn('id', $request->node_ids)->update(
+            ['coterm_id' => null],
+        );
         $coterm->loadCount(['nodes']);
 
         return fractal($coterm, new CotermTransformer())->respond();
@@ -100,11 +118,14 @@ public function resetCotermToken(Coterm $coterm)
             'token' => $creds['token'],
         ]);
 
-        return fractal($coterm, new CotermTransformer())->parseIncludes('token')->respond();
+        return fractal($coterm, new CotermTransformer(includeToken: true))->parseIncludes('token')
+                                                                          ->respond();
     }
 
-    public function destroy(Coterm $coterm)
+    public function destroy(DeleteCotermRequest $request, Coterm $coterm)
     {
+        $coterm->delete();
+
         return $this->returnNoContent();
     }
 }
diff --git a/app/Http/Controllers/Admin/Nodes/NodeController.php b/app/Http/Controllers/Admin/Nodes/NodeController.php
@@ -29,7 +29,9 @@ public function index(Request $request)
                              ->allowedFilters(
                                  [AllowedFilter::exact('id'), 'name', 'fqdn', AllowedFilter::exact(
                                      'location_id',
-                                 ), AllowedFilter::custom(
+                                 ), AllowedFilter::exact(
+                                     'coterm_id',
+                                 )->nullable(), AllowedFilter::custom(
                                      '*',
                                      new FiltersNode(),
                                  )],

diff --git a/app/Http/Controllers/Client/Servers/ServerController.php b/app/Http/Controllers/Client/Servers/ServerController.php
@@ -61,12 +61,14 @@ public function updateState(Server $server, SendPowerCommandRequest $request)
 
     public function createConsoleSession(CreateConsoleSessionRequest $request, Server $server)
     {
-        if ($server->node->coterm_enabled) {
+        $server->node->loadMissing('coterm');
+
+        if ($coterm = $server->node->coterm) {
             return new JsonResponse([
                 'data' => [
-                    'is_tls_enabled' => $server->node->coterm_tls_enabled,
-                    'fqdn' => $server->node->coterm_fqdn,
-                    'port' => $server->node->coterm_port,
+                    'is_tls_enabled' => $coterm->is_tls_enabled,
+                    'fqdn' => $coterm->fqdn,
+                    'port' => $coterm->port,
                     'token' => $this->cotermJWTService->handle(
                         $server, $request->user(), $request->enum('type', ConsoleType::class),
                     )

diff --git a/app/Http/Middleware/Coterm/CotermAuthenticate.php b/app/Http/Middleware/Coterm/CotermAuthenticate.php
@@ -2,11 +2,11 @@
 
 namespace Convoy\Http\Middleware\Coterm;
 
-use Convoy\Models\Node;
-use Illuminate\Http\Request;
+use Convoy\Models\Coterm;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Symfony\Component\HttpKernel\Exception\HttpException;
+use Illuminate\Http\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class CotermAuthenticate
 {
@@ -27,31 +27,30 @@ public function handle(Request $request, \Closure $next): mixed
         }
 
         if (is_null($bearer = $request->bearerToken())) {
-            throw new HttpException(401, 'Access to this endpoint must include an Authorization header.', null, ['WWW-Authenticate' => 'Bearer']);
+            throw new HttpException(
+                401, 'Access to this endpoint must include an Authorization header.', null,
+                ['WWW-Authenticate' => 'Bearer'],
+            );
         }
 
         $parts = explode('|', $bearer);
         // Ensure that all the correct parts are provided in the header.
         if (count($parts) !== 2 || empty($parts[0]) || empty($parts[1])) {
-            throw new BadRequestHttpException('The Authorization header provided was not in a valid format.');
+            throw new BadRequestHttpException(
+                'The Authorization header provided was not in a valid format.',
+            );
         }
 
         try {
-            $node = Node::where('coterm_token_id', $parts[0])->firstOrFail();
-
-            if (!$node->coterm_enabled) {
-                throw new HttpException(401);
-            }
-
-            if (hash_equals($node->coterm_token, $parts[1])) {
-                $request->attributes->set('node', $node);
+            $coterm = Coterm::where('token_id', $parts[0])->firstOrFail();
 
+            if (hash_equals($coterm->token, $parts[1])) {
                 return $next($request);
             }
         } catch (ModelNotFoundException) {
             // Do nothing, we don't want to expose a node not existing at all.
         }
 
-       throw new HttpException(401);
+        throw new HttpException(401);
     }
 }
diff --git a/app/Http/Requests/Admin/Coterms/StoreCotermRequest.php b/app/Http/Requests/Admin/Coterms/StoreCotermRequest.php
@@ -2,15 +2,17 @@
 
 namespace Convoy\Http\Requests\Admin\Coterms;
 
-use Convoy\Http\Requests\BaseApiRequest;
+use Convoy\Rules\Fqdn;
 use Convoy\Models\Coterm;
 use Illuminate\Support\Arr;
+use Convoy\Http\Requests\BaseApiRequest;
 
 class StoreCotermRequest extends BaseApiRequest
 {
     public function rules(): array
     {
         $rules = Coterm::getRules();
+        $rules['fqdn'][] = Fqdn::make();
 
         return [
             ...Arr::only($rules, ['name', 'is_tls_enabled', 'fqdn', 'port']),

diff --git a/app/Models/Coterm.php b/app/Models/Coterm.php
@@ -4,7 +4,6 @@
 
 use Convoy\Casts\NullableEncrypter;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 class Coterm extends Model
 {
@@ -39,4 +38,9 @@ public function nodes(): HasMany
     {
         return $this->hasMany(Node::class);
     }
+
+    public function getRouteKeyName(): string
+    {
+        return 'id';
+    }
 }
diff --git a/app/Transformers/Admin/CotermTransformer.php b/app/Transformers/Admin/CotermTransformer.php
@@ -7,25 +7,26 @@
 
 class CotermTransformer extends TransformerAbstract
 {
-    protected array $availableIncludes = ['token'];
+    public function __construct(private bool $includeToken = false)
+    {
+    }
 
     public function transform(Coterm $coterm): array
     {
-        return [
+        $transformed = [
             'id' => (int)$coterm->id,
             'name' => $coterm->name,
             'is_tls_enabled' => (boolean)$coterm->is_tls_enabled,
             'fqdn' => $coterm->fqdn,
             'port' => (int)$coterm->port,
             'nodes_count' => (int)$coterm->nodes_count,
         ];
-    }
 
-    public function includeToken(Coterm $coterm): array
-    {
-        return [
-            'token_id' => $coterm->token_id,
-            'token' => $coterm->token,
-        ];
+        if ($this->includeToken) {
+            $transformed['token_id'] = $coterm->token_id;
+            $transformed['token'] = $coterm->token;
+        }
+
+        return $transformed;
     }
 }
diff --git a/resources/scripts/api/admin/coterms/deleteCoterm.ts b/resources/scripts/api/admin/coterms/deleteCoterm.ts
@@ -1,5 +1,5 @@
 import http from '@/api/http'
 
-const deleteCoterm = (id: string) => http.delete(`/admin/coterms/${id}`)
+const deleteCoterm = (id: string) => http.delete(`/api/admin/coterms/${id}`)
 
 export default deleteCoterm
diff --git a/resources/scripts/api/admin/coterms/getCoterm.ts b/resources/scripts/api/admin/coterms/getCoterm.ts
@@ -0,0 +1,13 @@
+import { rawDataToCoterm } from '@/api/admin/coterms/getCoterms'
+import http from '@/api/http'
+
+
+const getCoterm = async (id: number) => {
+    const {
+        data: { data },
+    } = await http.get(`/api/admin/coterms/${id}`)
+
+    return rawDataToCoterm(data)
+}
+
+export default getCoterm
diff --git a/resources/scripts/api/admin/coterms/resetCotermToken.ts b/resources/scripts/api/admin/coterms/resetCotermToken.ts
@@ -1,10 +1,11 @@
 import { rawDataToCoterm } from '@/api/admin/coterms/getCoterms'
 import http from '@/api/http'
 
+
 const resetCotermToken = async (id: number) => {
     const {
         data: { data },
-    } = await http.post(`/api/admin/coterm/${id}/settings/reset-coterm-token`)
+    } = await http.post(`/api/admin/coterms/${id}/reset-coterm-token`)
 
     return rawDataToCoterm(data)
 }

diff --git a/resources/scripts/api/admin/coterms/updateCoterm.ts b/resources/scripts/api/admin/coterms/updateCoterm.ts
@@ -15,7 +15,7 @@ const updateCoterm = async (
 ) => {
     const {
         data: { data },
-    } = await http.put(`/admin/coterms/${id}`, {
+    } = await http.put(`/api/admin/coterms/${id}`, {
         name,
         is_tls_enabled: isTlsEnabled,
         fqdn,

diff --git a/resources/scripts/api/admin/coterms/useAttachedNodes.ts b/resources/scripts/api/admin/coterms/useAttachedNodes.ts
@@ -0,0 +1,21 @@
+import useSWR from 'swr'
+
+import getAttachedNodes, {
+    QueryParams,
+} from '@/api/admin/coterms/getAttachedNodes'
+
+
+const useAttachedNodes = (
+    id: number,
+    { page, query, ...params }: QueryParams
+) => {
+    return useSWR(['admin.coterms.attachedNodes', id, page, query], () =>
+        getAttachedNodes(id, {
+            page,
+            query,
+            ...params,
+        })
+    )
+}
+
+export default useAttachedNodes
diff --git a/resources/scripts/api/admin/coterms/useCotermSWR.ts b/resources/scripts/api/admin/coterms/useCotermSWR.ts
@@ -0,0 +1,20 @@
+import { Optimistic } from '@/lib/swr'
+import { useParams } from 'react-router-dom'
+import useSWR, { Key, SWRResponse } from 'swr'
+
+import getCoterm from '@/api/admin/coterms/getCoterm'
+import { Coterm } from '@/api/admin/coterms/getCoterms'
+
+
+export const getKey = (id: number): Key => ['admin.coterms', id]
+
+const useCotermSWR = () => {
+    const { cotermId } = useParams()
+    const id = parseInt(cotermId!)
+
+    return useSWR<Coterm>(getKey(id), () => getCoterm(id), {
+        revalidateOnMount: false,
+    }) as Optimistic<SWRResponse<Coterm, any>>
+}
+
+export default useCotermSWR
diff --git a/resources/scripts/api/admin/nodes/getNodes.ts b/resources/scripts/api/admin/nodes/getNodes.ts
@@ -51,21 +51,24 @@ export const rawDataToNode = (data: any): Node => ({
 export type NodeResponse = PaginatedResult<Node>
 
 export interface QueryParams {
-    query?: string
+    query?: string | null
+    cotermId?: number | null
     id?: number | number[] | string | string[]
     page?: number
     perPage?: number
 }
 
 const getNodes = async ({
     query,
+    cotermId,
     id,
     perPage = 50,
     ...params
 }: QueryParams): Promise<NodeResponse> => {
     const { data } = await http.get('/api/admin/nodes', {
         params: {
             'filter[*]': query,
+            'filter[coterm_id]': cotermId === null ? '' : cotermId,
             'filter[id]': id
                 ? Array.isArray(id)
                     ? id.join(',')

diff --git a/resources/scripts/api/admin/nodes/settings/resetCotermToken.ts b/resources/scripts/api/admin/nodes/settings/resetCotermToken.ts