Migrate to latest Play version - addresses #92

Fixes UI tests.
resamsel · Nov 9, 2020 · 06a3bde · 06a3bde
1 parent d89c687
commit 06a3bde
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ui/apps/translatr-e2e/src/integration/project/settings/project-settings-update.spec.ts b/ui/apps/translatr-e2e/src/integration/project/settings/project-settings-update.spec.ts
@@ -16,8 +16,8 @@ describe('Project Settings Update', () => {
     cy.route('/api/project/*/keys*', 'fixture:johndoe/p1/keys');
     cy.route('/api/project/*/messages*', 'fixture:johndoe/p1/messages');
     cy.route('/api/project/*/members*', 'fixture:johndoe/p1/members');
-    cy.route('/api/project/*/activities*', 'fixture:johndoe/p1/activities');
     cy.route('/api/activities/aggregated*', 'fixture:johndoe/p1/activities-aggregated');
+    cy.route('/api/activities*', 'fixture:johndoe/p1/activities');
   });
 
   it('should persist on save', () => {

diff --git a/ui/apps/translatr/src/app/interceptors/auth.interceptor.ts b/ui/apps/translatr/src/app/interceptors/auth.interceptor.ts
@@ -8,8 +8,8 @@ import {
 import { Inject, Injectable } from '@angular/core';
 import { NavigationCancel, Router } from '@angular/router';
 import { LOGIN_URL } from '@translatr/utils';
-import { Observable, of } from 'rxjs';
-import { catchError, filter, shareReplay } from 'rxjs/operators';
+import { Observable, throwError } from 'rxjs';
+import { catchError, filter, shareReplay, take } from 'rxjs/operators';
 
 const HTTP_STATUS_BAD_REQUEST = 400;
 const HTTP_STATUS_UNAUTHORIZED = 401;
@@ -74,7 +74,7 @@ export class AuthInterceptor implements HttpInterceptor {
 
           case HTTP_STATUS_UNAUTHORIZED:
             // Unauthorized, redirecting to login page
-            this.navigationCancelled$.subscribe(event =>
+            this.navigationCancelled$.pipe(take(1)).subscribe(event =>
               this.router.navigate([this.loginUrl], {
                 queryParamsHandling: 'merge',
                 queryParams: { redirect_uri: `/ui${event.url}` }
@@ -107,7 +107,7 @@ export class AuthInterceptor implements HttpInterceptor {
             break;
         }
 
-        return of(err as any);
+        return throwError(err as any);
       })
     );
   }