diff --git a/src/app/interceptors/token.interceptors.ts b/src/app/interceptors/token.interceptors.ts index 3097ebb91..7d000259e 100644 --- a/src/app/interceptors/token.interceptors.ts +++ b/src/app/interceptors/token.interceptors.ts @@ -23,7 +23,7 @@ export class TokenInterceptor implements HttpInterceptor { null ); - private excludedDomains = [ environment.apiChatUrl]; // Add the domains you want to exclude + private excludedDomains = [ 'Login', environment.apiChatUrl]; // Add the domains you want to exclude constructor(private http: HttpClient, private router: Router,private httpErrorHandle: HttpErrorHandle,) { } @@ -129,7 +129,7 @@ export class TokenInterceptor implements HttpInterceptor { if(pathBeforeGoOut != "/auth") { this.httpErrorHandle.httpsSucessMessagge('sessonExpired') } - + }) } return of(false); diff --git a/src/app/services/decorator/api-validate-schema.decorator.ts b/src/app/services/decorator/api-validate-schema.decorator.ts index 903b12c6a..f919677bf 100644 --- a/src/app/services/decorator/api-validate-schema.decorator.ts +++ b/src/app/services/decorator/api-validate-schema.decorator.ts @@ -44,7 +44,6 @@ export function APINODReturn(schema: z.ZodTypeAny, data , path: string, tracing? try { // Validate the result using the provided schema - console.log({schema, data}) schema.parse(data); } catch (error) { diff --git a/src/app/services/monitoring/opentelemetry/opentelemetry.ts b/src/app/services/monitoring/opentelemetry/opentelemetry.ts index 78ceb77bc..c764a3a2a 100644 --- a/src/app/services/monitoring/opentelemetry/opentelemetry.ts +++ b/src/app/services/monitoring/opentelemetry/opentelemetry.ts @@ -13,14 +13,13 @@ function createProvider(serviceName) { provider.addSpanProcessor(new SimpleSpanProcessor(new ConsoleSpanExporter())); provider.addSpanProcessor(new SimpleSpanProcessor(new ZipkinExporter({ - url: 'http://5.180.182.151:9411/api/v2/spans', + url: 'https://5-180-182-151.cloud-xip.com:85/zipkin-endpoint/api/v2/spans', serviceName: serviceName, - // Uncomment and customize the following if needed - // getExportRequestHeaders: () => { - // return { - // foo: 'bar', - // }; - // } + getExportRequestHeaders: () => { + return { + 'Authorization': 'Basic ' + btoa('tabteste@006:tabteste@006'), + }; + } }))); provider.register(); diff --git a/src/app/services/monitoring/opentelemetry/tracer.ts b/src/app/services/monitoring/opentelemetry/tracer.ts index ab8176062..9322de5df 100644 --- a/src/app/services/monitoring/opentelemetry/tracer.ts +++ b/src/app/services/monitoring/opentelemetry/tracer.ts @@ -95,19 +95,11 @@ export function XTracerAsync({ name, bugPrint, module = null, autoFinish = true try { const result = await originalMethod.apply(this, args); - if(!window.location.origin.includes('https')) { - if(autoFinish) { - tracing.finish() - } - } + tracing.finish() return result } catch (e) { - - if(!window.location.origin.includes('https')) { - if(autoFinish) { - tracing.finish() - } - } + tracing.setAttribute('catch', 'true') + tracing.finish() console.error(e); return false } @@ -135,15 +127,12 @@ export function XTracer({ name, bugPrint, module, autoFinish = true }) { try { const result = originalMethod.apply(this, args); - if(!window.location.origin.includes('https')) { - tracing.finish() - } + tracing.finish() return result } catch (e) { - if(!window.location.origin.includes('https')) { - tracing.finish() - } + tracing.setAttribute('catch', 'true') + tracing.finish() console.error(e); return false } diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index 3daccc65a..c6c1060cc 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -374,6 +374,8 @@ export class EditEventToApprovePage implements OnInit { /* await this.eventsService.postEventToApproveEdit(event).toPromise() */ this.agendaDataRepository.updateEvent(this.eventProcess.serialNumber, event, false).subscribe((value) => { console.log(value) + this.close() + }, ((error) => { console.log('edit event error: ', error) })); @@ -402,8 +404,6 @@ export class EditEventToApprovePage implements OnInit { })); } - this.close() - this.httpErrorHandler.httpsSucessMessagge('Editar evento'); } catch (e) { @@ -577,7 +577,7 @@ export class EditEventToApprovePage implements OnInit { this.loadedAttachments = result - // + // } deleteAttachment(attachment: Attachment, index) { diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 3538ae274..a868dc48b 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -328,6 +328,7 @@ export class EditEventToApproveComponent implements OnInit { console.log(value) this.httpErroHalde.httpsSucessMessagge('Editar evento') window['approve-event-getTask']() + this.close(); }, ((error) => { this.httpErroHalde.httpStatusHandle(error) console.log('edit event error: ', error) @@ -391,7 +392,6 @@ export class EditEventToApproveComponent implements OnInit { }) */ - this.close(); } async openAttendees() {