Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8704a02a09 |
@@ -10,7 +10,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
services:
|
services:
|
||||||
mongo:
|
mongo:
|
||||||
image: mongo:7
|
image: mongo:8
|
||||||
options: >-
|
options: >-
|
||||||
--health-cmd "mongosh --quiet --eval \"db.adminCommand('ping')\""
|
--health-cmd "mongosh --quiet --eval \"db.adminCommand('ping')\""
|
||||||
--health-interval 5s
|
--health-interval 5s
|
||||||
|
|||||||
Generated
+7
-7
@@ -589,16 +589,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit",
|
"name": "phpunit/phpunit",
|
||||||
"version": "12.5.33",
|
"version": "12.5.31",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||||
"reference": "b98e028a26c5c5ba7e4a54be96ccf35f2914d184"
|
"reference": "0608d157a284f15cc73b99a3327eff06b66a176d"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b98e028a26c5c5ba7e4a54be96ccf35f2914d184",
|
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0608d157a284f15cc73b99a3327eff06b66a176d",
|
||||||
"reference": "b98e028a26c5c5ba7e4a54be96ccf35f2914d184",
|
"reference": "0608d157a284f15cc73b99a3327eff06b66a176d",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -667,7 +667,7 @@
|
|||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
|
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
|
||||||
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
|
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
|
||||||
"source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.33"
|
"source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.31"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -675,7 +675,7 @@
|
|||||||
"type": "other"
|
"type": "other"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2026-07-28T13:58:09+00:00"
|
"time": "2026-07-06T14:54:16+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/cli-parser",
|
"name": "sebastian/cli-parser",
|
||||||
@@ -1698,5 +1698,5 @@
|
|||||||
"php": ">=8.3"
|
"php": ">=8.3"
|
||||||
},
|
},
|
||||||
"platform-dev": {},
|
"platform-dev": {},
|
||||||
"plugin-api-version": "2.9.0"
|
"plugin-api-version": "2.6.0"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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\Context\IdentityContextInterface;
|
use KTXC\SessionIdentity;
|
||||||
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 IdentityContextInterface $identityContext,
|
private readonly SessionIdentity $userIdentity,
|
||||||
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->identityContext->identifier();
|
$userId = $this->userIdentity->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->identityContext->identifier();
|
$userId = $this->userIdentity->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->identityContext->identifier();
|
$userId = $this->userIdentity->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->identityContext->identifier();
|
$userId = $this->userIdentity->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\Context\TenantContextInterface;
|
use KTXC\SessionTenant;
|
||||||
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 TenantContextInterface $tenantContext,
|
private readonly SessionTenant $tenant,
|
||||||
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->tenantContext->identifier();
|
$tenantId = $this->tenant->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->tenantContext->identifier();
|
$tenantId = $this->tenant->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->tenantContext->identifier();
|
$tenantId = $this->tenant->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->tenantContext->identifier();
|
$tenantId = $this->tenant->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->tenantContext->identifier();
|
$tenantId = $this->tenant->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->tenantContext->identifier();
|
$tenantId = $this->tenant->identifier();
|
||||||
if (!$tenantId) {
|
if (!$tenantId) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user