Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
hpc-team
strudelv2_spa
Commits
d176913a
Commit
d176913a
authored
Jul 25, 2019
by
Chris Hines
Browse files
still facing redirecti issue
parent
255d612f
Pipeline
#7545
passed with stages
in 2 minutes and 58 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
src/app/authorisation.service.ts
View file @
d176913a
...
...
@@ -225,9 +225,11 @@ public getKeys(id?: Identity) {
window
.
open
(
sshauthzservice
.
logout
);
}
let
path
=
sessionStorage
.
getItem
(
'
path
'
);
//skip1 because loggedInAuthZ is a behaviour subject and we don't want the current value but the value
//after updateAgentcontents has run
this
.
loggedInAuthZ
.
pipe
(
skip
(
1
),
take
(
1
)).
subscribe
(
()
=>
{
this
.
readyToNavigate
.
next
([
true
,
path
])});
this
.
updateAgentContents
();
// only navigate once the agent contents has been refreshed
this
.
loggedInAuthZ
.
pipe
(
take
(
1
)).
subscribe
(
()
=>
{
this
.
readyToNavigate
.
next
([
true
,
path
])});
}
public
querySshAgentError
(
error
:
any
)
{
...
...
src/app/computesites.service.ts
View file @
d176913a
...
...
@@ -156,6 +156,8 @@ export class ComputesitesService {
var
appidentities
:
Identity
[]
=
[];
var
ftidentities
:
Identity
[]
=
[];
// If the agent contents is set to null we are probably still updating it
console
.
log
(
'
updating app identities
'
);
console
.
log
(
resp
);
if
(
resp
==
null
)
{
return
}
...
...
src/app/launcher/launcher.component.ts
View file @
d176913a
...
...
@@ -67,7 +67,7 @@ export class LauncherComponent implements OnInit {
)
{
this
.
subscriptions
=
[];
this
.
subscriptions
.
push
(
this
.
authService
.
sshAuthzServers
.
subscribe
(
o
=>
{
this
.
updateSshAuthZServers
(
o
)}));
this
.
subscriptions
.
push
(
this
.
computeSitesService
.
appidentities
.
subscribe
(
o
=>
this
.
navLogin
(
o
)));
this
.
subscriptions
.
push
(
this
.
authService
.
loggedInAuthZ
.
subscribe
(
o
=>
this
.
navLogin
(
o
)));
this
.
subscriptions
.
push
(
this
.
computeSitesService
.
appidentities
.
subscribe
(
o
=>
this
.
getHealth
(
o
)));
this
.
appSubject
=
new
BehaviorSubject
<
Strudelapp
>
(
null
);
this
.
identitySubject
=
new
BehaviorSubject
<
Identity
>
(
null
);
...
...
@@ -129,10 +129,14 @@ export class LauncherComponent implements OnInit {
}
navLogin
(
o
)
{
console
.
log
(
'
in navLogin
'
);
if
(
o
==
null
)
{
console
.
log
(
'
not redireting null
'
);
return
}
if
(
o
.
length
==
0
)
{
console
.
log
(
'
redireting length == 0
'
);
this
.
router
.
navigate
([
'
/login
'
]);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment