generated from Nodarx/template
Compare commits
1 Commits
main
..
3db27a79b6
| Author | SHA1 | Date | |
|---|---|---|---|
| 3db27a79b6 |
@@ -1,50 +0,0 @@
|
|||||||
name: Build Test
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Retrieve Server Install Action
|
|
||||||
uses: actions/checkout@v6.0.2
|
|
||||||
with:
|
|
||||||
repository: Nodarx/action-server-install
|
|
||||||
ref: main
|
|
||||||
path: action-server-install
|
|
||||||
github-server-url: https://git.ktrix.dev
|
|
||||||
|
|
||||||
- name: Install Server
|
|
||||||
uses: ./action-server-install
|
|
||||||
with:
|
|
||||||
install-php: 'false'
|
|
||||||
install-node: 'true'
|
|
||||||
php-version: '8.5'
|
|
||||||
node-version: '24'
|
|
||||||
server-path: './server'
|
|
||||||
|
|
||||||
- name: Install Mail Manager
|
|
||||||
uses: actions/checkout@v6.0.2
|
|
||||||
with:
|
|
||||||
repository: Nodarx/mail_manager
|
|
||||||
ref: main
|
|
||||||
path: server/modules/mail_manager
|
|
||||||
github-server-url: https://git.ktrix.dev
|
|
||||||
|
|
||||||
- name: Checkout Pull Request
|
|
||||||
uses: actions/checkout@v6.0.2
|
|
||||||
with:
|
|
||||||
repository: ${{ github.repository }}
|
|
||||||
ref: ${{ github.event.pull_request.head.sha }}
|
|
||||||
path: server/modules/provider_imap
|
|
||||||
github-server-url: https://git.ktrix.dev
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: npm ci
|
|
||||||
working-directory: server/modules/provider_imap
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: npm run build
|
|
||||||
working-directory: server/modules/provider_imap
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
name: JS Unit Tests
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Retrieve Server Install Action
|
|
||||||
uses: actions/checkout@v6.0.2
|
|
||||||
with:
|
|
||||||
repository: Nodarx/action-server-install
|
|
||||||
ref: main
|
|
||||||
path: action-server-install
|
|
||||||
github-server-url: https://git.ktrix.dev
|
|
||||||
|
|
||||||
- name: Install Server
|
|
||||||
uses: ./action-server-install
|
|
||||||
with:
|
|
||||||
install-php: 'false'
|
|
||||||
install-node: 'true'
|
|
||||||
php-version: '8.5'
|
|
||||||
node-version: '24'
|
|
||||||
server-path: './server'
|
|
||||||
|
|
||||||
- name: Install Mail Manager
|
|
||||||
uses: actions/checkout@v6.0.2
|
|
||||||
with:
|
|
||||||
repository: Nodarx/mail_manager
|
|
||||||
ref: main
|
|
||||||
path: server/modules/mail_manager
|
|
||||||
github-server-url: https://git.ktrix.dev
|
|
||||||
|
|
||||||
- name: Checkout Pull Request
|
|
||||||
uses: actions/checkout@v6.0.2
|
|
||||||
with:
|
|
||||||
repository: ${{ github.repository }}
|
|
||||||
ref: ${{ github.event.pull_request.head.sha }}
|
|
||||||
path: server/modules/provider_imap
|
|
||||||
github-server-url: https://git.ktrix.dev
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: npm ci
|
|
||||||
working-directory: server/modules/provider_imap
|
|
||||||
|
|
||||||
- name: Run tests
|
|
||||||
run: npm run test:unit
|
|
||||||
working-directory: server/modules/provider_imap
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
name: PHP Integration Tests
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
name: Integration Tests
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
services:
|
|
||||||
mongo:
|
|
||||||
image: mongo:8
|
|
||||||
options: >-
|
|
||||||
--health-cmd "mongosh --quiet --eval \"db.adminCommand('ping')\""
|
|
||||||
--health-interval 5s
|
|
||||||
--health-timeout 5s
|
|
||||||
--health-retries 12
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Retrieve Server Install Action
|
|
||||||
uses: actions/checkout@v6.0.2
|
|
||||||
with:
|
|
||||||
repository: Nodarx/action-server-install
|
|
||||||
ref: main
|
|
||||||
path: action-server-install
|
|
||||||
github-server-url: https://git.ktrix.dev
|
|
||||||
|
|
||||||
- name: Install server
|
|
||||||
uses: ./action-server-install
|
|
||||||
with:
|
|
||||||
install-php: 'true'
|
|
||||||
php-version: '8.5'
|
|
||||||
server-path: './server'
|
|
||||||
database-uri: 'mongodb://mongo:27017/?tls=false'
|
|
||||||
database-name: 'ktrix_ci'
|
|
||||||
app-environment: 'test'
|
|
||||||
|
|
||||||
- name: Checkout module under test
|
|
||||||
uses: actions/checkout@v6.0.2
|
|
||||||
with:
|
|
||||||
repository: ${{ github.repository }}
|
|
||||||
ref: ${{ github.event.pull_request.head.sha || github.sha }}
|
|
||||||
path: server/modules/provider_imap
|
|
||||||
github-server-url: https://git.ktrix.dev
|
|
||||||
|
|
||||||
- name: Install module dependencies
|
|
||||||
run: composer install --prefer-dist --no-progress
|
|
||||||
working-directory: server/modules/provider_imap
|
|
||||||
|
|
||||||
- name: Install and enable module
|
|
||||||
working-directory: server
|
|
||||||
run: |
|
|
||||||
php bin/console module:install provider_imap
|
|
||||||
php bin/console module:enable provider_imap
|
|
||||||
|
|
||||||
- name: Run integration tests
|
|
||||||
working-directory: server/modules/provider_imap
|
|
||||||
run: composer test:integration
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
name: PHP Unit Tests
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Retrieve Server Install Action
|
|
||||||
uses: actions/checkout@v6.0.2
|
|
||||||
with:
|
|
||||||
repository: Nodarx/action-server-install
|
|
||||||
ref: main
|
|
||||||
path: action-server-install
|
|
||||||
github-server-url: https://git.ktrix.dev
|
|
||||||
|
|
||||||
- name: Install Server
|
|
||||||
uses: ./action-server-install
|
|
||||||
with:
|
|
||||||
install-php: 'true'
|
|
||||||
install-node: 'false'
|
|
||||||
php-version: '8.5'
|
|
||||||
node-version: '24'
|
|
||||||
server-path: './server'
|
|
||||||
|
|
||||||
- name: Checkout Pull Request
|
|
||||||
uses: actions/checkout@v6.0.2
|
|
||||||
with:
|
|
||||||
repository: ${{ github.repository }}
|
|
||||||
ref: ${{ github.event.pull_request.head.sha }}
|
|
||||||
path: server/modules/provider_imap
|
|
||||||
github-server-url: https://git.ktrix.dev
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: composer install --prefer-dist --no-progress
|
|
||||||
working-directory: server/modules/provider_imap
|
|
||||||
|
|
||||||
- name: Run tests
|
|
||||||
run: composer test:unit
|
|
||||||
working-directory: server/modules/provider_imap
|
|
||||||
@@ -25,17 +25,11 @@ jobs:
|
|||||||
tools: composer:v2
|
tools: composer:v2
|
||||||
|
|
||||||
- name: Install Renovate
|
- name: Install Renovate
|
||||||
run: |
|
run: npm install -g renovate
|
||||||
npm install --global --no-audit --fund=false \
|
|
||||||
--prefix "${{ runner.temp }}/renovate-npm" \
|
|
||||||
--cache "${{ runner.temp }}/renovate-npm-cache" \
|
|
||||||
renovate
|
|
||||||
"${{ runner.temp }}/renovate-npm/bin/renovate" --version
|
|
||||||
|
|
||||||
- name: Run Renovate
|
- name: Run Renovate
|
||||||
env:
|
env:
|
||||||
RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }}
|
RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }}
|
||||||
RENOVATE_PLATFORM: gitea
|
RENOVATE_PLATFORM: gitea
|
||||||
RENOVATE_ENDPOINT: https://git.ktrix.dev/api/v1
|
RENOVATE_ENDPOINT: https://git.ktrix.dev/api/v1
|
||||||
run: |
|
run: renovate ${{ gitea.repository }}
|
||||||
"${{ runner.temp }}/renovate-npm/bin/renovate" ${{ gitea.repository }}
|
|
||||||
+5
-1
@@ -14,7 +14,11 @@ node_modules/
|
|||||||
# Backend development
|
# Backend development
|
||||||
/lib/vendor/
|
/lib/vendor/
|
||||||
coverage/
|
coverage/
|
||||||
*.cache
|
phpunit.xml.cache
|
||||||
|
.phpunit.cache
|
||||||
|
.phpunit.result.cache
|
||||||
|
.php-cs-fixer.cache
|
||||||
|
.phpstan.cache
|
||||||
.phpactor/
|
.phpactor/
|
||||||
|
|
||||||
# Editors
|
# Editors
|
||||||
|
|||||||
+7
-8
@@ -7,7 +7,7 @@
|
|||||||
"config": {
|
"config": {
|
||||||
"optimize-autoloader": true,
|
"optimize-autoloader": true,
|
||||||
"platform": {
|
"platform": {
|
||||||
"php": "8.3"
|
"php": "8.2"
|
||||||
},
|
},
|
||||||
"autoloader-suffix": "ProviderImap",
|
"autoloader-suffix": "ProviderImap",
|
||||||
"vendor-dir": "lib/vendor",
|
"vendor-dir": "lib/vendor",
|
||||||
@@ -16,16 +16,16 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=8.3 <=8.5",
|
"php": ">=8.2 <=8.5",
|
||||||
"ext-iconv": "*",
|
"ext-iconv": "*",
|
||||||
"ext-ctype": "*",
|
"ext-ctype": "*",
|
||||||
"psr/log": "^1.0|^2.0|^3.0",
|
"psr/log": "^1.0|^2.0|^3.0",
|
||||||
"doctrine/lexer": "^3.0",
|
"doctrine/lexer": "^3.0",
|
||||||
"symfony/mime": "^7.0",
|
"symfony/mime": "^8.0",
|
||||||
"egulias/email-validator": "^4.0"
|
"egulias/email-validator": "^4.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^12.0"
|
"phpunit/phpunit": "^11.0"
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
},
|
},
|
||||||
"autoload-dev": {
|
"autoload-dev": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"KTXT\\ProviderImap\\Tests\\": "tests/php/"
|
"KTXM\\ProviderImap\\": "tests/php/"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -42,8 +42,7 @@
|
|||||||
],
|
],
|
||||||
"post-update-cmd": [
|
"post-update-cmd": [
|
||||||
],
|
],
|
||||||
"test:unit": "phpunit --configuration tests/php/phpunit.xml --testsuite \"Unit Tests\" --colors=always --testdox",
|
"test:unit": "phpunit --configuration tests/php/phpunit.unit.xml --colors=always --testdox",
|
||||||
"test:integration": "phpunit --configuration tests/php/phpunit.xml --testsuite \"Integration Tests\" --colors=always --testdox",
|
"test:coverage": "XDEBUG_MODE=coverage phpunit --configuration tests/php/phpunit.unit.xml --coverage-html .phpunit.coverage --coverage-text"
|
||||||
"test:coverage": "XDEBUG_MODE=coverage phpunit --configuration tests/php/phpunit.xml --testsuite \"Unit Tests\" --coverage-html .phpunit.coverage --coverage-text"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+362
-262
File diff suppressed because it is too large
Load Diff
@@ -39,7 +39,7 @@ final class FetchResponseParser
|
|||||||
public function parseMany(ResponseStream $responses): Generator
|
public function parseMany(ResponseStream $responses): Generator
|
||||||
{
|
{
|
||||||
foreach ($responses as $response) {
|
foreach ($responses as $response) {
|
||||||
if ($response instanceof UntaggedResponse && MessageParser::isFetchMessage($response->raw())) {
|
if ($response instanceof UntaggedResponse && MessageParser::isFetchMessage($response->payload())) {
|
||||||
yield MessageParser::parse($response->raw());
|
yield MessageParser::parse($response->raw());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -55,4 +55,4 @@ final class FetchResponseParser
|
|||||||
|
|
||||||
throw new ImapException('FETCH did not receive a tagged completion response.');
|
throw new ImapException('FETCH did not receive a tagged completion response.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,21 +8,19 @@ use DateTimeInterface;
|
|||||||
|
|
||||||
final class MessageParser
|
final class MessageParser
|
||||||
{
|
{
|
||||||
public static function isFetchMessage(string $raw): bool
|
public static function isFetchMessage(string $payload): bool
|
||||||
{
|
{
|
||||||
return preg_match('/^\*\s+\d+\s+FETCH\s+\(/i', $raw) === 1;
|
return str_contains(strtoupper($payload), 'FETCH (');
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function parse(string $raw): Message
|
public static function parse(string $raw): Message
|
||||||
{
|
{
|
||||||
if (preg_match('/^\*\s+(\d+)\s+FETCH\s+\(/iA', $raw, $matches) !== 1
|
if (!preg_match('/^\*\s+(\d+)\s+FETCH\s+\((.*)\)$/is', $raw, $matches)) {
|
||||||
|| !str_ends_with($raw, ')')) {
|
|
||||||
throw new ImapException('Unable to parse FETCH response: ' . $raw);
|
throw new ImapException('Unable to parse FETCH response: ' . $raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
$sequence = (int) $matches[1];
|
$sequence = (int) $matches[1];
|
||||||
$offset = strlen($matches[0]);
|
$attributes = self::parseAttributes($matches[2]);
|
||||||
$attributes = self::parseAttributes($raw, $offset, strlen($raw) - 1);
|
|
||||||
$uid = self::toInt($attributes['UID'] ?? null, 'FETCH response is missing UID: ' . $raw);
|
$uid = self::toInt($attributes['UID'] ?? null, 'FETCH response is missing UID: ' . $raw);
|
||||||
$envelope = is_array($attributes['ENVELOPE'] ?? null) ? $attributes['ENVELOPE'] : null;
|
$envelope = is_array($attributes['ENVELOPE'] ?? null) ? $attributes['ENVELOPE'] : null;
|
||||||
$bodyStructure = isset($attributes['BODYSTRUCTURE']) ? self::parseBodyPart($attributes['BODYSTRUCTURE'], '') : null;
|
$bodyStructure = isset($attributes['BODYSTRUCTURE']) ? self::parseBodyPart($attributes['BODYSTRUCTURE'], '') : null;
|
||||||
@@ -54,13 +52,15 @@ final class MessageParser
|
|||||||
/**
|
/**
|
||||||
* @return array<string, mixed>
|
* @return array<string, mixed>
|
||||||
*/
|
*/
|
||||||
private static function parseAttributes(string $payload, int &$offset, int $end): array
|
private static function parseAttributes(string $payload): array
|
||||||
{
|
{
|
||||||
$attributes = [];
|
$attributes = [];
|
||||||
|
$offset = 0;
|
||||||
|
$length = strlen($payload);
|
||||||
|
|
||||||
while ($offset < $end) {
|
while ($offset < $length) {
|
||||||
self::skipWhitespace($payload, $offset);
|
self::skipWhitespace($payload, $offset);
|
||||||
if ($offset >= $end) {
|
if ($offset >= $length) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -784,4 +784,4 @@ final class MessageParser
|
|||||||
$value,
|
$value,
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -56,27 +56,16 @@ final class ProtocolReader
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (str_starts_with($raw, '* ')) {
|
if (str_starts_with($raw, '* ')) {
|
||||||
// Keep the payload as a slice of the raw response. FETCH payloads can
|
$parts = preg_split('/\s+/', substr($raw, 2), 2) ?: [];
|
||||||
// contain large message literals, so eagerly splitting here would keep
|
$label = strtoupper($parts[0] ?? '');
|
||||||
// a second full copy alive while the message is parsed.
|
|
||||||
$labelEnd = 2;
|
|
||||||
while (isset($raw[$labelEnd]) && !ctype_space($raw[$labelEnd])) {
|
|
||||||
$labelEnd++;
|
|
||||||
}
|
|
||||||
$label = strtoupper(substr($raw, 2, $labelEnd - 2));
|
|
||||||
$payloadOffset = $labelEnd;
|
|
||||||
while (isset($raw[$payloadOffset]) && ctype_space($raw[$payloadOffset])) {
|
|
||||||
$payloadOffset++;
|
|
||||||
}
|
|
||||||
$this->logger?->debug('IMAP untagged response received: {raw}', [
|
$this->logger?->debug('IMAP untagged response received: {raw}', [
|
||||||
'label' => $label,
|
'label' => $label,
|
||||||
'raw' => $raw,
|
'raw' => $raw,
|
||||||
]);
|
]);
|
||||||
return new UntaggedResponse(
|
return new UntaggedResponse(
|
||||||
$label,
|
$label,
|
||||||
'',
|
$parts[1] ?? '',
|
||||||
$raw,
|
$raw,
|
||||||
$payloadOffset,
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -192,4 +181,4 @@ final class ProtocolReader
|
|||||||
|
|
||||||
return $raw;
|
return $raw;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -10,7 +10,6 @@ final class UntaggedResponse implements ResponseInterface
|
|||||||
private readonly string $label,
|
private readonly string $label,
|
||||||
private readonly string $payload,
|
private readonly string $payload,
|
||||||
private readonly string $raw,
|
private readonly string $raw,
|
||||||
private readonly ?int $payloadOffset = null,
|
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function label(): string
|
public function label(): string
|
||||||
@@ -20,12 +19,6 @@ final class UntaggedResponse implements ResponseInterface
|
|||||||
|
|
||||||
public function payload(): string
|
public function payload(): string
|
||||||
{
|
{
|
||||||
// ProtocolReader records an offset for potentially large responses and
|
|
||||||
// only materializes the payload for command parsers that actually need it.
|
|
||||||
if ($this->payloadOffset !== null) {
|
|
||||||
return substr($this->raw, $this->payloadOffset);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $this->payload;
|
return $this->payload;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -34,7 +27,7 @@ final class UntaggedResponse implements ResponseInterface
|
|||||||
*/
|
*/
|
||||||
public function payloadTokens(): array
|
public function payloadTokens(): array
|
||||||
{
|
{
|
||||||
$payload = trim($this->payload());
|
$payload = trim($this->payload);
|
||||||
|
|
||||||
if ($payload === '') {
|
if ($payload === '') {
|
||||||
return [];
|
return [];
|
||||||
@@ -47,4 +40,4 @@ final class UntaggedResponse implements ResponseInterface
|
|||||||
{
|
{
|
||||||
return $this->raw;
|
return $this->raw;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -13,7 +13,7 @@ use KTXM\ProviderImap\Providers\Provider;
|
|||||||
use KTXM\ProviderImap\Providers\Service;
|
use KTXM\ProviderImap\Providers\Service;
|
||||||
use KTXM\ProviderImap\Providers\ServiceIdentityBasic;
|
use KTXM\ProviderImap\Providers\ServiceIdentityBasic;
|
||||||
use KTXM\ProviderImap\Providers\ServiceLocation;
|
use KTXM\ProviderImap\Providers\ServiceLocation;
|
||||||
use KTXC\Context\TenantContext;
|
use KTXC\SessionTenant;
|
||||||
use Symfony\Component\Console\Attribute\AsCommand;
|
use Symfony\Component\Console\Attribute\AsCommand;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Input\InputArgument;
|
use Symfony\Component\Console\Input\InputArgument;
|
||||||
@@ -41,7 +41,7 @@ class ConnectCommand extends Command
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly Provider $provider,
|
private readonly Provider $provider,
|
||||||
private readonly TenantContext $tenantContext,
|
private readonly SessionTenant $sessionTenant,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
@@ -186,7 +186,7 @@ class ConnectCommand extends Command
|
|||||||
|
|
||||||
// ── Persist ──────────────────────────────────────────────────────────
|
// ── Persist ──────────────────────────────────────────────────────────
|
||||||
|
|
||||||
$this->tenantContext->resolveIdentifier($tenantId);
|
$this->sessionTenant->configureById($tenantId);
|
||||||
|
|
||||||
$label = $io->ask('Service label', $username);
|
$label = $io->ask('Service label', $username);
|
||||||
if ($label) {
|
if ($label) {
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ namespace KTXM\ProviderImap\Console;
|
|||||||
|
|
||||||
use KTXM\ProviderImap\Providers\Provider;
|
use KTXM\ProviderImap\Providers\Provider;
|
||||||
use KTXM\ProviderImap\Providers\Service;
|
use KTXM\ProviderImap\Providers\Service;
|
||||||
use KTXC\Context\TenantContext;
|
use KTXC\SessionTenant;
|
||||||
use Symfony\Component\Console\Attribute\AsCommand;
|
use Symfony\Component\Console\Attribute\AsCommand;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Input\InputArgument;
|
use Symfony\Component\Console\Input\InputArgument;
|
||||||
@@ -37,7 +37,7 @@ class DisconnectCommand extends Command
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly Provider $provider,
|
private readonly Provider $provider,
|
||||||
private readonly TenantContext $tenantContext,
|
private readonly SessionTenant $sessionTenant,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
@@ -86,7 +86,7 @@ class DisconnectCommand extends Command
|
|||||||
$userId = (string) ($input->getOption('user') ?? '');
|
$userId = (string) ($input->getOption('user') ?? '');
|
||||||
|
|
||||||
if ($tenantId !== '' && $userId !== '') {
|
if ($tenantId !== '' && $userId !== '') {
|
||||||
$this->tenantContext->resolveIdentifier($tenantId);
|
$this->sessionTenant->configureById($tenantId);
|
||||||
$services = $this->provider->serviceList($tenantId, $userId);
|
$services = $this->provider->serviceList($tenantId, $userId);
|
||||||
|
|
||||||
if (empty($services)) {
|
if (empty($services)) {
|
||||||
@@ -130,7 +130,7 @@ class DisconnectCommand extends Command
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ── Fetch service for display ────────────────────────────────────────
|
// ── Fetch service for display ────────────────────────────────────────
|
||||||
$this->tenantContext->resolveIdentifier($tenantId);
|
$this->sessionTenant->configureById($tenantId);
|
||||||
$service = $this->provider->serviceFetch($tenantId, $userId, $serviceId);
|
$service = $this->provider->serviceFetch($tenantId, $userId, $serviceId);
|
||||||
|
|
||||||
if ($service === null) {
|
if ($service === null) {
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ use KTXM\ProviderImap\Providers\Service;
|
|||||||
use KTXM\ProviderImap\Providers\ServiceIdentityBasic;
|
use KTXM\ProviderImap\Providers\ServiceIdentityBasic;
|
||||||
use KTXM\ProviderImap\Providers\ServiceLocation;
|
use KTXM\ProviderImap\Providers\ServiceLocation;
|
||||||
use KTXM\ProviderImap\Service\Discovery;
|
use KTXM\ProviderImap\Service\Discovery;
|
||||||
use KTXC\Context\TenantContext;
|
use KTXC\SessionTenant;
|
||||||
use Symfony\Component\Console\Attribute\AsCommand;
|
use Symfony\Component\Console\Attribute\AsCommand;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Input\InputArgument;
|
use Symfony\Component\Console\Input\InputArgument;
|
||||||
@@ -43,7 +43,7 @@ class DiscoverCommand extends Command
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly Provider $provider,
|
private readonly Provider $provider,
|
||||||
private readonly Discovery $discovery,
|
private readonly Discovery $discovery,
|
||||||
private readonly TenantContext $tenantContext,
|
private readonly SessionTenant $sessionTenant,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
@@ -210,7 +210,7 @@ class DiscoverCommand extends Command
|
|||||||
|
|
||||||
// ── Persist ──────────────────────────────────────────────────────────
|
// ── Persist ──────────────────────────────────────────────────────────
|
||||||
|
|
||||||
$this->tenantContext->resolveIdentifier($tenantId);
|
$this->sessionTenant->configureById($tenantId);
|
||||||
|
|
||||||
$label = $io->ask('Service label', $address);
|
$label = $io->ask('Service label', $address);
|
||||||
if ($label) {
|
if ($label) {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace KTXM\ProviderImap\Console;
|
namespace KTXM\ProviderImap\Console;
|
||||||
|
|
||||||
use KTXC\Context\TenantContext;
|
use KTXC\SessionTenant;
|
||||||
use KTXM\ProviderImap\Client\Command\SelectCommand;
|
use KTXM\ProviderImap\Client\Command\SelectCommand;
|
||||||
use KTXM\ProviderImap\Client\FetchOptions;
|
use KTXM\ProviderImap\Client\FetchOptions;
|
||||||
use KTXM\ProviderImap\Client\FetchTarget;
|
use KTXM\ProviderImap\Client\FetchTarget;
|
||||||
@@ -41,7 +41,7 @@ class TestCommand extends Command
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly Provider $provider,
|
private readonly Provider $provider,
|
||||||
private readonly TenantContext $tenantContext,
|
private readonly SessionTenant $sessionTenant,
|
||||||
) {
|
) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
}
|
}
|
||||||
@@ -108,7 +108,7 @@ class TestCommand extends Command
|
|||||||
return Command::FAILURE;
|
return Command::FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->tenantContext->resolveIdentifier($tenantId);
|
$this->sessionTenant->configureById($tenantId);
|
||||||
$service = $this->provider->serviceFetch($tenantId, $userId, $serviceId);
|
$service = $this->provider->serviceFetch($tenantId, $userId, $serviceId);
|
||||||
|
|
||||||
if ($service === null) {
|
if ($service === null) {
|
||||||
@@ -269,7 +269,7 @@ class TestCommand extends Command
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->tenantContext->resolveIdentifier($tenantId);
|
$this->sessionTenant->configureById($tenantId);
|
||||||
$services = $this->provider->serviceList($tenantId, $userId);
|
$services = $this->provider->serviceList($tenantId, $userId);
|
||||||
|
|
||||||
if ($services === []) {
|
if ($services === []) {
|
||||||
|
|||||||
@@ -200,9 +200,8 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
|
|||||||
if (isset($data[self::PROPERTY_IDENTITY])) {
|
if (isset($data[self::PROPERTY_IDENTITY])) {
|
||||||
$this->setIdentity($this->freshIdentity(null, $data[self::PROPERTY_IDENTITY]));
|
$this->setIdentity($this->freshIdentity(null, $data[self::PROPERTY_IDENTITY]));
|
||||||
}
|
}
|
||||||
if (isset($data[self::PROPERTY_PRIMARY_ADDRESS])) {
|
if (isset($data[self::PROPERTY_PRIMARY_ADDRESS]) && is_string($data[self::PROPERTY_PRIMARY_ADDRESS])) {
|
||||||
$value = $data[self::PROPERTY_PRIMARY_ADDRESS];
|
$this->setPrimaryAddress(new Address($data[self::PROPERTY_PRIMARY_ADDRESS]));
|
||||||
$this->setPrimaryAddress(is_array($value) ? Address::fromArray($value) : new Address((string)$value));
|
|
||||||
}
|
}
|
||||||
if (isset($data[self::PROPERTY_SECONDARY_ADDRESSES]) && is_array($data[self::PROPERTY_SECONDARY_ADDRESSES])) {
|
if (isset($data[self::PROPERTY_SECONDARY_ADDRESSES]) && is_array($data[self::PROPERTY_SECONDARY_ADDRESSES])) {
|
||||||
$this->setSecondaryAddresses(array_map(
|
$this->setSecondaryAddresses(array_map(
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ namespace KTXM\ProviderImap\Service\Remote;
|
|||||||
|
|
||||||
use DateTimeImmutable;
|
use DateTimeImmutable;
|
||||||
use Generator;
|
use Generator;
|
||||||
|
use KTXC\Server;
|
||||||
use KTXC\Logger\PlainFileLogger;
|
use KTXC\Logger\PlainFileLogger;
|
||||||
use KTXM\ProviderImap\Client\Client as ImapClient;
|
use KTXM\ProviderImap\Client\Client as ImapClient;
|
||||||
use KTXM\ProviderImap\Client\Command\AppendCommand;
|
use KTXM\ProviderImap\Client\Command\AppendCommand;
|
||||||
@@ -131,7 +132,7 @@ class RemoteMailService
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$logDir = dirname(__DIR__, 5) . '/var/log';
|
$logDir = Server::getInstance()?->logDir() ?? __DIR__ . '/../../../../../var/log';
|
||||||
|
|
||||||
return new PlainFileLogger($logDir . '/' . $channel, $this->service->identifier());
|
return new PlainFileLogger($logDir . '/' . $channel, $this->service->identifier());
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+360
-1718
File diff suppressed because it is too large
Load Diff
+3
-11
@@ -11,11 +11,7 @@
|
|||||||
"dev": "vite build --mode development --config vite.config.ts",
|
"dev": "vite build --mode development --config vite.config.ts",
|
||||||
"watch": "vite build --mode development --watch --config vite.config.ts",
|
"watch": "vite build --mode development --watch --config vite.config.ts",
|
||||||
"typecheck": "vue-tsc --noEmit",
|
"typecheck": "vue-tsc --noEmit",
|
||||||
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
|
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
|
||||||
"test": "vitest run --config tests/js/vitest.config.ts",
|
|
||||||
"test:unit": "vitest run --config tests/js/vitest.config.ts",
|
|
||||||
"test:watch": "vitest watch --config tests/js/vitest.config.ts",
|
|
||||||
"test:coverage": "vitest run --coverage --config tests/js/vitest.config.ts"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"pinia": "^3.0.0",
|
"pinia": "^3.0.0",
|
||||||
@@ -28,10 +24,6 @@
|
|||||||
"@vue/tsconfig": "^0.9.0",
|
"@vue/tsconfig": "^0.9.0",
|
||||||
"typescript": "~6.0.0",
|
"typescript": "~6.0.0",
|
||||||
"vite": "^8.0.0",
|
"vite": "^8.0.0",
|
||||||
"vue-tsc": "^3.0.5",
|
"vue-tsc": "^3.0.5"
|
||||||
"@vitest/coverage-v8": "^4.1.6",
|
|
||||||
"@vue/test-utils": "^2.4.10",
|
|
||||||
"jsdom": "^29.1.1",
|
|
||||||
"vitest": "^4.1.6"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -115,7 +115,7 @@ function sameIdentity(a: ServiceIdentity | null, b: ServiceIdentity | null): boo
|
|||||||
variant="outlined"
|
variant="outlined"
|
||||||
prepend-inner-icon="mdi-account"
|
prepend-inner-icon="mdi-account"
|
||||||
class="mb-4"
|
class="mb-4"
|
||||||
autocomplete="off"
|
autocomplete="username"
|
||||||
autocorrect="off"
|
autocorrect="off"
|
||||||
autocapitalize="none"
|
autocapitalize="none"
|
||||||
:rules="[rules.required]"
|
:rules="[rules.required]"
|
||||||
@@ -130,7 +130,7 @@ function sameIdentity(a: ServiceIdentity | null, b: ServiceIdentity | null): boo
|
|||||||
variant="outlined"
|
variant="outlined"
|
||||||
prepend-inner-icon="mdi-lock"
|
prepend-inner-icon="mdi-lock"
|
||||||
class="mb-4"
|
class="mb-4"
|
||||||
autocomplete="new-password"
|
autocomplete="current-password"
|
||||||
:rules="[rules.required]"
|
:rules="[rules.required]"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,30 +0,0 @@
|
|||||||
import { describe, it, expect } from 'vitest'
|
|
||||||
|
|
||||||
describe('Basic Tests', () => {
|
|
||||||
it('should perform basic assertion', () => {
|
|
||||||
expect(true).toBe(true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('should test array operations', () => {
|
|
||||||
const array = ['foo', 'bar', 'baz']
|
|
||||||
|
|
||||||
expect(array).toHaveLength(3)
|
|
||||||
expect(array).toContain('bar')
|
|
||||||
expect(array[0]).toBe('foo')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('should test string operations', () => {
|
|
||||||
const string = 'Hello, World!'
|
|
||||||
|
|
||||||
expect(string).toContain('World')
|
|
||||||
expect(string.length).toBe(13)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('should test object operations', () => {
|
|
||||||
const obj = { foo: 'bar', count: 42 }
|
|
||||||
|
|
||||||
expect(obj).toHaveProperty('foo')
|
|
||||||
expect(obj.foo).toBe('bar')
|
|
||||||
expect(obj.count).toBeGreaterThan(40)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
import { fileURLToPath } from 'node:url'
|
|
||||||
import { defineConfig, configDefaults } from 'vitest/config'
|
|
||||||
import vue from '@vitejs/plugin-vue'
|
|
||||||
import path from 'path'
|
|
||||||
|
|
||||||
const __filename = fileURLToPath(import.meta.url)
|
|
||||||
const __dirname = path.dirname(__filename)
|
|
||||||
|
|
||||||
export default defineConfig({
|
|
||||||
plugins: [vue()],
|
|
||||||
resolve: {
|
|
||||||
alias: {
|
|
||||||
'@': path.resolve(__dirname, '../../src'),
|
|
||||||
'@KTXC': path.resolve(__dirname, '../../../../core/src'),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
test: {
|
|
||||||
environment: 'jsdom',
|
|
||||||
exclude: [...configDefaults.exclude, 'e2e/**'],
|
|
||||||
root: fileURLToPath(new URL('../../', import.meta.url)),
|
|
||||||
coverage: {
|
|
||||||
provider: 'v8',
|
|
||||||
reporter: ['text', 'json', 'html'],
|
|
||||||
exclude: [
|
|
||||||
'node_modules/',
|
|
||||||
'tests/',
|
|
||||||
'**/*.d.ts',
|
|
||||||
'**/*.config.*',
|
|
||||||
'**/dist/**',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace KTXT\ProviderImap\Tests\Integration;
|
|
||||||
|
|
||||||
use PHPUnit\Framework\TestCase;
|
|
||||||
|
|
||||||
class BaseTest extends TestCase
|
|
||||||
{
|
|
||||||
public function testBasicAssertion(): void
|
|
||||||
{
|
|
||||||
$this->assertTrue(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testArrayOperations(): void
|
|
||||||
{
|
|
||||||
$array = ['foo' => 'bar'];
|
|
||||||
|
|
||||||
$this->assertArrayHasKey('foo', $array);
|
|
||||||
$this->assertEquals('bar', $array['foo']);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testStringOperations(): void
|
|
||||||
{
|
|
||||||
$string = 'Hello, World!';
|
|
||||||
|
|
||||||
$this->assertStringContainsString('World', $string);
|
|
||||||
$this->assertEquals(13, strlen($string));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace KTXT\ProviderImap\Tests\Unit;
|
|
||||||
|
|
||||||
use PHPUnit\Framework\TestCase;
|
|
||||||
|
|
||||||
class BaseTest extends TestCase
|
|
||||||
{
|
|
||||||
public function testBasicAssertion(): void
|
|
||||||
{
|
|
||||||
$this->assertTrue(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testArrayOperations(): void
|
|
||||||
{
|
|
||||||
$array = ['foo' => 'bar'];
|
|
||||||
|
|
||||||
$this->assertArrayHasKey('foo', $array);
|
|
||||||
$this->assertEquals('bar', $array['foo']);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testStringOperations(): void
|
|
||||||
{
|
|
||||||
$string = 'Hello, World!';
|
|
||||||
|
|
||||||
$this->assertStringContainsString('World', $string);
|
|
||||||
$this->assertEquals(13, strlen($string));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
require dirname(__DIR__, 2).'/lib/vendor/autoload.php';
|
|
||||||
|
|
||||||
// When this module is checked out inside a full server (server/modules/<handle>,
|
|
||||||
// as it is in CI and in this monorepo checkout), also load the server's own
|
|
||||||
// core/shared autoloader so tests can reference framework (KTXC/KTXF) types.
|
|
||||||
// Standalone module checkouts without a server alongside them skip this.
|
|
||||||
define('SERVER_ROOT', dirname(__DIR__, 4));
|
|
||||||
$serverAutoload = SERVER_ROOT . '/vendor/autoload.php';
|
|
||||||
if (is_file($serverAutoload)) {
|
|
||||||
require $serverAutoload;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($_SERVER['APP_DEBUG']) && $_SERVER['APP_DEBUG']) {
|
|
||||||
umask(0000);
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
|
|
||||||
<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
|
|
||||||
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:noNamespaceSchemaLocation="../../lib/vendor/phpunit/phpunit/phpunit.xsd"
|
|
||||||
colors="true"
|
|
||||||
failOnDeprecation="true"
|
|
||||||
failOnNotice="true"
|
|
||||||
failOnWarning="true"
|
|
||||||
bootstrap="bootstrap.php"
|
|
||||||
cacheDirectory="../../.phpunit.cache"
|
|
||||||
>
|
|
||||||
<php>
|
|
||||||
<ini name="display_errors" value="1" />
|
|
||||||
<ini name="error_reporting" value="-1" />
|
|
||||||
<server name="APP_ENV" value="test" force="true" />
|
|
||||||
<server name="SHELL_VERBOSITY" value="-1" />
|
|
||||||
</php>
|
|
||||||
|
|
||||||
<testsuites>
|
|
||||||
<testsuite name="Unit Tests">
|
|
||||||
<directory>Unit</directory>
|
|
||||||
</testsuite>
|
|
||||||
<testsuite name="Integration Tests">
|
|
||||||
<directory>Integration</directory>
|
|
||||||
</testsuite>
|
|
||||||
</testsuites>
|
|
||||||
|
|
||||||
<source ignoreSuppressionOfDeprecations="true"
|
|
||||||
ignoreIndirectDeprecations="true"
|
|
||||||
restrictNotices="true"
|
|
||||||
restrictWarnings="true"
|
|
||||||
>
|
|
||||||
<include>
|
|
||||||
<directory>../../lib</directory>
|
|
||||||
</include>
|
|
||||||
</source>
|
|
||||||
|
|
||||||
<extensions>
|
|
||||||
</extensions>
|
|
||||||
</phpunit>
|
|
||||||
Reference in New Issue
Block a user