From 9aaff4d80a530fa767e19794a64be8649c4fdf62 Mon Sep 17 00:00:00 2001 From: sdarbinyan Date: Fri, 19 Jun 2026 16:13:54 +0400 Subject: [PATCH] removed parazite --- .../telegram-login.component.ts | 21 +------------------ src/app/interceptors/mock-data.interceptor.ts | 4 ++-- src/app/services/auth.service.ts | 9 -------- 3 files changed, 3 insertions(+), 31 deletions(-) diff --git a/src/app/components/telegram-login/telegram-login.component.ts b/src/app/components/telegram-login/telegram-login.component.ts index b206314..689e373 100644 --- a/src/app/components/telegram-login/telegram-login.component.ts +++ b/src/app/components/telegram-login/telegram-login.component.ts @@ -1,8 +1,6 @@ import { Component, ChangeDetectionStrategy, inject, signal, computed, effect, OnDestroy } from '@angular/core'; import { AuthService } from '../../services/auth.service'; -import { CartService } from '../../services/cart.service'; import { TranslatePipe } from '../../i18n/translate.pipe'; -import { getDiscountedPrice } from '../../utils/item.utils'; @Component({ selector: 'app-telegram-login', @@ -13,7 +11,6 @@ import { getDiscountedPrice } from '../../utils/item.utils'; }) export class TelegramLoginComponent implements OnDestroy { private authService = inject(AuthService); - private cartService = inject(CartService); showDialog = this.authService.showLoginDialog; status = this.authService.status; @@ -98,7 +95,7 @@ export class TelegramLoginComponent implements OnDestroy { next: (session) => { if (session?.active) { this.stopPolling(); - this.syncCartAndComplete(session.sessionId); + this.authService.onTelegramLoginComplete(); } }, error: () => { @@ -108,22 +105,6 @@ export class TelegramLoginComponent implements OnDestroy { }, this.pollIntervalMs); } - private syncCartAndComplete(sessionId: string): void { - const cartItems = this.cartService.items().map(item => ({ - itemID: item.itemID, - quantity: item.quantity, - colour: item.colour || '', - size: item.size || '', - price: item.discount > 0 - ? item.price * (1 - item.discount / 100) - : item.price, - })); - - this.authService.syncCart(sessionId, cartItems).subscribe(() => { - this.authService.onTelegramLoginComplete(); - }); - } - private stopPolling(): void { if (this.pollTimer) { clearInterval(this.pollTimer); diff --git a/src/app/interceptors/mock-data.interceptor.ts b/src/app/interceptors/mock-data.interceptor.ts index 4384364..45e329b 100644 --- a/src/app/interceptors/mock-data.interceptor.ts +++ b/src/app/interceptors/mock-data.interceptor.ts @@ -780,8 +780,8 @@ export const mockDataInterceptor: HttpInterceptorFn = (req, next) => { return respond([]); } - // ── POST /websession/:id (add to cart) - if (url.match(/\/websession\/[^/]+$/) && req.method === 'POST') { + // ── POST /usersession/:id or /websession/:id (sync cart) + if (url.match(/\/(?:user|web)session\/[^/]+$/) && req.method === 'POST') { return respond({ sessionId: 'mock-session', Status: true, diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index e1d7830..b6dcef8 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -26,7 +26,6 @@ export class AuthService { /** Display name of authenticated user */ readonly displayName = computed(() => this.sessionSignal()?.displayName ?? null); - private readonly apiUrl = environment.apiUrl; private readonly authApiUrl = environment.authApiUrl; private sessionCheckTimer?: ReturnType; @@ -113,14 +112,6 @@ export class AuthService { ); } - /** Sync local cart to the backend session after login */ - syncCart(sessionId: string, items: Array<{ itemID: number; quantity: number; colour?: string; size?: string; price?: number }>): Observable { - if (!items.length) return of(null); - return this.http.post(`${this.apiUrl}/websession/${sessionId}`, items, { - withCredentials: true, - }).pipe(catchError(() => of(null))); - } - /** Show login dialog (called when user tries to pay without being logged in) */ requestLogin(): void { this.showLoginSignal.set(true);