generated from Nodarx/template
Compare commits
1 Commits
main
..
879abb087a
| Author | SHA1 | Date | |
|---|---|---|---|
| 879abb087a |
@@ -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
|
|
||||||
@@ -10,7 +10,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
services:
|
services:
|
||||||
mongo:
|
mongo:
|
||||||
image: mongo:8
|
image: mongo:7
|
||||||
options: >-
|
options: >-
|
||||||
--health-cmd "mongosh --quiet --eval \"db.adminCommand('ping')\""
|
--health-cmd "mongosh --quiet --eval \"db.adminCommand('ping')\""
|
||||||
--health-interval 5s
|
--health-interval 5s
|
||||||
|
|||||||
+1
-1
@@ -25,7 +25,7 @@
|
|||||||
"egulias/email-validator": "^4.0"
|
"egulias/email-validator": "^4.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^12.0"
|
"phpunit/phpunit": "^13.0"
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
|
|||||||
@@ -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
+234
-1605
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/**',
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
Reference in New Issue
Block a user