From d17cdd1270726323418100b3dc22d054037cafae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20K=C3=A4sler?= <tom.kaesler@mni.thm.de>
Date: Thu, 22 Nov 2018 12:26:28 +0100
Subject: [PATCH] update to rxjs 6
---
.../content-likert-creator.component.ts | 2 +-
.../content-yes-no-creator.component.ts | 2 +-
src/app/guards/authentication.guard.ts | 6 +++---
.../authentication.interceptor.ts | 10 ++++++----
.../services/http/authentication.service.ts | 20 +++++++++----------
src/app/services/http/base-http.service.ts | 3 +--
src/app/services/http/comment.service.ts | 2 +-
.../services/http/content-answer.service.ts | 2 +-
src/app/services/http/content.service.ts | 2 +-
src/app/services/http/room.service.ts | 2 +-
src/app/services/http/user.service.ts | 3 +--
11 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/app/components/creator/content-likert-creator/content-likert-creator.component.ts b/src/app/components/creator/content-likert-creator/content-likert-creator.component.ts
index 3988c3029..6b2ecf1c3 100644
--- a/src/app/components/creator/content-likert-creator/content-likert-creator.component.ts
+++ b/src/app/components/creator/content-likert-creator/content-likert-creator.component.ts
@@ -9,7 +9,7 @@ import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material';
import { ContentListComponent } from '../content-list/content-list.component';
import { ContentDeleteComponent } from '../_dialogs/content-delete/content-delete.component';
import { FormControl } from '@angular/forms';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
import { map, startWith } from 'rxjs/operators';
import { TranslateService } from '@ngx-translate/core';
diff --git a/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.ts b/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.ts
index 67040e304..cbf5bca7b 100644
--- a/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.ts
+++ b/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.ts
@@ -9,7 +9,7 @@ import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material';
import { ContentListComponent } from '../content-list/content-list.component';
import { ContentDeleteComponent } from '../_dialogs/content-delete/content-delete.component';
import { FormControl } from '@angular/forms';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
import { map, startWith } from 'rxjs/operators';
import { TranslateService } from '@ngx-translate/core';
diff --git a/src/app/guards/authentication.guard.ts b/src/app/guards/authentication.guard.ts
index 4a1f4551a..5f4e5e726 100644
--- a/src/app/guards/authentication.guard.ts
+++ b/src/app/guards/authentication.guard.ts
@@ -1,9 +1,9 @@
import { Injectable } from '@angular/core';
import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router } from '@angular/router';
import { AuthenticationService } from '../services/http/authentication.service';
-import 'rxjs/add/operator/map';
-import 'rxjs/add/observable/of';
-import 'rxjs/add/operator/catch';
+
+
+
import { NotificationService } from '../services/util/notification.service';
import { UserRole } from '../models/user-roles.enum';
import { User } from '../models/user';
diff --git a/src/app/interceptors/authentication.interceptor.ts b/src/app/interceptors/authentication.interceptor.ts
index ce376312c..4939c7f4e 100644
--- a/src/app/interceptors/authentication.interceptor.ts
+++ b/src/app/interceptors/authentication.interceptor.ts
@@ -1,10 +1,12 @@
+
+import {tap} from 'rxjs/operators';
import { Injectable } from '@angular/core';
import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse } from '@angular/common/http';
-import 'rxjs/add/operator/do';
+
import { AuthenticationService } from '../services/http/authentication.service';
import { NotificationService } from '../services/util/notification.service';
import { Router } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
const AUTH_HEADER_KEY = 'Arsnova-Auth-Token';
@@ -23,7 +25,7 @@ export class AuthenticationInterceptor implements HttpInterceptor {
headers: req.headers.set(AUTH_HEADER_KEY, token)
});
- return next.handle(cloned).do((event: HttpEvent<any>) => {
+ return next.handle(cloned).pipe(tap((event: HttpEvent<any>) => {
if (event instanceof HttpResponse) {
// Possible to do something with the response here
}
@@ -35,7 +37,7 @@ export class AuthenticationInterceptor implements HttpInterceptor {
this.router.navigate(['home']);
}
}
- });
+ }));
} else {
return next.handle(req);
}
diff --git a/src/app/services/http/authentication.service.ts b/src/app/services/http/authentication.service.ts
index 6fff4d385..d1ab0b5dc 100644
--- a/src/app/services/http/authentication.service.ts
+++ b/src/app/services/http/authentication.service.ts
@@ -1,12 +1,12 @@
+
+import {catchError, map} from 'rxjs/operators';
import { Injectable } from '@angular/core';
import { User } from '../../models/user';
-import { Observable } from 'rxjs/Observable';
-import { of } from 'rxjs/observable/of';
+import { Observable , of , BehaviorSubject } from 'rxjs';
import { UserRole } from '../../models/user-roles.enum';
import { DataStoreService } from '../util/data-store.service';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { ClientAuthentication } from '../../models/client-authentication';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
@Injectable()
export class AuthenticationService {
@@ -62,9 +62,9 @@ export class AuthenticationService {
return this.http.post<boolean>(connectionUrl, {
loginId: email,
password: password
- }, this.httpOptions).map(() => {
+ }, this.httpOptions).pipe(map(() => {
return true;
- });
+ }));
}
resetPassword(email: string): Observable<boolean> {
@@ -73,9 +73,9 @@ export class AuthenticationService {
return this.http.post(connectionUrl, {
key: null,
password: null
- }, this.httpOptions).map(() => {
+ }, this.httpOptions).pipe(map(() => {
return true;
- });
+ }));
}
logout() {
@@ -106,7 +106,7 @@ export class AuthenticationService {
}
private checkLogin(clientAuthentication: Observable<ClientAuthentication>, userRole: UserRole, isGuest: boolean): Observable<string> {
- return clientAuthentication.map(result => {
+ return clientAuthentication.pipe(map(result => {
if (result) {
this.setUser(new User(
result.userId,
@@ -119,13 +119,13 @@ export class AuthenticationService {
} else {
return 'false';
}
- }).catch((e) => {
+ }),catchError((e) => {
// check if user needs activation
if (e.error.errorType === 'DisabledException') {
return of('activation');
}
return of('false');
- });
+ }),);
}
get watchUser() {
diff --git a/src/app/services/http/base-http.service.ts b/src/app/services/http/base-http.service.ts
index 4947c0cca..e3eb04d1d 100644
--- a/src/app/services/http/base-http.service.ts
+++ b/src/app/services/http/base-http.service.ts
@@ -1,6 +1,5 @@
import { Injectable } from '@angular/core';
-import { of } from 'rxjs/observable/of';
-import { Observable } from 'rxjs/Observable';
+import { of , Observable } from 'rxjs';
@Injectable()
export class BaseHttpService {
diff --git a/src/app/services/http/comment.service.ts b/src/app/services/http/comment.service.ts
index 7d8b0e74a..8f404e05b 100644
--- a/src/app/services/http/comment.service.ts
+++ b/src/app/services/http/comment.service.ts
@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
import { Comment } from '../../models/comment';
import { catchError, tap } from 'rxjs/operators';
import { BaseHttpService } from './base-http.service';
diff --git a/src/app/services/http/content-answer.service.ts b/src/app/services/http/content-answer.service.ts
index a0d3a9aeb..b40af7cfc 100644
--- a/src/app/services/http/content-answer.service.ts
+++ b/src/app/services/http/content-answer.service.ts
@@ -1,7 +1,7 @@
import { Injectable } from '@angular/core';
import { AnswerText } from '../../models/answer-text';
import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
import { catchError, tap } from 'rxjs/operators';
import { BaseHttpService } from './base-http.service';
import { AnswerChoice } from '../../models/answer-choice';
diff --git a/src/app/services/http/content.service.ts b/src/app/services/http/content.service.ts
index bcc485fe6..ef45984af 100644
--- a/src/app/services/http/content.service.ts
+++ b/src/app/services/http/content.service.ts
@@ -1,7 +1,7 @@
import { Injectable } from '@angular/core';
import { Content } from '../../models/content';
import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
import { catchError, tap } from 'rxjs/operators';
import { BaseHttpService } from './base-http.service';
import { ContentChoice } from '../../models/content-choice';
diff --git a/src/app/services/http/room.service.ts b/src/app/services/http/room.service.ts
index 86cf0aebf..868f34ada 100644
--- a/src/app/services/http/room.service.ts
+++ b/src/app/services/http/room.service.ts
@@ -1,7 +1,7 @@
import { Injectable } from '@angular/core';
import { Room } from '../../models/room';
import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
import { catchError, tap, map } from 'rxjs/operators';
import { AuthenticationService } from './authentication.service';
import { BaseHttpService } from './base-http.service';
diff --git a/src/app/services/http/user.service.ts b/src/app/services/http/user.service.ts
index 6142c2fe8..ceb850b4b 100644
--- a/src/app/services/http/user.service.ts
+++ b/src/app/services/http/user.service.ts
@@ -1,7 +1,6 @@
import { Injectable } from '@angular/core';
import { User } from '../../models/user';
-import { Observable } from 'rxjs/Observable';
-import { of } from 'rxjs/observable/of';
+import { Observable , of } from 'rxjs';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { ClientAuthentication } from '../../models/client-authentication';
import { BaseHttpService } from './base-http.service';
--
GitLab