Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 1 addition & 65 deletions apps/demo-wallet/e2e/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,51 +10,11 @@ import { createComponentLogger } from '../src/utils/logger';

const log = createComponentLogger('Allure');

interface TokenResponse {
access_token: string;
token_type: string;
expires_in: number;
scope: string;
}

interface AllureConfig {
baseUrl: string;
apiToken: string;
projectId: number;
}

/**
* Получает JWT токен для Allure TestOps API
* @param config - Конфигурация Allure TestOps
* @returns Promise с JWT токеном
*/
export async function getAllureToken(config: AllureConfig): Promise<string> {
const { baseUrl, apiToken } = config;

const formData = new FormData();
formData.append('grant_type', 'apitoken');
formData.append('scope', 'openid');
formData.append('token', apiToken);

try {
const response = await fetch(`${baseUrl}/api/uaa/oauth/token`, {
method: 'POST',
headers: {
Accept: 'application/json',
},
body: formData,
});

if (!response.ok) {
throw new Error(`Failed to get token: ${response.status} ${response.statusText}`);
}

const tokenData: TokenResponse = await response.json();
return tokenData.access_token;
} catch (error) {
throw new Error(`Error getting Allure token: ${error instanceof Error ? error.message : 'Unknown error'}`);
}
}
export type TestCaseData = {
precondition: string;
expectedResult: string;
Expand All @@ -66,16 +26,10 @@ export type TestCaseData = {
* @returns Конфигурация Allure TestOps
*/
export function createAllureConfig(): AllureConfig {
const baseUrl = process.env.ALLURE_BASE_URL || 'https://tontech.testops.cloud';
const apiToken = process.env.ALLURE_API_TOKEN;
const baseUrl = process.env.ALLURE_BASE_URL || 'https://ton-connect-test-runner.tapps.ninja/api/v1/allure-proxy';
const projectId = parseInt(process.env.ALLURE_PROJECT_ID || '100');
if (!apiToken) {
throw new Error('ALLURE_API_TOKEN environment variable is required');
}

return {
baseUrl,
apiToken,
projectId,
};
}
Expand All @@ -92,31 +46,13 @@ export class AllureApiClient {
this.config = config;
}

/**
* Получает актуальный токен (с кэшированием)
*/
private async getValidToken(): Promise<string> {
const now = Date.now();

if (!this.token || !this.tokenExpiry || now >= this.tokenExpiry) {
this.token = await getAllureToken(this.config);
// Токен действует 1 час, обновляем за 5 минут до истечения
this.tokenExpiry = now + 55 * 60 * 1000;
}

return this.token;
}

/**
* Выполняет авторизованный запрос к Allure API
*/
private async makeRequest(endpoint: string, options: { headers?: Record<string, string> } = {}): Promise<Response> {
const token = await this.getValidToken();

const response = await fetch(`${this.config.baseUrl}${endpoint}`, {
...options,
headers: {
Authorization: `Bearer ${token}`,
'Content-Type': 'application/json',
Accept: 'application/json',
...options.headers,
Expand Down