Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
arsnova-lite
Manage
Activity
Members
Labels
Plan
Issues
24
Issue boards
Milestones
Wiki
Code
Merge requests
2
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Privacy
Imprint
Contact
Snippets
Groups
Projects
Show more breadcrumbs
ARSnova
arsnova-lite
Commits
b8e249ba
Commit
b8e249ba
authored
6 years ago
by
Lukas Mauß
Browse files
Options
Downloads
Patches
Plain Diff
Fix login if user already logged in as creator
parent
9676c529
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!145
Resolve "Several Fixes"
Pipeline
#23937
passed with stages
Stage:
Stage:
in 3 minutes and 43 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/app/components/shared/room-join/room-join.component.ts
+13
-6
13 additions, 6 deletions
src/app/components/shared/room-join/room-join.component.ts
with
13 additions
and
6 deletions
src/app/components/shared/room-join/room-join.component.ts
+
13
−
6
View file @
b8e249ba
...
@@ -63,13 +63,12 @@ export class RoomJoinComponent implements OnInit {
...
@@ -63,13 +63,12 @@ export class RoomJoinComponent implements OnInit {
});
});
}
else
{
}
else
{
if
(
!
this
.
user
)
{
if
(
!
this
.
user
)
{
this
.
authenticationService
.
guestLogin
(
UserRole
.
PARTICIPANT
).
subscribe
(
loggedIn
=>
{
this
.
guestLogin
();
if
(
loggedIn
===
'
true
'
)
{
this
.
addAndNavigate
();
}
});
}
else
{
}
else
{
this
.
addAndNavigate
();
if
(
this
.
user
.
role
===
UserRole
.
CREATOR
)
{
this
.
authenticationService
.
logout
();
this
.
guestLogin
();
}
}
}
}
}
});
});
...
@@ -82,6 +81,14 @@ export class RoomJoinComponent implements OnInit {
...
@@ -82,6 +81,14 @@ export class RoomJoinComponent implements OnInit {
}
}
}
}
guestLogin
()
{
this
.
authenticationService
.
guestLogin
(
UserRole
.
PARTICIPANT
).
subscribe
(
loggedIn
=>
{
if
(
loggedIn
===
'
true
'
)
{
this
.
addAndNavigate
();
}
});
}
addAndNavigate
()
{
addAndNavigate
()
{
this
.
roomService
.
addToHistory
(
this
.
room
.
id
);
this
.
roomService
.
addToHistory
(
this
.
room
.
id
);
this
.
router
.
navigate
([
`/participant/room/
${
this
.
room
.
shortId
}
`
]);
this
.
router
.
navigate
([
`/participant/room/
${
this
.
room
.
shortId
}
`
]);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment