Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1e12886680 | |||
| a25569d6f2 | |||
| df9fc2b6f5 | |||
| 267aaa6f87 | |||
| da1a454515 | |||
| 471313bf23 | |||
| 8774db22ca | |||
| 3789235f73 | |||
| 388066cd31 | |||
| 0beb467739 |
@@ -5,7 +5,7 @@ declare(strict_types=1);
|
|||||||
namespace KTXM\AuthenticationProviderTotp\Controllers;
|
namespace KTXM\AuthenticationProviderTotp\Controllers;
|
||||||
|
|
||||||
use KTXC\Http\Response\JsonResponse;
|
use KTXC\Http\Response\JsonResponse;
|
||||||
use KTXC\SessionIdentity;
|
use KTXC\Context\IdentityContextInterface;
|
||||||
use KTXF\Controller\ControllerAbstract;
|
use KTXF\Controller\ControllerAbstract;
|
||||||
use KTXF\Routing\Attributes\AuthenticatedRoute;
|
use KTXF\Routing\Attributes\AuthenticatedRoute;
|
||||||
use KTXM\AuthenticationProviderTotp\Services\EnrollmentService;
|
use KTXM\AuthenticationProviderTotp\Services\EnrollmentService;
|
||||||
@@ -23,7 +23,7 @@ use KTXM\AuthenticationProviderTotp\Services\EnrollmentService;
|
|||||||
class EnrollmentController extends ControllerAbstract
|
class EnrollmentController extends ControllerAbstract
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly SessionIdentity $userIdentity,
|
private readonly IdentityContextInterface $identityContext,
|
||||||
private readonly EnrollmentService $enrollmentService,
|
private readonly EnrollmentService $enrollmentService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@@ -33,7 +33,7 @@ class EnrollmentController extends ControllerAbstract
|
|||||||
#[AuthenticatedRoute('/totp/status', name: 'totp.status', methods: ['GET'])]
|
#[AuthenticatedRoute('/totp/status', name: 'totp.status', methods: ['GET'])]
|
||||||
public function status(): JsonResponse
|
public function status(): JsonResponse
|
||||||
{
|
{
|
||||||
$userId = $this->userIdentity->identifier();
|
$userId = $this->identityContext->identifier();
|
||||||
if (!$userId) {
|
if (!$userId) {
|
||||||
return new JsonResponse(
|
return new JsonResponse(
|
||||||
['error' => 'User not authenticated', 'error_code' => 'unauthorized'],
|
['error' => 'User not authenticated', 'error_code' => 'unauthorized'],
|
||||||
@@ -56,7 +56,7 @@ class EnrollmentController extends ControllerAbstract
|
|||||||
#[AuthenticatedRoute('/totp/enroll', name: 'totp.enroll.begin', methods: ['POST'])]
|
#[AuthenticatedRoute('/totp/enroll', name: 'totp.enroll.begin', methods: ['POST'])]
|
||||||
public function beginEnrollment(string $accountName = ''): JsonResponse
|
public function beginEnrollment(string $accountName = ''): JsonResponse
|
||||||
{
|
{
|
||||||
$userId = $this->userIdentity->identifier();
|
$userId = $this->identityContext->identifier();
|
||||||
if (!$userId) {
|
if (!$userId) {
|
||||||
return new JsonResponse(
|
return new JsonResponse(
|
||||||
['error' => 'User not authenticated', 'error_code' => 'unauthorized'],
|
['error' => 'User not authenticated', 'error_code' => 'unauthorized'],
|
||||||
@@ -95,7 +95,7 @@ class EnrollmentController extends ControllerAbstract
|
|||||||
#[AuthenticatedRoute('/totp/enroll/verify', name: 'totp.enroll.verify', methods: ['POST'])]
|
#[AuthenticatedRoute('/totp/enroll/verify', name: 'totp.enroll.verify', methods: ['POST'])]
|
||||||
public function completeEnrollment(string $code): JsonResponse
|
public function completeEnrollment(string $code): JsonResponse
|
||||||
{
|
{
|
||||||
$userId = $this->userIdentity->identifier();
|
$userId = $this->identityContext->identifier();
|
||||||
if (!$userId) {
|
if (!$userId) {
|
||||||
return new JsonResponse(
|
return new JsonResponse(
|
||||||
['error' => 'User not authenticated', 'error_code' => 'unauthorized'],
|
['error' => 'User not authenticated', 'error_code' => 'unauthorized'],
|
||||||
@@ -131,7 +131,7 @@ class EnrollmentController extends ControllerAbstract
|
|||||||
#[AuthenticatedRoute('/totp/enroll/remove', name: 'totp.enroll.remove', methods: ['POST'])]
|
#[AuthenticatedRoute('/totp/enroll/remove', name: 'totp.enroll.remove', methods: ['POST'])]
|
||||||
public function removeEnrollment(string $code): JsonResponse
|
public function removeEnrollment(string $code): JsonResponse
|
||||||
{
|
{
|
||||||
$userId = $this->userIdentity->identifier();
|
$userId = $this->identityContext->identifier();
|
||||||
if (!$userId) {
|
if (!$userId) {
|
||||||
return new JsonResponse(
|
return new JsonResponse(
|
||||||
['error' => 'User not authenticated', 'error_code' => 'unauthorized'],
|
['error' => 'User not authenticated', 'error_code' => 'unauthorized'],
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace KTXM\AuthenticationProviderTotp\Services;
|
namespace KTXM\AuthenticationProviderTotp\Services;
|
||||||
|
|
||||||
use KTXC\SessionTenant;
|
use KTXC\Context\TenantContextInterface;
|
||||||
use KTXM\AuthenticationProviderTotp\Stores\EnrollmentStore;
|
use KTXM\AuthenticationProviderTotp\Stores\EnrollmentStore;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -26,7 +26,7 @@ class EnrollmentService
|
|||||||
private const SECRET_LENGTH = 20; // 160 bits as recommended by RFC 4226
|
private const SECRET_LENGTH = 20; // 160 bits as recommended by RFC 4226
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly SessionTenant $tenant,
|
private readonly TenantContextInterface $tenantContext,
|
||||||
private readonly EnrollmentStore $enrollmentStore,
|
private readonly EnrollmentStore $enrollmentStore,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@@ -35,7 +35,7 @@ class EnrollmentService
|
|||||||
*/
|
*/
|
||||||
public function isEnrolled(string $userId): bool
|
public function isEnrolled(string $userId): bool
|
||||||
{
|
{
|
||||||
$tenantId = $this->tenant->identifier();
|
$tenantId = $this->tenantContext->identifier();
|
||||||
if (!$tenantId) {
|
if (!$tenantId) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -53,7 +53,7 @@ class EnrollmentService
|
|||||||
*/
|
*/
|
||||||
public function beginEnrollment(string $userId, array $config = []): array
|
public function beginEnrollment(string $userId, array $config = []): array
|
||||||
{
|
{
|
||||||
$tenantId = $this->tenant->identifier();
|
$tenantId = $this->tenantContext->identifier();
|
||||||
if (!$tenantId) {
|
if (!$tenantId) {
|
||||||
return [
|
return [
|
||||||
'success' => false,
|
'success' => false,
|
||||||
@@ -108,7 +108,7 @@ class EnrollmentService
|
|||||||
*/
|
*/
|
||||||
public function completeEnrollment(string $userId, string $code): array
|
public function completeEnrollment(string $userId, string $code): array
|
||||||
{
|
{
|
||||||
$tenantId = $this->tenant->identifier();
|
$tenantId = $this->tenantContext->identifier();
|
||||||
if (!$tenantId) {
|
if (!$tenantId) {
|
||||||
return [
|
return [
|
||||||
'success' => false,
|
'success' => false,
|
||||||
@@ -150,7 +150,7 @@ class EnrollmentService
|
|||||||
*/
|
*/
|
||||||
public function removeEnrollment(string $userId): array
|
public function removeEnrollment(string $userId): array
|
||||||
{
|
{
|
||||||
$tenantId = $this->tenant->identifier();
|
$tenantId = $this->tenantContext->identifier();
|
||||||
if (!$tenantId) {
|
if (!$tenantId) {
|
||||||
return [
|
return [
|
||||||
'success' => false,
|
'success' => false,
|
||||||
@@ -181,7 +181,7 @@ class EnrollmentService
|
|||||||
*/
|
*/
|
||||||
public function verifyCode(string $userId, string $code): array
|
public function verifyCode(string $userId, string $code): array
|
||||||
{
|
{
|
||||||
$tenantId = $this->tenant->identifier();
|
$tenantId = $this->tenantContext->identifier();
|
||||||
if (!$tenantId) {
|
if (!$tenantId) {
|
||||||
return [
|
return [
|
||||||
'success' => false,
|
'success' => false,
|
||||||
@@ -225,7 +225,7 @@ class EnrollmentService
|
|||||||
*/
|
*/
|
||||||
public function getEnrollmentSecret(string $userId): ?string
|
public function getEnrollmentSecret(string $userId): ?string
|
||||||
{
|
{
|
||||||
$tenantId = $this->tenant->identifier();
|
$tenantId = $this->tenantContext->identifier();
|
||||||
if (!$tenantId) {
|
if (!$tenantId) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+137
-782
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -19,7 +19,7 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@mdi/js": "^7.4.47",
|
"@mdi/js": "^7.4.47",
|
||||||
"pinia": "^3.0.0",
|
"pinia": "^4.0.0",
|
||||||
"qrcode": "^1.5.4",
|
"qrcode": "^1.5.4",
|
||||||
"vue": "^3.5.18",
|
"vue": "^3.5.18",
|
||||||
"vue-router": "^5.0.0",
|
"vue-router": "^5.0.0",
|
||||||
|
|||||||
Reference in New Issue
Block a user