Browse Source

Simple auth code.

pull/840/head
James Cole 4 months ago
parent
commit
b0ed9b05e4
  1. 6
      app/Http/Controllers/ServiceController.php
  2. 6
      app/Services/SimpleFIN/AuthenticationValidator.php

6
app/Http/Controllers/ServiceController.php

@ -32,6 +32,7 @@ use App\Services\Spectre\AuthenticationValidator as SpectreValidator;
use App\Services\SimpleFIN\AuthenticationValidator as SimpleFINValidator; use App\Services\SimpleFIN\AuthenticationValidator as SimpleFINValidator;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
/** /**
* Class ServiceController * Class ServiceController
@ -67,18 +68,21 @@ class ServiceController extends Controller
public function validateSimpleFIN(): JsonResponse public function validateSimpleFIN(): JsonResponse
{ {
Log::debug(sprintf('Now in %s', __METHOD__));
$validator = new SimpleFINValidator(); $validator = new SimpleFINValidator();
$result = $validator->validate(); $result = $validator->validate();
if ($result->equals(AuthenticationStatus::error())) { if ($result->equals(AuthenticationStatus::error())) {
// send user error: // send user error:
Log::error('Error: Could not validate app key.');
return response()->json(['result' => 'NOK']); return response()->json(['result' => 'NOK']);
} }
if ($result->equals(AuthenticationStatus::nodata())) { if ($result->equals(AuthenticationStatus::nodata())) {
// send user error: // send user error:
Log::error('No data: Could not validate app key.');
return response()->json(['result' => 'NODATA']); return response()->json(['result' => 'NODATA']);
} }
Log::info('All OK in validateSimpleFIN.');
return response()->json(['result' => 'OK']); return response()->json(['result' => 'OK']);
} }

6
app/Services/SimpleFIN/AuthenticationValidator.php

@ -28,6 +28,7 @@ namespace App\Services\SimpleFIN;
use App\Services\Enums\AuthenticationStatus; use App\Services\Enums\AuthenticationStatus;
use App\Services\Shared\Authentication\AuthenticationValidatorInterface; use App\Services\Shared\Authentication\AuthenticationValidatorInterface;
use App\Services\Shared\Authentication\IsRunningCli; use App\Services\Shared\Authentication\IsRunningCli;
use Illuminate\Support\Facades\Log;
/** /**
* Class AuthenticationValidator * Class AuthenticationValidator
@ -39,13 +40,14 @@ class AuthenticationValidator implements AuthenticationValidatorInterface
public function validate(): AuthenticationStatus public function validate(): AuthenticationStatus
{ {
app('log')->debug(sprintf('Now at %s', __METHOD__)); app('log')->debug(sprintf('Now at %s', __METHOD__));
return AuthenticationStatus::authenticated();
// needs an APP key which isn't blank or zero or whatever. // needs an APP key which isn't blank or zero or whatever.
$key = (string) config('app.key'); $key = (string) config('app.key');
if ('' === $key) { if ('' === $key) {
Log::debug('app.key is empty, cannot authenticate.');
return AuthenticationStatus::error(); return AuthenticationStatus::error();
} }
Log::debug('app.key is OK, can authenticate.');
return AuthenticationStatus::authenticated(); return AuthenticationStatus::authenticated();
} }
} }
Loading…
Cancel
Save