Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0f04bb2e21 |
@@ -14,7 +14,6 @@ use KTXC\Resource\ProviderManager;
|
||||
use KTXF\Mail\Provider\ProviderBaseInterface;
|
||||
use KTXF\Mail\Provider\ProviderServiceMutateInterface;
|
||||
use KTXF\Resource\Provider\ResourceServiceMutateInterface;
|
||||
use KTXF\Resource\SystemIdentity;
|
||||
use KTXM\ProviderMailSystem\Stores\ServiceStore;
|
||||
|
||||
/**
|
||||
@@ -109,7 +108,7 @@ class Provider implements ProviderBaseInterface, ProviderServiceMutateInterface
|
||||
{
|
||||
// routes are tenant scoped and only visible in the system user context,
|
||||
// keeping them out of regular user account listings
|
||||
if ($userId !== SystemIdentity::USER) {
|
||||
if ($userId !== self::USER_SYSTEM) {
|
||||
return [];
|
||||
}
|
||||
|
||||
@@ -123,7 +122,7 @@ class Provider implements ProviderBaseInterface, ProviderServiceMutateInterface
|
||||
|
||||
public function serviceFetch(string $tenantId, string $userId, string|int $identifier): ?Service
|
||||
{
|
||||
if ($userId !== SystemIdentity::USER) {
|
||||
if ($userId !== self::USER_SYSTEM) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -148,7 +147,7 @@ class Provider implements ProviderBaseInterface, ProviderServiceMutateInterface
|
||||
if (!str_ends_with($address, self::ADDRESS_DOMAIN_SUFFIX)) {
|
||||
return null;
|
||||
}
|
||||
if ($userId !== SystemIdentity::USER) {
|
||||
if ($userId !== self::USER_SYSTEM) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -171,7 +170,7 @@ class Provider implements ProviderBaseInterface, ProviderServiceMutateInterface
|
||||
|
||||
public function serviceExtant(string $tenantId, string $userId, string|int ...$identifiers): array
|
||||
{
|
||||
if ($userId !== SystemIdentity::USER) {
|
||||
if ($userId !== self::USER_SYSTEM) {
|
||||
return array_fill_keys(array_map('strval', $identifiers), false);
|
||||
}
|
||||
|
||||
@@ -224,7 +223,7 @@ class Provider implements ProviderBaseInterface, ProviderServiceMutateInterface
|
||||
*/
|
||||
protected function assertSystemContext(string $userId): void
|
||||
{
|
||||
if ($userId !== SystemIdentity::USER) {
|
||||
if ($userId !== self::USER_SYSTEM) {
|
||||
throw new InvalidArgumentException('System mail routes can only be managed in the system user context');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,7 +28,6 @@ use KTXF\Resource\Identifier\EntityIdentifierInterface;
|
||||
use KTXF\Resource\Provider\ProviderInterface;
|
||||
use KTXF\Resource\Provider\ResourceServiceIdentityInterface;
|
||||
use KTXF\Resource\Provider\ResourceServiceLocationInterface;
|
||||
use KTXF\Resource\SystemIdentity;
|
||||
use KTXF\Resource\Range\IRange;
|
||||
use KTXF\Resource\Range\RangeType;
|
||||
use KTXF\Resource\Sort\ISort;
|
||||
@@ -423,7 +422,7 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceE
|
||||
throw new RuntimeException("Target mail provider '$providerId' is not available");
|
||||
}
|
||||
|
||||
$service = $provider->serviceFetch($this->serviceTenantId, SystemIdentity::USER, $serviceId);
|
||||
$service = $provider->serviceFetch($this->serviceTenantId, ProviderBaseInterface::USER_SYSTEM, $serviceId);
|
||||
if ($service === null) {
|
||||
throw new RuntimeException("Target mail service '$providerId/$serviceId' was not found");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user