cleanup some code in two services

src/app/authorisation.service.ts

@@ -274,7 +274,7 @@ private getSessionToken(apiserver: APIServer): Observable<any> {
     'Authorization': `Bearer ${sessionToken}`
   });
    let options = { headers: headers, withCredentials: true};
-   let agentquery$ = this.http.get<any>(apiserver+'/sshagent',options)
+   let agentquery$ = this.http.get<any>(apiserver.tes+'/sshagent',options)
    let agentpipe$ = agentquery$.pipe(
      catchError((e) => { this.querySshAgentError(e); return of([])}),
      map((v) => this.addExpiryField(v)),
@@ -352,12 +352,12 @@ private getSessionToken(apiserver: APIServer): Observable<any> {
     );
 
     let keycert$: Observable<any> = combineLatest([sshAuthZToken$, key$, apiserver$]).pipe(
-      map(([token, key, apiserver ]) => { 
+      switchMap(([token, key, apiserver ]) => { 
         return this.getCert(token, key, apiserver).pipe(
-          map((cert) => [key,cert, token]))
+          map((cert) => [key, cert, token]),
+        )
         }),
-      tap((v) => console.log('in keycert$ pipe line', v))
-      //tap(([key, cert, token]) => this.logout_sshauthz(token.sshauthzservice))
+      tap(([key, cert, token]) => this.logout_sshauthz(token.sshauthzservice))
      )