Add support to get scicat token for an OIDC user. Add a scicat dataset viewer widget

Author: omkar-ethz

scilog/.gitignore

@@ -63,3 +63,5 @@ typings/
 
 # Cache used by TypeScript's incremental build
 *.tsbuildinfo
+
+.vscode

scilog/package-lock.json

@@ -54,6 +54,7 @@
     "@angular-devkit/build-angular": "^15.2.11",
     "@angular/cli": "^15.2.11",
     "@angular/compiler-cli": "^15.2.10",
+    "@scicatproject/scicat-sdk-ts-fetch": "^4.13.0",
     "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",

scilog/package.json

@@ -12,6 +12,8 @@ export interface AppConfig {
   lbBaseURL?: string;
   oAuth2Endpoint?: Oauth2Endpoint;
   help?: string;
+  scicatLbBaseURL?: string;
+  scicatFrontendBaseURL?: string;
 }
 
 @Injectable()
@@ -24,7 +26,7 @@ export class AppConfigService {
       try {
         this.appConfig = await this.http.get("/assets/config.json").toPromise();
       } catch (err) {
-        console.error("No config provided, applying defaults");
+        console.error("No config provided, applying defaults", err);
       }
   }
 

scilog/src/app/app-config.service.ts

@@ -15,10 +15,12 @@ import { ViewSettingsComponent } from '@shared/settings/view-settings/view-setti
 import { ProfileSettingsComponent } from '@shared/settings/profile-settings/profile-settings.component';
 import { DownloadComponent } from '@shared/download/download.component';
 import { NavigationGuardService } from './logbook/core/navigation-guard-service';
+import { AuthCallbackComponent } from './auth-callback/auth-callback.component';
 
 const routes: Routes = [
   { path: '', redirectTo: '/login', pathMatch: 'full' },
   { path: 'login', component: LoginComponent },
+  { path: 'auth-callback', component: AuthCallbackComponent },
   { path: 'overview', component: OverviewComponent },
   { path: 'download/:fileId', component: DownloadComponent },
   { path: 'logbooks/:logbookId', component: LogbookComponent,

scilog/src/app/app-routing.module.ts

@@ -88,6 +88,8 @@ import { MatPaginatorModule } from '@angular/material/paginator';
 import { MatSortModule } from '@angular/material/sort';
 import { OverviewScrollComponent } from './overview/overview-scroll/overview-scroll.component';
 import { ActionsMenuComponent } from './overview/actions-menu/actions-menu.component';
+import { ScicatViewerComponent } from './logbook/widgets/scicat-viewer/scicat-viewer.component';
+import { AuthCallbackComponent } from './auth-callback/auth-callback.component';
 
 const appConfigInitializerFn = (appConfig: AppConfigService) => {
     return () => appConfig.loadAppConfig();
@@ -135,7 +137,9 @@ const appConfigInitializerFn = (appConfig: AppConfigService) => {
         ResizedDirective,
         OverviewTableComponent,
         OverviewScrollComponent,
-        ActionsMenuComponent
+        ActionsMenuComponent,
+        ScicatViewerComponent,
+        AuthCallbackComponent
     ],
     imports: [
         BrowserModule,

scilog/src/app/app.module.ts

@@ -0,0 +1 @@
+<p>auth-callback works!</p>

scilog/src/app/auth-callback/auth-callback.component.css

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AuthCallbackComponent } from './auth-callback.component';
+
+describe('AuthCallbackComponent', () => {
+  let component: AuthCallbackComponent;
+  let fixture: ComponentFixture<AuthCallbackComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ AuthCallbackComponent ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(AuthCallbackComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

scilog/src/app/auth-callback/auth-callback.component.html

@@ -0,0 +1,36 @@
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Subscription } from 'rxjs';
+
+@Component({
+  selector: 'app-auth-callback',
+  template: '',
+  styles: [],
+})
+export class AuthCallbackComponent implements OnInit, OnDestroy {
+  constructor(private route: ActivatedRoute, private router: Router) {}
+
+  subscriptions: Subscription[] = [];
+
+  ngOnInit(): void {
+    const sub = this.route.queryParams.subscribe((params) => {
+      const token = params['access-token'];
+      const returnUrl = params['returnUrl'];
+
+      if (token) {
+        localStorage.setItem('scicat_token', token);
+      }
+
+      if (returnUrl) {
+        this.router.navigateByUrl(returnUrl);
+      } else {
+        this.router.navigate(['/overview']);
+      }
+    });
+    this.subscriptions.push(sub);
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach((sub) => sub.unsubscribe());
+  }
+}

scilog/src/app/auth-callback/auth-callback.component.spec.ts

@@ -1,16 +1,63 @@
 import { TestBed } from '@angular/core/testing';
 
 import { AuthInterceptor } from './auth.interceptor';
+import { ServerSettingsService } from '@shared/config/server-settings.service';
+import { HttpEvent, HttpHandler, HttpRequest } from '@angular/common/http';
+import { of } from 'rxjs';
 
 describe('AuthInterceptor', () => {
-  beforeEach(() => TestBed.configureTestingModule({
-    providers: [
-      AuthInterceptor
-      ]
-  }));
+  const serverSettingsService = jasmine.createSpyObj('ServerSettingsService', [
+    'getSciCatServerAddress',
+  ]);
+  serverSettingsService.getSciCatServerAddress.and.returnValue(
+    'https://scicat-backend.psi.ch'
+  );
+  beforeEach(() =>
+    TestBed.configureTestingModule({
+      providers: [
+        AuthInterceptor,
+        { provide: ServerSettingsService, useValue: serverSettingsService },
+      ],
+    })
+  );
 
   it('should be created', () => {
     const interceptor: AuthInterceptor = TestBed.inject(AuthInterceptor);
     expect(interceptor).toBeTruthy();
   });
+
+  it('should append scicat token if request to scicat backend', (done: DoneFn) => {
+    localStorage.setItem('scicat_token', 'test_scicat_token');
+    const interceptor: AuthInterceptor = TestBed.inject(AuthInterceptor);
+    const req = new HttpRequest("GET", 'https://scicat-backend.psi.ch/api/v3/datasets');
+    const next = jasmine.createSpyObj<HttpHandler>('HttpHandler', ['handle']);
+    next.handle.and.returnValue(of({} as HttpEvent<any>));
+    interceptor.intercept(req, next).subscribe({
+      next: (_httpEvent: HttpEvent<any>) => {
+        const reqArg = next.handle.calls.mostRecent().args[0];
+        expect(reqArg.headers.get('Authorization')).toBe('Bearer test_scicat_token');
+        localStorage.clear();
+        done();
+      },
+      error: done.fail,
+    });
+  });
+
+  it('should append scilog token if request is not to scicat backend', (done: DoneFn) => {
+    localStorage.setItem('id_token', 'test_scilog_token');
+    const interceptor: AuthInterceptor = TestBed.inject(AuthInterceptor);
+    const req = new HttpRequest("GET", 'https://scilog-backend.psi.ch/api/v1');
+    const next = jasmine.createSpyObj<HttpHandler>('HttpHandler', ['handle']);
+    next.handle.and.returnValue(of({} as HttpEvent<any>));
+    interceptor.intercept(req, next).subscribe({
+      next: (_httpEvent: HttpEvent<any>) => {
+        const reqArg = next.handle.calls.mostRecent().args[0];
+        expect(reqArg.headers.get('Authorization')).toBe('Bearer test_scilog_token');
+        localStorage.clear();
+        done();
+      },
+      error: done.fail,
+    });
+  });
 });
+

scilog/src/app/auth-callback/auth-callback.component.ts

@@ -1,57 +1,85 @@
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import {
   HttpRequest,
   HttpHandler,
   HttpEvent,
   HttpInterceptor,
   HttpResponse,
-  HttpErrorResponse
+  HttpErrorResponse,
 } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
+import { ServerSettingsService } from '@shared/config/server-settings.service';
 
 function logout() {
-  localStorage.removeItem("id_token");
+  localStorage.removeItem('id_token');
   localStorage.removeItem('id_session');
+  localStorage.removeItem('scicat_token');
   sessionStorage.removeItem('scilog-auto-selection-logbook');
   location.href = '/login';
-};
-
-function handle_request(handler: HttpHandler, req: HttpRequest<any>) {
-  return handler.handle(req).pipe(tap((event: HttpEvent<any>) => {
-    if (event instanceof HttpResponse) {
-      // console.log(cloned);
-      // console.log("Service Response thr Interceptor");
-    }
-  }, (err: any) => {
-    if (err instanceof HttpErrorResponse) {
-      console.log("err.status", err);
-      if (err.status === 401) {
-        logout();
-      }
-    }
-  }));
 }
 
 @Injectable()
 export class AuthInterceptor implements HttpInterceptor {
+  private serverSettingsService = inject(ServerSettingsService);
 
-  intercept(req: HttpRequest<any>,
-    next: HttpHandler): Observable<HttpEvent<any>> {
+  private isRequestToSciCatBackend(req_url: string): boolean {
+    try {
+      const origin = new URL(req_url).origin;
+      return (
+        origin ===
+        new URL(this.serverSettingsService.getSciCatServerAddress()).origin
+      );
+    } catch (err) {
+      // new URL(...) fails for request to static assets (e.g. /assets/config.json)
+      return false;
+    }
+  }
 
-    const idToken = localStorage.getItem("id_token");
+  private handle_request(handler: HttpHandler, req: HttpRequest<any>) {
+    return handler.handle(req).pipe(
+      tap({
+        next: (event: HttpEvent<any>) => {
+          if (event instanceof HttpResponse) {
+            // console.log(cloned);
+            // console.log("Service Response thr Interceptor");
+          }
+        },
+        error: (err: any) => {
+          if (err instanceof HttpErrorResponse) {
+            console.log('err.status', err);
+            if (err.status === 401) {
+              if (!this.isRequestToSciCatBackend(err.url)) {
+                logout();
+              } else {
+                window.location.href = `${this.serverSettingsService.getSciCatServerAddress()}/api/v3/auth/oidc?client=scilog&returnURL=${
+                  window.location.pathname + window.location.search
+                }`;
+              }
+            }
+          }
+        },
+      })
+    );
+  }
 
+  intercept(
+    req: HttpRequest<any>,
+    next: HttpHandler
+  ): Observable<HttpEvent<any>> {
+    let idToken = '';
+    if (this.isRequestToSciCatBackend(req.url)) {
+      idToken = localStorage.getItem('scicat_token');
+    } else {
+      idToken = localStorage.getItem('id_token');
+    }
     if (idToken) {
       const cloned = req.clone({
-        headers: req.headers.set("Authorization",
-          "Bearer " + idToken)
+        headers: req.headers.set('Authorization', 'Bearer ' + idToken),
       });
-
-      return handle_request(next, cloned);
-
-    }
-    else {
-      return handle_request(next, req);
+      return this.handle_request(next, cloned);
+    } else {
+      return this.handle_request(next, req);
     }
   }
 }

scilog/src/app/core/auth-services/auth.interceptor.spec.ts

@@ -31,6 +31,7 @@ export class AuthService {
   logout() {
       localStorage.removeItem("id_token");
       localStorage.removeItem('id_session');
+      localStorage.removeItem('scicat_token');
       sessionStorage.removeItem('scilog-auto-selection-logbook');
       this.forceReload=true;
   }

scilog/src/app/core/auth-services/auth.interceptor.ts

@@ -14,6 +14,14 @@ export class ServerSettingsService {
     return this.appConfigService.getConfig().lbBaseURL ?? 'http://[::1]:3000/';
   }
 
+  getSciCatServerAddress() : string | undefined {
+    return this.appConfigService.getConfig().scicatLbBaseURL;
+  }
+
+  getScicatFrontendBaseUrl() : string | undefined {
+    return this.appConfigService.getConfig().scicatFrontendBaseURL;
+  }
+
   getSocketAddress(){
     const lbBaseURL = this.appConfigService.getConfig().lbBaseURL ?? 'http://localhost:3000/';
     if (!lbBaseURL.startsWith('http')) throw new Error('BaseURL must use the http or https protocol');

scilog/src/app/core/auth-services/auth.service.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { DatasetService } from './dataset.service';
+
+describe('DatasetService', () => {
+  let service: DatasetService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(DatasetService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});