Merge pull request #105 from et-nik/develop

Redesigned UI

.drone.yml

@@ -10,13 +10,6 @@ steps:
       - composer install --no-ansi
       - touch composer_installed
 
-  - name: npm
-    image: node:20
-    commands:
-      - node --version
-      - npm install
-      - npm run prod
-
   - name: tests-php-7.3
     image: knik/php:7.3-fpm-stretch
     environment:
@@ -129,6 +122,13 @@ steps:
       - rm -rf storage/logs/*
       - rm .env
 
+  - name: npm
+    image: node:20
+    commands:
+      - node --version
+      - npm install
+      - npm run prod
+
   - name: browser-tests
     image: knik/php:7.3-fpm-buster
     environment:

.env.example

@@ -3,6 +3,7 @@ APP_ENV=local
 APP_KEY=
 APP_URL=http://localhost
 APP_ALLOW_REGISTRATION=true
+APP_ENABLE_EXPERIMENTAL_FEATURES=false
 APP_TIMEZONE=UTC
 APP_DEBUG=true
 

app/Exceptions/GdaemonAPI/InvalidApiKeyException.php

@@ -17,5 +17,4 @@ public function getHeaders()
     {
         return [];
     }
-
 }

app/Exceptions/Handler.php

@@ -4,6 +4,8 @@
 
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Http\Response;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
 class Handler extends ExceptionHandler
 {
@@ -46,13 +48,27 @@ private function renderJson($request, \Throwable $exception)
             }
         }
 
+        if ($exception instanceof HttpExceptionInterface) {
+            return response()->json([
+                'message'   => $exception->getMessage(),
+                'http_code' => $exception->getStatusCode(),
+            ], $exception->getStatusCode(), $exception->getHeaders());
+        }
+
         if ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) {
             return response()->json([
                 'message'   => $exception->getMessage(),
                 'http_code' => $exception->getStatusCode(),
             ], $exception->getStatusCode(), $exception->getHeaders());
         }
 
+        if ($exception instanceof \Illuminate\Auth\Access\AuthorizationException) {
+            return response()->json([
+                'message'   => $exception->getMessage(),
+                'http_code' => Response::HTTP_FORBIDDEN,
+            ], Response::HTTP_FORBIDDEN);
+        }
+
         return parent::render($request, $exception);
     }
 }

app/Exceptions/Http/HttpException.php

@@ -3,7 +3,22 @@
 namespace Gameap\Exceptions\Http;
 
 use Gameap\Exceptions\GameapException;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
-class HttpException extends GameapException
+class HttpException extends GameapException implements HttpExceptionInterface
 {
+    public $statusCode = Response::HTTP_INTERNAL_SERVER_ERROR;
+
+    public $headers = [];
+
+    public function getStatusCode()
+    {
+        return $this->statusCode;
+    }
+
+    public function getHeaders()
+    {
+        return $this->headers;
+    }
 }

app/Exceptions/Repositories/InvalidCertificateException.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Gameap\Exceptions\Repositories;
+
+use Gameap\Exceptions\Http\HttpException;
+use Illuminate\Http\Response;
+
+class InvalidCertificateException extends HttpException
+{
+    public function getStatusCode()
+    {
+        return Response::HTTP_UNPROCESSABLE_ENTITY;
+    }
+
+    public function getHeaders()
+    {
+        return [];
+    }
+}

app/Http/Controllers/API/AuthController.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace Gameap\Http\Controllers\API;
+
+use Gameap\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Http\Request;
+
+class AuthController extends Controller
+{
+    use AuthenticatesUsers;
+
+    /**
+     * @var Request
+     */
+    protected $request;
+
+    /**
+     * The maximum number of attempts to allow.
+     * @var int
+     */
+    protected $maxAttempts = 5;
+
+    /**
+     * Number of minutes to throttle for.
+     *
+     * @var int
+     */
+    protected $decayMinutes = 3;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return void
+     */
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * Get the login username to be used by the controller.
+     *
+     * @return string
+     */
+    public function username()
+    {
+        $field = filter_var($this->request->get('login'), FILTER_VALIDATE_EMAIL)
+            ? 'email'
+            : 'login';
+
+        $this->request->merge([$field => $this->request->get('login')]);
+
+        return $field;
+    }
+}

app/Http/Controllers/API/ClientCertificatesController.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Gameap\Http\Controllers\API;
+
+use Gameap\Http\Controllers\AuthController;
+use Gameap\Http\Requests\ClientCertificatesRequest;
+use Gameap\Models\ClientCertificate;
+use Gameap\Repositories\ClientCertificateRepository;
+
+class ClientCertificatesController extends AuthController
+{
+    /**
+     * The ClientCertificateRepository instance.
+     *
+     * @var \Gameap\Repositories\ClientCertificateRepository
+     */
+    protected $repository;
+
+    /**
+     * Create a new ClientCertificatesController instance.
+     *
+     * @param  \Gameap\Repositories\ClientCertificateRepository $repository
+     */
+    public function __construct(ClientCertificateRepository $repository)
+    {
+        parent::__construct();
+
+        $this->repository = $repository;
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\View\View
+     */
+    public function list()
+    {
+        $clientCertificates = $this->repository->getAll(99999);
+
+        return $clientCertificates->map(function ($item) {
+            return $item->only([
+                'id',
+                'fingerprint',
+                'expires',
+                'info',
+            ]);
+        });
+    }
+
+    public function store(ClientCertificatesRequest $request)
+    {
+        $this->repository->store($request);
+
+        return ['message' => 'success'];
+    }
+
+    public function destroy($id)
+    {
+        $clientCertificate = $this->repository->findById($id);
+
+        $this->repository->destroy($clientCertificate);
+
+        return ['message' => 'success'];
+    }
+}