From b8e249ba8014686fb167fed80e79c5767b237f6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de>
Date: Thu, 7 Mar 2019 13:47:21 +0100
Subject: [PATCH] Fix login if user already logged in as creator
---
.../shared/room-join/room-join.component.ts | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/app/components/shared/room-join/room-join.component.ts b/src/app/components/shared/room-join/room-join.component.ts
index 4ccae2393..e0f897f38 100644
--- a/src/app/components/shared/room-join/room-join.component.ts
+++ b/src/app/components/shared/room-join/room-join.component.ts
@@ -63,13 +63,12 @@ export class RoomJoinComponent implements OnInit {
});
} else {
if (!this.user) {
- this.authenticationService.guestLogin(UserRole.PARTICIPANT).subscribe(loggedIn => {
- if (loggedIn === 'true') {
- this.addAndNavigate();
- }
- });
+ this.guestLogin();
} else {
- this.addAndNavigate();
+ if (this.user.role === UserRole.CREATOR) {
+ this.authenticationService.logout();
+ this.guestLogin();
+ }
}
}
});
@@ -82,6 +81,14 @@ export class RoomJoinComponent implements OnInit {
}
}
+ guestLogin() {
+ this.authenticationService.guestLogin(UserRole.PARTICIPANT).subscribe(loggedIn => {
+ if (loggedIn === 'true') {
+ this.addAndNavigate();
+ }
+ });
+ }
+
addAndNavigate() {
this.roomService.addToHistory(this.room.id);
this.router.navigate([`/participant/room/${this.room.shortId}`]);
--
GitLab