Merge pull request #197 from UoA-eResearch/rc2.5.1

Rc2.5.1

Author: rosemcc

cer-graphql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cer-graphql",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "A GraphQL server used to proxy and authorise requests to external data sources.",
   "main": "build/index.js",
   "scripts": {

hub-search-proxy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hub-search-proxy",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "Serverless Framework Lambda functions to interact with AWS ElasticSearch Service.",
   "main": "handler.js",
   "scripts": {

research-hub-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "research-hub-web",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "license": "MIT",
   "scripts": {
     "ng": "ng",

research-hub-web/src/app/app.module.ts

@@ -92,8 +92,26 @@ export class AppModule {
     const error = onError(({ response, networkError, graphQLErrors }) => {
       const hasErrors = networkError || graphQLErrors;
       if (networkError) {
-        console.log("API returned networkError", networkError);
-        return;
+        if (
+          // When the server picks up an authentication error before the graphql resolver stage,
+          // the error will be returned as a networkError but in a similar format as a graphQLError
+          // which is why we currently have to handle the error as follows:
+          networkError['error'] &&
+          networkError['error']['errors'] &&
+          networkError['error']['errors'][0] &&
+          networkError['error']['errors'][0]['extensions']['code'] === 'UNAUTHENTICATED') {
+          this.loginService.doLogin(this.router.url).then((result) => {
+            // Workaround fix for blank page load issue
+            // when auth library returns a token instead of navigating to target url
+            if (result) {
+              location.reload();
+            }            
+          });
+          return;
+      } else {
+          console.error("API returned networkError", networkError);
+          return;
+        }
       }
       if (graphQLErrors) {
         console.log("API returned graphQLErrors", graphQLErrors);

research-hub-web/src/app/components/activities-page/activities-page.component.ts

@@ -10,6 +10,7 @@ import { Observable, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { PageTitleService } from '@services/page-title.service';
 import { notEmpty } from '@app/global/notEmpty';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-activities-page',
@@ -26,7 +27,8 @@ export class ActivitiesPageComponent implements OnInit, OnDestroy {
     public allStagesGQL: AllStagesGQL,
     private getHomepageGQL: GetHomepageGQL,
     public searchService: SearchService,
-    public pageTitleService: PageTitleService
+    public pageTitleService: PageTitleService,
+    private router: Router
   ) { }
 
   ngOnInit() {
@@ -35,8 +37,15 @@ export class ActivitiesPageComponent implements OnInit, OnDestroy {
     this.subscriptions.add(
       this.getHomepageGQL.fetch().pipe(
         map(x => x?.data?.homepageCollection?.items[0])
-      ).subscribe(result => {
-        this.description = result?.researchActivities;
+      ).subscribe({
+        next: result => {
+          this.description = result?.researchActivities;
+        },
+        error: err => {
+          console.error(err);
+          const status: number = err['status'] ? err['status'] : 500;
+          this.router.navigate(['error', status]);
+        }
       })
     )
   }

research-hub-web/src/app/components/categories-page/categories-page.component.ts

@@ -37,8 +37,15 @@ export class CategoriesPageComponent implements OnInit, OnDestroy {
     this.subscriptions.add(
       this.getHomepageGQL.fetch().pipe(
         map(x => x?.data?.homepageCollection?.items[0])
-      ).subscribe(result => {
-        this.description = result?.researchCategories;
+      ).subscribe({
+        next: result => {
+          this.description = result?.researchCategories;
+        },
+        error: err => {
+          console.error(err);
+          const status: number = err['status'] ? err['status'] : 500;
+          this.router.navigate(['error', status]);
+        }
       })
     )
   }

research-hub-web/src/app/components/home/home.component.spec.ts

@@ -7,6 +7,7 @@ import { HomeComponent } from './home.component';
 import { BannerImageComponent } from './banner-image/banner-image.component';
 import { ContactComponent } from './contact/contact.component';
 import { PageTitleService } from '@services/page-title.service';
+import { RouterTestingModule } from '@angular/router/testing';
 
 
 describe('HomeComponent', () => {
@@ -23,6 +24,9 @@ describe('HomeComponent', () => {
         MockComponent(BannerImageComponent),
         MockComponent(ContactComponent)
       ],
+      imports: [
+        RouterTestingModule.withRoutes([]),
+      ],
       providers: [
         MockProvider(PageTitleService),
       ]

research-hub-web/src/app/components/home/home.component.ts

@@ -1,8 +1,9 @@
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 import { GetHomepageGQL, Homepage } from '@app/graphql/schema';
 import { PageTitleService } from '@services/page-title.service';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Observable, throwError } from 'rxjs';
+import { catchError, map } from 'rxjs/operators';
 
 @Component({
   selector: 'app-home',
@@ -14,13 +15,19 @@ export class HomeComponent implements OnInit {
 
   constructor(
     private getHomepageGQL: GetHomepageGQL,
-    public pageTitleService: PageTitleService
+    public pageTitleService: PageTitleService,
+    public router: Router
   ) { }
 
   ngOnInit(): void {
     this.pageTitleService.title = '';
     this.homePage$ = this.getHomepageGQL.fetch().pipe(
-      map(x => x?.data?.homepageCollection?.items[0]) 
+      map(x => x?.data?.homepageCollection?.items[0]),
+      catchError(err => {
+        const status: number = err['status'] ? err['status'] : 500;
+        this.router.navigate(['error', status]);
+        return throwError(err);
+      })
     ) as Observable<Homepage>;
   }
 }