add redirect message

src/app/app-routing.module.ts

@@ -292,6 +292,10 @@ const routes = [
   },
   {
     path: 'popup-question',
+    loadChildren: () => import('./modals/popup-question/popup-question.module').then( m => m.PopupQuestionPageModule)
+  },
+  {
+    path: 'not-found',
     loadChildren: () => import('./pages/not-found/not-found.module').then( m => m.NotFoundPageModule)
   }
 

src/app/datasource/middleware/remote/middleware-remote-datasourcec.service.spec.ts

@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { MiddlewareRemoteDatasourcecService } from './middleware-remote-datasourcec.service';
-
-describe('MiddlewareRemoteDatasourcecService', () => {
-  let service: MiddlewareRemoteDatasourcecService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(MiddlewareRemoteDatasourcecService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});

src/app/datasource/middleware/remote/middleware-remote-datasourcec.service.ts

@@ -1,17 +0,0 @@
-import { Injectable } from '@angular/core';
-import { SessionStore } from "src/app/store/session.service"
-import { MiddlewareServiceService } from "src/app/shared/API/middleware/middleware-service.service"
-@Injectable({
-  providedIn: 'root'
-})
-export class MiddlewareRemoteDatasourcecService {
-
-  constructor(
-    private MiddlewareServiceService: MiddlewareServiceService,
-  ) {}
-
-  refreshToken() {
-    const refreshToken = SessionStore.user.Authorization
-    return this.MiddlewareServiceService.refreshToken(refreshToken)
-  }
-}

src/app/home/home-routing.module.ts

@@ -414,7 +414,10 @@ const routes: Routes = [
 
   },
 
-  { path: '**', redirectTo: '/', pathMatch: 'full' },
+  {
+    path: '**',
+    loadChildren: ()=> import('../pages/not-found/not-found.module').then(m => m.NotFoundPageModule),
+  },
 ];
 
 @NgModule({

src/app/pages/events/events.page.ts

@@ -92,7 +92,7 @@ export class EventsPage implements OnInit {
     private changeProfileService: ChangeProfileService,
     public TaskService: TaskService
   ) {
-    
+
     window['zipPhoneCallback'] = function (zipphone) {
       var frame = document.getElementById('home-iframe');
       if(frame) {
@@ -113,7 +113,7 @@ export class EventsPage implements OnInit {
   }
 
   ngAfterViewInit(): void {
-    
+
 
     this.loadAllTask();
 
@@ -123,9 +123,9 @@ export class EventsPage implements OnInit {
         this.dynamicSearch()
       }
     })
-    
+
     this.dynamicSearch()
-    
+
   }
 
   ngOnDestroy() {
@@ -161,20 +161,20 @@ export class EventsPage implements OnInit {
 
     const ordinance = this.ordinance
     if(this.showSearch && this.searchSubject) {
-      
+
       const AllProcess = this.TaskService.AllProcess.filter((task) => {
         let subject = task.Folio || task.Subject || task.workflowInstanceDataFields.Subject
         subject = subject.toLowerCase();
         return subject.includes(this.searchSubject.toLowerCase())
       }).filter( task => this.TaskService.filter(task, this.filterName))
 
-      
+
       if(ordinance == this.ordinance) {
-        this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess) 
+        this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess)
       }
     } else {
       const AllProcess = this.TaskService.AllProcess
-      
+
       if(ordinance == this.ordinance) {
         this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess)
         .filter( task => this.TaskService.filter(task, this.filterName))
@@ -205,7 +205,7 @@ export class EventsPage implements OnInit {
       } catch(error) {}
       }, 2000);
     }
-    
+
     this.RefreshEvents();
     this.LoadList();
     this.loadAllTask();
@@ -218,7 +218,7 @@ export class EventsPage implements OnInit {
 
 
   async RefreshEvents() {
-    
+
     this.currentEvent = "";
     this.showLoader = true;
     this.showAgendaLoader = true;
@@ -256,7 +256,7 @@ export class EventsPage implements OnInit {
     let dateToday = date.getFullYear() + "-" + month + "-" + date.getDate();
 
     this.storage.get('events').then((events: any[] = []) => {
-      // 
+      //
 
       if(Array.isArray(events)) {
         this.listToPresent = events
@@ -271,7 +271,7 @@ export class EventsPage implements OnInit {
         } catch (error) {}
 
       }
-      // 
+      //
     })
 
 
@@ -299,19 +299,19 @@ export class EventsPage implements OnInit {
 
   changeProfile() {
     if (this.profile == "mdgpr") {
-      // 
+      //
       this.profile = "pr";
       this.RefreshEvents();
     }
     else {
-      // 
+      //
       this.profile = "mdgpr";
       this.RefreshEvents();
     }
   }
 
   async openEventDetail1(id: any) {
-    // 
+    //
 
     const modal = await this.modalController.create({
       component: EventDetailPage,
@@ -328,7 +328,7 @@ export class EventsPage implements OnInit {
   }
 
   async openEventDetail(id: any) {
-    // 
+    //
 
     const modal = await this.modalController.create({
       component: ViewEventPage,
@@ -338,7 +338,7 @@ export class EventsPage implements OnInit {
       cssClass: 'view-event',
       backdropDismiss: false
     });
-    
+
     modal.onDidDismiss();
     await modal.present();
 
@@ -358,7 +358,7 @@ export class EventsPage implements OnInit {
       window['all-process-gabinete']()
     }
 
-    
+
   }
 
   sortArrayISODate(myArray: any) {
@@ -375,9 +375,9 @@ export class EventsPage implements OnInit {
   }
 
   goToAllTaskFilter(event: any) {
-    let navigationExtras: NavigationExtras = { queryParams: { 
+    let navigationExtras: NavigationExtras = { queryParams: {
       filter: event,
-      processes: true 
+      processes: true
     } }
 
 
@@ -407,4 +407,4 @@ export class EventsPage implements OnInit {
     }
   }
 
-}
+}

src/app/pages/not-found/not-found-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { NotFoundPage } from './not-found.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: NotFoundPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class NotFoundPageRoutingModule {}

src/app/pages/not-found/not-found.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { NotFoundPageRoutingModule } from './not-found-routing.module';
+
+import { NotFoundPage } from './not-found.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    NotFoundPageRoutingModule
+  ],
+  declarations: [NotFoundPage]
+})
+export class NotFoundPageModule {}

src/app/pages/not-found/not-found.page.html

@@ -0,0 +1 @@
+

src/app/pages/not-found/not-found.page.spec.ts

@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { NotFoundPage } from './not-found.page';
+
+describe('NotFoundPage', () => {
+  let component: NotFoundPage;
+  let fixture: ComponentFixture<NotFoundPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ NotFoundPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(NotFoundPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/pages/not-found/not-found.page.ts

@@ -0,0 +1,22 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import { ToastService } from 'src/app/services/toast.service';
+
+@Component({
+  selector: 'app-not-found',
+  templateUrl: './not-found.page.html',
+  styleUrls: ['./not-found.page.scss'],
+})
+export class NotFoundPage implements OnInit {
+
+  constructor(
+    private router: Router,
+    private toastService: ToastService,
+  ) { }
+
+  ngOnInit() {
+    this.router.navigate(['/home/events']);
+    this.toastService._badRequest("Página não encontrada")
+  }
+
+}

src/app/repository/middleWare/middleware-repository.service.spec.ts

@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { MiddlewareRepositoryService } from './middleware-repository.service';
-
-describe('MiddlewareRepositoryService', () => {
-  let service: MiddlewareRepositoryService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(MiddlewareRepositoryService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});

src/app/repository/middleWare/middleware-repository.service.ts

@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { MiddlewareRemoteDatasourcecService } from "src/app/datasource/middleware/remote/middleware-remote-datasourcec.service";
-@Injectable({
-  providedIn: 'root'
-})
-export class MiddlewareRepositoryService {
-
-  constructor(
-    private MiddlewareRemoteDatasourcecService: MiddlewareRemoteDatasourcecService,
-  ) {}
-
-  refreshToken() {
-    return this.MiddlewareRemoteDatasourcecService.refreshToken()
-  }
-
-}

src/app/services/interceptor/token-interceptor.service.spec.ts

@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { TokenInterceptorService } from './token-interceptor.service';
-
-describe('TokenInterceptorService', () => {
-  let service: TokenInterceptorService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(TokenInterceptorService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});

src/app/services/interceptor/token-interceptor.service.ts

@@ -1,81 +0,0 @@
-import { Injectable } from "@angular/core";
-import {
-  HttpRequest,
-  HttpHandler,
-  HttpEvent,
-  HttpInterceptor,
-  HttpErrorResponse,
-  HTTP_INTERCEPTORS,
-} from "@angular/common/http";
-import { Observable, throwError, BehaviorSubject } from "rxjs";
-import { catchError, filter, take, switchMap } from "rxjs/operators";
-import { SessionStore } from "src/app/store/session.service";
-import { MiddlewareRepositoryService } from "src/app/repository/middleWare/middleware-repository.service"
-
-@Injectable({
-  providedIn: 'root'
-})
-export class TokenInterceptorService {
-
-  private isRefreshing = false;
-  private refreshTokenSubject: BehaviorSubject<any> = new BehaviorSubject<any>(
-    null
-  );
-
-
-  constructor(private middlewareRepositoryService: MiddlewareRepositoryService) {
-    this.middlewareRepositoryService = middlewareRepositoryService
-  }
-
-  intercept(
-    request: HttpRequest<any>,
-    next: HttpHandler
-  ): Observable<HttpEvent<any>> {
-    if (SessionStore.user.Authorization) {
-      request = this.addToken(request, SessionStore.user.Authorization);
-    }
-
-    return next.handle(request).pipe(
-      catchError((error) => {
-        if (error instanceof HttpErrorResponse && error.status === 401) {
-          return this.handle401Error(request, next);
-        } else {
-          return throwError(error);
-        }
-      })
-    ) as any
-  }
-
-  private addToken(request: HttpRequest<any>, token: string) {
-    return request.clone({
-      setHeaders: {
-        Authorization: `Bearer ${token}`,
-      },
-    });
-  }
-
-  private handle401Error(request: HttpRequest<any>, next: HttpHandler) {
-    if (!this.isRefreshing) {
-      this.isRefreshing = true;
-      this.refreshTokenSubject.next(null);
-
-
-
-      return this.middlewareRepositoryService.refreshToken().pipe(
-        switchMap((token: any) => {
-          this.isRefreshing = false;
-          this.refreshTokenSubject.next(token['result'].accessToken);
-          return next.handle(this.addToken(request, token['result'].accessToken));
-        })
-      );
-    } else {
-      return this.refreshTokenSubject.pipe(
-        filter((token) => token != null),
-        take(1),
-        switchMap((jwt) => {
-          return next.handle(this.addToken(request, jwt));
-        })
-      );
-    }
-  }
-}

web.config

@@ -27,7 +27,7 @@
         <!-- same origin only -->
         <add name="Cross-Origin-Embedder-Policy" value="require-corp" />
         <!-- same origin only -->
-        <add name="Cross-Origin-Opener-Policy" value="same-origin" />
+        <!-- <add name="Cross-Origin-Opener-Policy" value="same-origin" /> -->
       </customHeaders>
     </httpProtocol>