Commit 62b92a8d authored by Chris Hines's avatar Chris Hines
Browse files

still fixing redirect

parent d176913a
Pipeline #7546 passed with stages
in 3 minutes and 1 second
...@@ -54,7 +54,7 @@ export class AuthorisationService { ...@@ -54,7 +54,7 @@ export class AuthorisationService {
this.getSshAuthzServers(); this.getSshAuthzServers();
this.keys = []; this.keys = [];
this.backendSelectionService.apiserver.pipe(filter((v) => v !== null && v !== undefined)) this.backendSelectionService.apiserver.pipe(filter((v) => v !== null && v !== undefined))
.subscribe((value) => { this.backendURI = value.tes ; this.updateAgentContents() }) .subscribe((value) => { this.backendURI = value.tes ; this.agentContents.next(null) })
this.agentContents.subscribe((value) => this.updateLoggedAuthZ()); this.agentContents.subscribe((value) => this.updateLoggedAuthZ());
this.sshAuthzServers.subscribe((value) => this.updateLoggedAuthZ()); this.sshAuthzServers.subscribe((value) => this.updateLoggedAuthZ());
} }
...@@ -218,7 +218,6 @@ public getKeys(id?: Identity) { ...@@ -218,7 +218,6 @@ public getKeys(id?: Identity) {
} }
keys.push(keyCert); keys.push(keyCert);
sessionStorage.setItem('keys',JSON.stringify(keys)) sessionStorage.setItem('keys',JSON.stringify(keys))
this.sshAdd(keyCert);
// this.tesService.keyCert.next(keyCert); // this.tesService.keyCert.next(keyCert);
// As soon as the certificate has been generated, we log back out of the signing server // As soon as the certificate has been generated, we log back out of the signing server
if (!(sshauthzservice.logout === null)) { if (!(sshauthzservice.logout === null)) {
...@@ -226,9 +225,8 @@ public getKeys(id?: Identity) { ...@@ -226,9 +225,8 @@ public getKeys(id?: Identity) {
} }
let path=sessionStorage.getItem('path'); let path=sessionStorage.getItem('path');
//skip1 because loggedInAuthZ is a behaviour subject and we don't want the current value but the value //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.loggedInAuthZ.pipe(skip(1),take(1)).subscribe( () => {this.readyToNavigate.next([true,path])});
this.updateAgentContents(); this.sshAdd(keyCert);
// only navigate once the agent contents has been refreshed // only navigate once the agent contents has been refreshed
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment