From 4d79273664e2cca95c47459a5197f2bb52cbce25 Mon Sep 17 00:00:00 2001
From: "stuart.woodman" <stuart.woodman@csiro.au>
Date: Mon, 6 Feb 2023 09:39:09 +1100
Subject: [PATCH 1/3] Added login functionality to portal (AAF, Google and
 Github currently).

---
 angular.json                                  |   3 +-
 proxy.conf.json                               |  16 +-
 src/app/app-routing.module.ts                 |  28 +++
 src/app/app.component.html                    |   1 +
 src/app/app.component.ts                      |  17 ++
 src/app/app.module.ts                         |  37 +++-
 .../menupanel/login/logged-in.component.ts    |  19 ++
 .../menupanel/login/login-menu.component.html |  14 ++
 .../menupanel/login/login-menu.component.scss |  28 +++
 .../menupanel/login/login-menu.component.ts   |  47 +++++
 src/app/menupanel/login/login.component.html  |  12 ++
 src/app/menupanel/login/login.component.scss  |  37 ++++
 src/app/menupanel/login/login.component.ts    |  37 ++++
 src/app/models/user.model.ts                  |   9 +
 src/app/portal/portal.component.html          |  92 +++++++++
 src/app/portal/portal.component.ts            |  14 ++
 src/app/router.animations.ts                  |  65 ++++++
 src/app/services/api/auscope-api.service.ts   |  11 +-
 src/app/services/auth/auth.guard.ts           |  39 ++++
 src/app/services/auth/auth.service.ts         |  63 ++++++
 src/app/services/user/user-state.service.ts   |  39 ++++
 src/environments/environment.ts               |   1 +
 src/extension/img/GitHub_Logo.png             | Bin 0 -> 7899 bytes
 src/extension/img/aaf_service_223x54.png      | Bin 0 -> 5047 bytes
 .../img/btn_google_signin_dark_normal_web.png | Bin 0 -> 3983 bytes
 src/index.htm                                 | 194 ++++--------------
 src/styles.scss                               |   6 -
 27 files changed, 647 insertions(+), 182 deletions(-)
 create mode 100644 src/app/app-routing.module.ts
 create mode 100644 src/app/app.component.html
 create mode 100644 src/app/app.component.ts
 create mode 100644 src/app/menupanel/login/logged-in.component.ts
 create mode 100644 src/app/menupanel/login/login-menu.component.html
 create mode 100644 src/app/menupanel/login/login-menu.component.scss
 create mode 100644 src/app/menupanel/login/login-menu.component.ts
 create mode 100644 src/app/menupanel/login/login.component.html
 create mode 100644 src/app/menupanel/login/login.component.scss
 create mode 100644 src/app/menupanel/login/login.component.ts
 create mode 100644 src/app/models/user.model.ts
 create mode 100644 src/app/portal/portal.component.html
 create mode 100644 src/app/portal/portal.component.ts
 create mode 100644 src/app/router.animations.ts
 create mode 100644 src/app/services/auth/auth.guard.ts
 create mode 100644 src/app/services/auth/auth.service.ts
 create mode 100644 src/app/services/user/user-state.service.ts
 create mode 100644 src/extension/img/GitHub_Logo.png
 create mode 100644 src/extension/img/aaf_service_223x54.png
 create mode 100644 src/extension/img/btn_google_signin_dark_normal_web.png

diff --git a/angular.json b/angular.json
index e578c02c5..c40c1ea22 100644
--- a/angular.json
+++ b/angular.json
@@ -127,7 +127,8 @@
         "serve": {
           "builder": "@angular-builders/custom-webpack:dev-server",
           "options": {
-            "browserTarget": "project:build"
+            "browserTarget": "project:build",
+            "proxyConfig": "./proxy.conf.json"
           },
           "configurations": {
             "audev": {
diff --git a/proxy.conf.json b/proxy.conf.json
index be91f5a1b..85aecaf03 100644
--- a/proxy.conf.json
+++ b/proxy.conf.json
@@ -1,8 +1,10 @@
 {
-  "/": {
-    "target": "http://localhost:8080/AuScope-Portal",
-    "secure": false,
-    "pathRewrite": {"^/" : ""},
-     "logLevel":"debug"
-  }
-}
\ No newline at end of file
+  "context": [
+    "/AuScope-Portal/**",
+    "/api/**"
+  ],
+  "target": "http://localhost:8080/",
+  "secure": false,
+  "logLevel": "debug",
+  "changeOrigin": true
+}
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
new file mode 100644
index 000000000..7d8622b84
--- /dev/null
+++ b/src/app/app-routing.module.ts
@@ -0,0 +1,28 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { environment } from '../environments/environment';
+import { LoggedInComponent } from './menupanel/login/logged-in.component';
+import { LoginComponent } from './menupanel/login/login.component';
+import { PortalComponent } from './portal/portal.component';
+
+
+const baseUrl = environment.portalBaseUrl.replace(/^\/|\/$/g, '');
+
+/**
+ * Application routes.
+ * Add the following to a route to ensure only authenticated users can access:
+ *    canActivate: [AuthGuard]
+ */
+const routes: Routes = [
+  { path: '', pathMatch: 'full', component: PortalComponent },
+  { path: 'login', component: LoginComponent },
+  { path: 'login/loggedIn', component: LoggedInComponent },
+  { path: baseUrl, redirectTo: '/', pathMatch: 'full' },
+  { path: '**', redirectTo: '/' }
+];
+
+@NgModule({
+    imports: [RouterModule.forRoot(routes)],
+    exports: [RouterModule]
+})
+export class AppRoutingModule {}
diff --git a/src/app/app.component.html b/src/app/app.component.html
new file mode 100644
index 000000000..90c6b6463
--- /dev/null
+++ b/src/app/app.component.html
@@ -0,0 +1 @@
+<router-outlet></router-outlet>
\ No newline at end of file
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
new file mode 100644
index 000000000..dc0cf3d64
--- /dev/null
+++ b/src/app/app.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+/**
+ * Top level application component, holds the router outlet
+ *
+ * @export
+ * @class AppComponent
+ */
+@Component({
+    selector: 'app-component',
+    templateUrl: './app.component.html'
+})
+
+export class AppComponent {
+
+  constructor() {}
+
+}
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 953b77714..0a49e2a2a 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -4,11 +4,17 @@ import { NgModule } from '@angular/core';
 import { ModalModule } from 'ngx-bootstrap/modal';
 import { NouisliderModule } from 'ng2-nouislider';
 import { CommonModule } from '@angular/common';
+import { BrowserModule } from '@angular/platform-browser';
 
 // Cesium icons
 import { MatTooltipModule } from '@angular/material/tooltip';
 
 // Components
+import { AppComponent } from './app.component';
+import { PortalComponent } from './portal/portal.component';
+import { LoginMenuComponent } from './menupanel/login/login-menu.component';
+import { LoginComponent } from './menupanel/login/login.component';
+import { LoggedInComponent } from './menupanel/login/logged-in.component';
 import { CsMapComponent } from './cesium-map/csmap.component';
 import { CesiumMapPreviewComponent } from './menupanel/common/infopanel/cesiummappreview/cesium.preview.component';
 import { LayerPanelComponent } from './menupanel/layerpanel/layerpanel.component';
@@ -93,11 +99,25 @@ import { NgxColorsModule } from 'ngx-colors';
 import {MatProgressBarModule} from '@angular/material/progress-bar'; 
 import {MatCardModule} from '@angular/material/card'; 
 import { getSaver, SAVER } from './modalwindow/layeranalytic/nvcl/saver.provider';
+
+// Routing
+import { AppRoutingModule } from './app-routing.module';
+
+// Auth
+import { UserStateService } from './services/user/user-state.service';
+import { AuthGuard } from './services/auth/auth.guard';
+import { AuthService } from './services/auth/auth.service';
+
 PlotlyModule.plotlyjs = PlotlyJS;
 
 
 @NgModule({
     declarations: [
+        AppComponent,
+        PortalComponent,
+        LoginComponent,
+        LoggedInComponent,
+        LoginMenuComponent,
         CsMapComponent,
         CesiumMapPreviewComponent,
         LayerPanelComponent,
@@ -136,10 +156,12 @@ PlotlyModule.plotlyjs = PlotlyJS;
         RecordModalComponent
     ],
     providers: [ AuscopeApiService, FilterService, RectanglesEditorService, AdvancedComponentService, SearchService,
-                 NVCLService, MSCLService, BoundsService, GraceService, { provide: SAVER, useFactory: getSaver }
+                 NVCLService, MSCLService, BoundsService, GraceService, { provide: SAVER, useFactory: getSaver },
+                 UserStateService, AuthGuard, AuthService
     ],
     imports: [
         PortalCoreModule.forRoot(environment, config),
+        AppRoutingModule,
         PortalCorePipesModule,
         ClipboardModule,
         ModalModule.forRoot(),
@@ -167,18 +189,11 @@ PlotlyModule.plotlyjs = PlotlyJS;
         AngularCesiumWidgetsModule,
         NgbModule,
         FormsModule,
-        ReactiveFormsModule
+        ReactiveFormsModule,
+        BrowserModule
     ],
     bootstrap: [
-        CsMapComponent,
-        LayerPanelComponent,
-        CustomPanelComponent,
-        ActiveLayersPanelComponent,
-        PermanentLinkComponent,
-        DataExplorerComponent,
-        PortalDetailsPanelComponent,
-        HelpMenuComponent,
-        SearchPanelComponent
+        AppComponent
     ]
 })
 export class AppModule { }
diff --git a/src/app/menupanel/login/logged-in.component.ts b/src/app/menupanel/login/logged-in.component.ts
new file mode 100644
index 000000000..e92dd6c71
--- /dev/null
+++ b/src/app/menupanel/login/logged-in.component.ts
@@ -0,0 +1,19 @@
+import { Component, OnInit } from '@angular/core';
+
+import { AuthService } from '../../services/auth/auth.service';
+
+@Component({
+  selector: 'app-logged-in',
+  template: ``,
+  styles: []
+})
+export class LoggedInComponent implements OnInit {
+
+  constructor(private authService: AuthService) {}
+
+  ngOnInit() {
+    // Inform the auth service
+    this.authService.onLoggedIn();
+  }
+
+}
diff --git a/src/app/menupanel/login/login-menu.component.html b/src/app/menupanel/login/login-menu.component.html
new file mode 100644
index 000000000..87f27984d
--- /dev/null
+++ b/src/app/menupanel/login/login-menu.component.html
@@ -0,0 +1,14 @@
+<div class="user-menu">
+    <div *ngIf="isUserLoggedIn()">
+        <button mat-button [matMenuTriggerFor]="loginMenu" class="user-menu" title="Log in">
+            <i class="fa fa-2x fa-user"></i>&nbsp;&nbsp;{{ username }} <b class="caret"></b>
+            <i class="fa fa-caret-down" style="margin-left:5px;"></i>
+        </button>
+        <mat-menu #loginMenu="matMenu" style="margin-top:12px;">
+            <h5 mat-menu-item><button (click)="logOut()" class="btn user-button">Log Out</button></h5>
+        </mat-menu>
+    </div>
+    <div *ngIf="!isUserLoggedIn()">
+        <button mat-button class="user-name" title="Log In" (click)="login()"><i class="fa fa-2x fa-users"></i>&nbsp;&nbsp;Log In<b class="caret"></b></button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/menupanel/login/login-menu.component.scss b/src/app/menupanel/login/login-menu.component.scss
new file mode 100644
index 000000000..0596f4475
--- /dev/null
+++ b/src/app/menupanel/login/login-menu.component.scss
@@ -0,0 +1,28 @@
+@import '../../globals';
+
+.user-menu {
+    color: $text-colour;
+}
+
+.user-button {
+    color: #d8d9d7;
+}
+
+.user-button:hover {
+    color: white;
+}
+
+.user-menu:hover {
+    color: $text-highlight-colour;
+}
+
+::ng-deep {
+    .mat-menu-panel {
+        margin-top: 10px;
+    }
+
+    .mat-menu-content {
+        background-color: $background-colour;
+    }
+
+}
\ No newline at end of file
diff --git a/src/app/menupanel/login/login-menu.component.ts b/src/app/menupanel/login/login-menu.component.ts
new file mode 100644
index 000000000..6a7ed40a5
--- /dev/null
+++ b/src/app/menupanel/login/login-menu.component.ts
@@ -0,0 +1,47 @@
+import { Component } from '@angular/core';
+import { Router } from '@angular/router';
+import { AuthService } from 'app/services/auth/auth.service';
+import { UserStateService } from '../../services/user/user-state.service';
+
+@Component({
+    selector: '[app-login-menu]',
+    templateUrl: './login-menu.component.html',
+    styleUrls: ['./login-menu.component.scss']
+})
+export class LoginMenuComponent {
+
+  username: string;
+
+  constructor(private router: Router, private authService: AuthService, private userStateService: UserStateService) {
+    this.authService.checkServerLogin();
+    this.userStateService.user.subscribe(user => {
+      if (user) {
+        this.username = user.fullName;
+      }
+    });
+  }
+
+  /**
+   * Check is a user is logged in.
+   *
+   * @returns true if user logged in, false otherwise
+   */
+  isUserLoggedIn(): boolean {
+    return this.authService.isLoggedIn;
+  }
+
+  /**
+   * Redirect to login page
+   */
+  login() {
+    this.router.navigate(['login']);
+  }
+
+  /**
+   * Logout current user
+   */
+  logOut() {
+    this.authService.logout();
+  }
+
+}
diff --git a/src/app/menupanel/login/login.component.html b/src/app/menupanel/login/login.component.html
new file mode 100644
index 000000000..4c1a26c54
--- /dev/null
+++ b/src/app/menupanel/login/login.component.html
@@ -0,0 +1,12 @@
+<div class="login-page" [@routerTransition]>
+    <div class="row justify-content-md-center">
+        <div class="col-md-4">
+            <h3>AuScope Discovery Portal</h3>
+            <i class="fa fa-5x fa-users" width="150px"></i>
+            <h1 class="login-message">Please log in using one of the options below</h1>
+            <a class="login-button" (click)="loginAaf()"><img src="/extension/img/aaf_service_223x54.png" height="46px"></a><br>
+            <a class="login-button" (click)="loginGoogle()"><img src="/extension/img/btn_google_signin_dark_normal_web.png" height="46px"></a><br>
+            <a class="login-button" (click)="loginGithub()"><img src="/extension/img/GitHub_Logo.png" height="46px"></a>
+        </div>
+    </div>
+</div>
diff --git a/src/app/menupanel/login/login.component.scss b/src/app/menupanel/login/login.component.scss
new file mode 100644
index 000000000..2d1a5c5dd
--- /dev/null
+++ b/src/app/menupanel/login/login.component.scss
@@ -0,0 +1,37 @@
+@import 'app/globals';
+
+.login-page {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  overflow: auto;
+  background: $auscope-royal-blue;
+  text-align: center;
+  color: #fff;
+  padding: 3em;
+
+  .user-avatar {
+      -webkit-border-radius: 50%;
+      border-radius: 50%;
+      border: 2px solid #fff;
+  }
+
+  .login-message {
+    margin: 10px 0 20px 0;
+  }
+
+  .login-button {
+      cursor: pointer;
+  }
+
+  img {
+    margin-bottom: 10px;
+  }
+
+  i {
+    margin-bottom: 10px;
+  }
+
+}
diff --git a/src/app/menupanel/login/login.component.ts b/src/app/menupanel/login/login.component.ts
new file mode 100644
index 000000000..4f4f1500b
--- /dev/null
+++ b/src/app/menupanel/login/login.component.ts
@@ -0,0 +1,37 @@
+import { Component } from '@angular/core';
+import { routerTransition } from '../../router.animations';
+import { environment } from '../../../environments/environment';
+
+@Component({
+    selector: 'app-login',
+    templateUrl: './login.component.html',
+    styleUrls: ['./login.component.scss'],
+    animations: [routerTransition()]
+})
+export class LoginComponent {
+  constructor() {}
+
+  // TODO: We may need to store some user site settings to local storage if not saved to DB for post-auth
+
+  /**
+   * Google login
+   */
+  loginGoogle() {
+    window.location.href = environment.portalBaseUrl + 'oauth2/authorization/google';
+  }
+
+  /**
+   * Australia Access Federation (AAF) login
+   */
+  loginAaf() {
+    window.location.href = environment.portalBaseUrl + 'login/aaf';
+  }
+
+  /**
+   * Github login
+   */
+  loginGithub() {
+    window.location.href = environment.portalBaseUrl + 'oauth2/authorization/github';
+  }
+
+}
diff --git a/src/app/models/user.model.ts b/src/app/models/user.model.ts
new file mode 100644
index 000000000..4875d55b0
--- /dev/null
+++ b/src/app/models/user.model.ts
@@ -0,0 +1,9 @@
+/**
+ * User Models
+ */
+export interface User {
+  fullName: string;
+  email: string;
+  // Currently unused
+  acceptedTermsConditions: number;
+}
diff --git a/src/app/portal/portal.component.html b/src/app/portal/portal.component.html
new file mode 100644
index 000000000..be1ac1580
--- /dev/null
+++ b/src/app/portal/portal.component.html
@@ -0,0 +1,92 @@
+<!-- BEGIN navbar -->
+<div id="header" class="navbar fixed-top">
+    <!-- BEGIN navbar-header -->
+    <div class="navbar-header">
+        <span class="navbar-brand">
+            <img id="org-logo" src="extension/img/auscope_single-colour-1.png">
+            <span><b>Au</b>Scope Discovery Portal</span>
+        </span>
+    </div>
+    <!-- END navbar-header -->
+
+    <!-- search bar -->
+    <app-search-panel></app-search-panel>
+
+    <!-- login dropdown menu -->
+    <li class="dropdown" app-login-menu></li>
+
+    <!-- help dropdown menu -->
+    <li class="dropdown" app-help-menu></li>
+</div>
+<!-- END navbar -->
+
+<!-- BEGIN sidebar -->
+<nav id="sidebar" class="sidebar slimscroll sidebar-collapse show" style="overflow: auto;" >
+    <li class="hasEvent" appPermanentLink></li>
+
+    <!-- BEGIN Active Layers -->
+    <input type="checkbox" checked class="menuBtn" id="activeLayersBtn"/>
+    <h5 class="mb-1">
+        <label id="activeLayersLink" for="activeLayersBtn" class="mb-0" title="Layers added to map">
+            <i class="ti-filter"></i>
+            Active Layers
+            <i class="fa fa-arrow-circle-down"></i>
+        </label>
+        <ul class="card-sub" appActiveLayers></ul>
+    </h5>
+    <!-- END Active Layers -->
+
+    <!-- BEGIN Featured Layers -->
+    <input type="checkbox" class="menuBtn" id="featuredLayersBtn"/>
+    <h5 class="mb-1">
+        <label id="featuredLayersLink" for="featuredLayersBtn" class="mb-0" title="Select predefined layers">
+            <i class="ti-layers"></i>
+            Featured Layers
+            <i class="fa fa-arrow-circle-down"></i>
+        </label>
+        <ul class="card-sub" appLayerPanel></ul>
+    </h5>
+    <!-- END Featured Layers -->
+
+    <!-- BEGIN Custom Layers -->
+    <input type="checkbox" class="menuBtn" id="customLayersBtn"/>
+    <h5 class="mb-1">
+        <label for="customLayersBtn" class="mb-0" title="Enter a custom WMS endpoint">
+            <i class="ti-pencil-alt"></i>
+            Custom Layer
+            <i class="fa fa-arrow-circle-down"></i>
+        </label>
+        <ul class="card-sub" appCustomPanel></ul>
+    </h5>
+    <!-- END Custom Layers -->
+
+    <!-- BEGIN Data Explorer -->
+    <input type="checkbox" class="menuBtn" id="dataBtn"/>
+    <h5 class="mb-1">
+        <label for="dataBtn" class="mb-0" title="Search CSW services for records">
+            <i class="ti-book"></i>
+            Data Search
+            <i class="fa fa-arrow-circle-down"></i>
+        </label>
+        <ul class="card-sub" appDataExplorer></ul>
+    </h5>
+    <!-- END Data Explorer -->
+    
+    <hr/>
+    <li appPortalDetailsPanel></li>
+</nav>
+<!-- END sidebar -->
+
+<!-- BEGIN #map-area -->
+<div id="map-area" class="map-area">
+    <!-- BEGIN map-area-csmap -->
+    <div class="map-area-csmap">
+        <app-cs-map class="h-100 w-100"></app-cs-map>
+    </div>
+    <!-- END map-area-csmap -->
+</div>
+
+<!-- Modal window used as a popup when map querying -->
+<app-querier-modal-window></app-querier-modal-window>
+<app-layer-modal-window></app-layer-modal-window>
+<app-disclaimer-modal-window></app-disclaimer-modal-window>
diff --git a/src/app/portal/portal.component.ts b/src/app/portal/portal.component.ts
new file mode 100644
index 000000000..0ece36de6
--- /dev/null
+++ b/src/app/portal/portal.component.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+/**
+ * Defines the overall app layout
+ */
+@Component({
+    selector: 'app-portal',
+    templateUrl: './portal.component.html',
+    styleUrls: ['../../styles.scss']
+})
+export class PortalComponent {
+
+  constructor() {}
+
+}
diff --git a/src/app/router.animations.ts b/src/app/router.animations.ts
new file mode 100644
index 000000000..197500631
--- /dev/null
+++ b/src/app/router.animations.ts
@@ -0,0 +1,65 @@
+import { animate, state, style, transition, trigger } from '@angular/animations';
+
+export function routerTransition() {
+    return slideToTop();
+}
+
+export function slideToRight() {
+    return trigger('routerTransition', [
+        state('void', style({})),
+        state('*', style({})),
+        transition(':enter', [
+            style({ transform: 'translateX(-100%)' }),
+            animate('0.5s ease-in-out', style({ transform: 'translateX(0%)' }))
+        ]),
+        transition(':leave', [
+            style({ transform: 'translateX(0%)' }),
+            animate('0.5s ease-in-out', style({ transform: 'translateX(100%)' }))
+        ])
+    ]);
+}
+
+export function slideToLeft() {
+    return trigger('routerTransition', [
+        state('void', style({})),
+        state('*', style({})),
+        transition(':enter', [
+            style({ transform: 'translateX(100%)' }),
+            animate('0.5s ease-in-out', style({ transform: 'translateX(0%)' }))
+        ]),
+        transition(':leave', [
+            style({ transform: 'translateX(0%)' }),
+            animate('0.5s ease-in-out', style({ transform: 'translateX(-100%)' }))
+        ])
+    ]);
+}
+
+export function slideToBottom() {
+    return trigger('routerTransition', [
+        state('void', style({})),
+        state('*', style({})),
+        transition(':enter', [
+            style({ transform: 'translateY(-100%)' }),
+            animate('0.5s ease-in-out', style({ transform: 'translateY(0%)' }))
+        ]),
+        transition(':leave', [
+            style({ transform: 'translateY(0%)' }),
+            animate('0.5s ease-in-out', style({ transform: 'translateY(100%)' }))
+        ])
+    ]);
+}
+
+export function slideToTop() {
+    return trigger('routerTransition', [
+        state('void', style({})),
+        state('*', style({})),
+        transition(':enter', [
+            style({ transform: 'translateY(100%)' }),
+            animate('0.5s ease-in-out', style({ transform: 'translateY(0%)' }))
+        ]),
+        transition(':leave', [
+            style({ transform: 'translateY(0%)' }),
+            animate('0.5s ease-in-out', style({ transform: 'translateY(-100%)' }))
+        ])
+    ]);
+}
diff --git a/src/app/services/api/auscope-api.service.ts b/src/app/services/api/auscope-api.service.ts
index 2a55bb5aa..517863b32 100644
--- a/src/app/services/api/auscope-api.service.ts
+++ b/src/app/services/api/auscope-api.service.ts
@@ -1,5 +1,6 @@
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { User } from 'app/models/user.model';
 import { Observable, of, throwError } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { environment } from '../../../environments/environment';
@@ -34,8 +35,7 @@ export class AuscopeApiService {
   }
 
   private apiPost<T>(endpoint: string, params = {}, options = {}): Observable<T> {
-    const url = environment.portalBaseUrl + endpoint;
-
+    const url = environment.portalProxyUrl + endpoint;
     const body = new FormData();
     for (const key in params) {
       const val = params[key];
@@ -52,9 +52,8 @@ export class AuscopeApiService {
   }
 
   private apiGet<T>(endpoint: string, params = {}, options?): Observable<T> {
-    const url = environment.portalBaseUrl + endpoint;
+    const url = environment.portalProxyUrl + endpoint;
     const opts: { observe: 'body' } = { ...options, observe: 'body', params: params };
-
     return this.http.get<ApiResponse<T>>(url, opts).pipe(switchMap(apiData));
   }
 
@@ -105,4 +104,8 @@ export class AuscopeApiService {
     return this.apiGet<string[]>('suggestTerms.do', params);
   }
 
+  public get user(): Observable<User> {
+    return this.apiGet<User>('secure/getUser.do');
+  }
+
 }
diff --git a/src/app/services/auth/auth.guard.ts b/src/app/services/auth/auth.guard.ts
new file mode 100644
index 000000000..dc8643297
--- /dev/null
+++ b/src/app/services/auth/auth.guard.ts
@@ -0,0 +1,39 @@
+import { Injectable } from '@angular/core';
+import { CanActivate, Router, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { AuthService } from './auth.service';
+import { UserStateService } from '../user/user-state.service';
+
+/**
+ * AuthGuard is not so useful at the moment with all pages available to the user,
+ * but may become useful down the track if we want to limit access to pages (by adding
+ * "canActivate [AuthGuard]" to the route deinfintion).
+ */
+@Injectable()
+export class AuthGuard implements CanActivate {
+
+  constructor(private router: Router,
+              private authService: AuthService,
+              private userStateService: UserStateService) {}
+
+  canActivate(router: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
+    const url: string = state.url;
+    return this.checkLogin(url);
+  }
+
+  checkLogin(url: string): Observable<boolean> | boolean {
+    if (this.authService.isLoggedIn) {
+        return this.userStateService.user.pipe(map(
+          // Later we can use 'user' to check T&C's etc. if necessary
+          user => {
+            return true;
+          }
+        ));
+    }
+    // Navigate to the login page
+    this.router.navigate(['/login']);
+    return false;
+  }
+
+}
diff --git a/src/app/services/auth/auth.service.ts b/src/app/services/auth/auth.service.ts
new file mode 100644
index 000000000..46fb0152c
--- /dev/null
+++ b/src/app/services/auth/auth.service.ts
@@ -0,0 +1,63 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Router } from '@angular/router';
+import { UserStateService } from '../user/user-state.service';
+import { environment } from 'environments/environment';
+
+@Injectable()
+export class AuthService {
+
+  constructor(private userStateService: UserStateService,
+              private router: Router,
+              private http: HttpClient) {}
+
+  logout(): void {
+    localStorage.removeItem('isLoggedIn');
+    this.http.get(environment.portalProxyUrl + 'logout').subscribe(() => {
+      this.userStateService.removeUser();
+      this.router.navigate(['']);
+    });
+  }
+
+  /**
+   * Update the local user object to see if the User has been logged out of
+   * the server, but the front end doesn't know it yet
+   */
+  checkServerLogin(): void {
+    this.userStateService.updateUser().subscribe(user => {
+      if (user === null) {
+        localStorage.removeItem('isLoggedIn');
+      } else {
+        localStorage.setItem('isLoggedIn', 'true');
+      }
+    }, () => {
+      localStorage.removeItem('isLoggedIn');
+    });
+  }
+
+  onLoggedIn() {
+    this.userStateService.updateUser().subscribe(user => {
+      localStorage.setItem('isLoggedIn', 'true');
+      this.router.navigate(['/']);
+    });
+  }
+
+  public get isLoggedIn(): boolean {
+    return localStorage.getItem('isLoggedIn') === 'true';
+  }
+
+  public get redirectUrl(): string {
+    return localStorage.getItem('redirectUrl');
+  }
+
+  public set redirectUrl(url: string) {
+    localStorage.setItem('redirectUrl', url);
+  }
+
+  resetRedirectUrl(): string {
+    const url = localStorage.getItem('redirectUrl');
+    localStorage.removeItem('redirectUrl');
+    return url;
+  }
+
+}
diff --git a/src/app/services/user/user-state.service.ts b/src/app/services/user/user-state.service.ts
new file mode 100644
index 000000000..85a3129a0
--- /dev/null
+++ b/src/app/services/user/user-state.service.ts
@@ -0,0 +1,39 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { User } from '../../models/user.model';
+import { AuscopeApiService } from '../api/auscope-api.service';
+
+
+@Injectable()
+export class UserStateService {
+
+  private _user: BehaviorSubject<User> = new BehaviorSubject(null);
+  public readonly user: Observable<User> = this._user.asObservable();
+
+  constructor(private apiService: AuscopeApiService) {}
+
+  public updateUser(): Observable<User> {
+    return this.apiService.user.pipe(
+      map((user: User) => {
+        // If full name is empty (as with AAF login), use email address as name
+        if (user.fullName === undefined || user.fullName === '') {
+          user.fullName = user.email;
+        }
+        this._user.next(user);
+
+        // TODO: Update bookmarks when we have them
+
+        return user;
+    },
+    // Failure to retrieve User means no User logged in
+    () => {
+      this.removeUser();
+    }));
+  }
+
+  public removeUser() {
+    this._user.next(null);
+  }
+
+}
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index c45caa61b..894ec5da9 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -13,6 +13,7 @@ export const environment = {
   getCSWRecordEndP: 'getKnownLayers.do',
   // portalBaseUrl: 'http://localhost:8080/AuScope-Portal/',
   portalBaseUrl: 'https://au-portal-dev.it.csiro.au/api/',
+  portalProxyUrl: '/api/',
   hostUrl: 'http://localhost:4200/index.htm',
   nVCLAnalyticalUrl: 'https://nvclanalytics.azurewebsites.net/NVCLAnalyticalServices/',
   googleAnalyticsKey: null,
diff --git a/src/extension/img/GitHub_Logo.png b/src/extension/img/GitHub_Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..812b7f22706a330c45408fe4642afd6209c16eaa
GIT binary patch
literal 7899
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

literal 0
HcmV?d00001

diff --git a/src/extension/img/aaf_service_223x54.png b/src/extension/img/aaf_service_223x54.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f001b666ab8e7e37c7443f34e5dcc0d1a3d572b
GIT binary patch
literal 5047
zcmV;o6G-fdP)<h;3K|Lk000e1NJLTq007?r001@!1^@s6N3u+20000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU_SxH1eRCwC#T?>pIRT(}rckk}fcH2Ug
zK0sLeu&q%jpcQ$@Y9W9|vejrLDlH}orl=T+3MPsgEzu}wFdB`apvXg$u5SpfT~v^O
zKnp5`K3qZCrHYpA?za25GydOy&Oi6e+?o5>d++XA&VMtRduPs^IdkU!&i9}H{O4Sy
zoH%jf#EBCpPMkPtx_Gr-5Qbrwt2QT2N~F*8yuOBmj{vuxcAubam8)YXPBP^nZ9TMo
zu^J$H6+j2D-Ey>pZuFjwD(v6sRL9B0O~?f+RLhDr%I{n)hXBCqCj>qNylu42rSC^|
z#f{v$P6d6BI1O@Ax8w+Xt=(T$-rN)La}xpZ@~pIe2Jkv<;2rIo3Z2q8X^a&59#%)b
zw^jw(l3Gvtb#+bPBe@a43xYslJL<vb#7P4sJaR~lY`RPU_yt2|mBD8cc0(x(1%NL+
z>Nf{JC(Quh*gYHZb*|FR%Bq-eJ=15Qpu(5Q$BC0>nV<n}AhWddEh)#&W7Z>cbFwA)
znKqBT*St-skwdh9s|sJ*r@WKi(Cl`~X^NAk$oTdi)!Mnbvs&;?N?#~^W}8w6o{j;F
zkF|H`J><Tx={+4&MC1O4?ow+0@?s`*40)*Im+LeRdrqdC`FZep!Bm&$dA$|E2Pcba
z7Wkh1GlM03<aYiZ-Nk^%TSjd6<S!VMA%NA^!7Rx8wpp=qg<HO^)1Gq$ZC6ej_TWZt
zS+%xUUu0Sow0Th?`L3&??_<3;m(2?=YJB_Vc<V^#{LVKjU%Rfk6OVfpc5Y2AOEt=X
zdz8BlX$m{HaK9x>;8M57v^Y;uw2~H{?qgi<Wz$ugwwC(0%ZX<SQpR&Dy@Ps9&&+3?
zOy&!p{H0RA`GQh&7HQT3pzxhcOEr5Tqab`iS563!3NlVQLwWD|rUr=(K7bMXrCoJ4
z7PVcQ@7fT1`QgECb@-<9Gt-s>A3!B(phWWGJ!*{F-gk3M!8twsZaMQZ2FBqVR>!Wd
z%CtB4sB~R;<XYQfS0dI}mQmnEYP9FN3_x{9&%r<`3%<%}YpH+aCC`a^OM9lQchGEU
z$*lZFf^XBM#9o8Mc(2jFvES9J!3TDO9FSIaq24X)(rM2Ah-S*e1Er?rpMMg8r>^qW
za4A5MTXB9#%ZV1YTq{@ei#c;$40x<CM+TI)U?rEqGj$Qtu^@3@Nn>9Z%O}M%7xq6D
zyH>!Trqp;=8+d$->cnf`Se7jtA@$ThKhyf#)RCLkG`*Y?1|N?*Hwt|8klsuCHE^DN
zR3F>bTQoIcQoia8rJj3Kg|B<3^8WHm4N6J#!1s%0C+)+xeM+e_F4g%O*7NSTLWLjS
zHt`o)Lt3q59g&G5N{Cjqk>JabsTrAc58cKga8XN*P$tvz158IYt&3gTzW!F_8Q{X*
zU8!6Ep5%eN+ppYQR;hEVx??6P(lIEgOekwJrQZ4%0D=Lh8i0Nl6-;Qn?BG5P7Gfm+
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
N002ovPDHLkV1i?wx*Grh

literal 0
HcmV?d00001

diff --git a/src/extension/img/btn_google_signin_dark_normal_web.png b/src/extension/img/btn_google_signin_dark_normal_web.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1327b4f7b47c04368da6c4b066645453398eca5
GIT binary patch
literal 3983
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

literal 0
HcmV?d00001

diff --git a/src/index.htm b/src/index.htm
index 5918fbba0..5dce2d6d8 100644
--- a/src/index.htm
+++ b/src/index.htm
@@ -1,156 +1,44 @@
 <!doctype html>
 <html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>AuScope Discovery Portal</title>
-    <base href="./">
-
-    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport" />
-    <meta content="Auscope Portal" name="description" />
-    <meta content="CSIRO" name="author" />
-
-    <!-- ================== BEGIN BASE CSS STYLE ================== -->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css" integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N" crossorigin="anonymous">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css" rel="stylesheet" />
-    <link href="https://cdn.jsdelivr.net/themify-icons/0.1.2/css/themify-icons.css" rel="stylesheet" />
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.2/animate.min.css" rel="stylesheet" />
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
-    <!-- ================== END BASE CSS STYLE ================== -->
-
-    <!-- ================== BEGIN BASE JS ================== -->
-    <script src="https://use.fontawesome.com/9f193e7fa1.js"></script>
-    <script src="https://apis.google.com/js/client.js"></script>
-    <!-- ================== END BASE JS ================== -->
-
-    <link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png">
-</head>
-  <body>
-		<!-- BEGIN navbar -->
-		<div id="header" class="navbar fixed-top">
-            <!-- BEGIN navbar-header -->
-            <div class="navbar-header">
-                <!-- BEGIN organisation logo -->
-                <span class="navbar-brand">
-                    <img id="org-logo" src="extension/img/auscope_single-colour-1.png">
-                    <span><b>Au</b>Scope Discovery Portal</span>
-                </span>
-                <!-- END organisation logo -->
-
-                <!-- START sidebar toggle -->
-                <!--
-                <button id="sidebar-toggle-btn" class="nav navbar-toggler d-inline d-md-none p-0 mb-0 mt-1" data-toggle="collapse" data-target=".sidebar-collapse">
-                    <div class="nav-index-btn">
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                    </div>
-                    <div class="nav-map-btn">
-                        <i class="ti-world"></i>
-                    </div>
-                </button>
-                -->
-                <!-- END sidebar toggle -->
-            </div>
-            <!-- END navbar-header -->
-
-            <!-- START search-panel -->
-            <app-search-panel></app-search-panel>
-            <!-- END search-panel -->
-
-            <!-- help dropdown menu -->
-            <ul class="nav navbar-nav mb-1 mr-3">
-                <li class="dropdown" app-help-menu></li>
-            </ul>
-		</div>
-		<!-- END navbar -->
-
-		<!-- BEGIN sidebar -->
-		<nav id="sidebar" class="sidebar slimscroll sidebar-collapse show" style="overflow: auto;" >
-            <!--
-			<li class="hasEvent d-none d-md-block" appFilterClipboard></li>
-            -->
-            <li class="hasEvent" appPermanentLink></li>
-
-            <!-- BEGIN Active Layers -->
-            <input type="checkbox" checked class="menuBtn" id="activeLayersBtn"/>
-            <h5 class="mb-1">
-                <label id="activeLayersLink" for="activeLayersBtn" class="mb-0" title="Layers added to map">
-                    <i class="ti-filter"></i>
-                    Active Layers
-                    <i class="fa fa-arrow-circle-down"></i>
-                </label>
-                <ul class="card-sub" appActiveLayers></ul>
-            </h5>
-            <!-- END Active Layers -->
-
-            <!-- BEGIN Featured Layers -->
-            <input type="checkbox" class="menuBtn" id="featuredLayersBtn"/>
-			<h5 class="mb-1">
-				<label id="featuredLayersLink" for="featuredLayersBtn" class="mb-0" title="Select predefined layers">
-				    <i class="ti-layers"></i>
-				    Featured Layers
-                    <i class="fa fa-arrow-circle-down"></i>
-				</label>
-				<ul class="card-sub" appLayerPanel></ul>
-			</h5>
-            <!-- END Featured Layers -->
-
-            <!-- BEGIN Custom Layers -->
-            <input type="checkbox" class="menuBtn" id="customLayersBtn"/>
-			<h5 class="mb-1">
-				<label for="customLayersBtn" class="mb-0" title="Enter a custom WMS endpoint">
-				    <i class="ti-pencil-alt"></i>
-				    Custom Layer
-                    <i class="fa fa-arrow-circle-down"></i>
-				</label>
-				<ul class="card-sub" appCustomPanel></ul>
-			</h5>
-            <!-- END Custom Layers -->
-
-            <!-- BEGIN Data Explorer -->
-            <input type="checkbox" class="menuBtn" id="dataBtn"/>
-            <h5 class="mb-1">
-                <label for="dataBtn" class="mb-0" title="Search CSW services for records">
-                    <i class="ti-book"></i>
-                    Data Search
-                    <i class="fa fa-arrow-circle-down"></i>
-                </label>
-                <ul class="card-sub" appDataExplorer></ul>
-            </h5>
-            <!-- END Data Explorer -->
-            
-            <hr/>
-			<li appPortalDetailsPanel></li>
-		</nav>
-		<!-- END sidebar -->
-
-		<!-- BEGIN #map-area -->
-		<div id="map-area" class="map-area">
-			<!-- BEGIN map-area-csmap -->
-            <div class="map-area-csmap">
-				 <app-cs-map class="h-100 w-100"></app-cs-map>
-            </div>
-			<!-- END map-area-csmap -->
-		</div>
-		<!-- END #content -->
-
-    <!-- Modal window used as a popup when map querying -->
-    <app-querier-modal-window></app-querier-modal-window>
-	<app-layer-modal-window></app-layer-modal-window>
-	<app-disclaimer-modal-window></app-disclaimer-modal-window>
-
-    <!-- ================== BEGIN BASE JS ================== -->
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-migrate/3.0.1/jquery-migrate.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.6.2/js/bootstrap.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery-slimScroll/1.3.8/jquery.slimscroll.min.js"></script>
-    <script> $(document).ready(function(){$('#featuredLayersLink').click();});</script>
-	<!-- ================== END BASE JS ================== -->
-  </body>
+    <head>
+        <meta charset="utf-8">
+        <title>AuScope Discovery Portal</title>
+        <base href="/">
+
+        <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport" />
+        <meta content="Auscope Portal" name="description" />
+        <meta content="CSIRO" name="author" />
+
+        <!-- ================== BEGIN BASE CSS STYLE ================== -->
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css" integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N" crossorigin="anonymous">
+        <link href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css" rel="stylesheet" />
+        <link href="https://cdn.jsdelivr.net/themify-icons/0.1.2/css/themify-icons.css" rel="stylesheet" />
+        <link href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.2/animate.min.css" rel="stylesheet" />
+        <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+        <link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
+        <!-- ================== END BASE CSS STYLE ================== -->
+
+        <!-- ================== BEGIN BASE JS ================== -->
+        <script src="https://use.fontawesome.com/9f193e7fa1.js"></script>
+        <script src="https://apis.google.com/js/client.js"></script>
+        <!-- ================== END BASE JS ================== -->
+
+        <link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png">
+        <link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png">
+    </head>
+    <body>
+
+        <!-- App contains routerOutlet -->
+        <app-component></app-component>
+
+        <!-- ================== BEGIN BASE JS ================== -->
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-migrate/3.0.1/jquery-migrate.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.6.2/js/bootstrap.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery-slimScroll/1.3.8/jquery.slimscroll.min.js"></script>
+        <script> $(document).ready(function(){$('#featuredLayersLink').click();});</script>
+        <!-- ================== END BASE JS ================== -->
+    </body>
 </html>
diff --git a/src/styles.scss b/src/styles.scss
index b1821a382..cdbf41082 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -306,12 +306,6 @@ label {
     }
 
     /* top level menu control in sidebar */
-
-    .menuBtn + h5 > ul {
-        /*opacity: 0.01; max-height: 0px; transition: opacity 1s, max-height 1s;*/
-        display: none;
-    }
-
     .menuBtn:checked + h5 > ul {
         /*opacity: 1; max-height: 999px; transition: opacity 1s, max-height 1s;*/
         display: block;

From 437cdc87d951810b7e96126f46ad1f68c7dc45cb Mon Sep 17 00:00:00 2001
From: "stuart.woodman" <stuart.woodman@csiro.au>
Date: Mon, 6 Feb 2023 10:08:10 +1100
Subject: [PATCH 2/3] Added portalProxyUrl to other dev/production config
 files.

---
 src/environments/environment.au2.ts        | 1 +
 src/environments/environment.dev.ts        | 1 +
 src/environments/environment.prod-https.ts | 1 +
 src/environments/environment.prod.ts       | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/environments/environment.au2.ts b/src/environments/environment.au2.ts
index 914b95b21..58f8d6bf5 100644
--- a/src/environments/environment.au2.ts
+++ b/src/environments/environment.au2.ts
@@ -13,6 +13,7 @@ export const environment = {
   production: true,
   getCSWRecordEndP: 'getKnownLayers.do',
   portalBaseUrl: 'https://au-portal-2.it.csiro.au/api/',
+  portalProxyUrl: '/api/',
   hostUrl: 'https://au-portal-2.it.csiro.au/portal/index.htm',
   nVCLAnalyticalUrl: 'https://nvclanalytics.azurewebsites.net/NVCLAnalyticalServices/',
   googleAnalyticsKey: null,
diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts
index e4ed4a4be..131c734ff 100644
--- a/src/environments/environment.dev.ts
+++ b/src/environments/environment.dev.ts
@@ -13,6 +13,7 @@ export const environment = {
   production: false,
   getCSWRecordEndP: 'getKnownLayers.do',
   portalBaseUrl: 'https://au-portal-dev.it.csiro.au/api/',
+  portalProxyUrl: '/api/',
   hostUrl: 'https://au-portal-dev.it.csiro.au/index.htm',
   nVCLAnalyticalUrl: 'https://nvclanalytics.azurewebsites.net/NVCLAnalyticalServices/',
   googleAnalyticsKey: null,
diff --git a/src/environments/environment.prod-https.ts b/src/environments/environment.prod-https.ts
index d18b51183..29cd83d98 100644
--- a/src/environments/environment.prod-https.ts
+++ b/src/environments/environment.prod-https.ts
@@ -13,6 +13,7 @@ export const environment = {
     production: true,
     getCSWRecordEndP: 'getKnownLayers.do',
     portalBaseUrl: 'https://auscope-portal.geoanalytics.csiro.au/api/',
+    portalProxyUrl: '/api/',
     hostUrl: 'https://auscope-portal.geoanalytics.csiro.au/index.htm',
     nVCLAnalyticalUrl: 'https://nvclanalytics.azurewebsites.net/NVCLAnalyticalServices/',
     googleAnalyticsKey: null,
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 41cdafea1..238a1218b 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -13,6 +13,7 @@ export const environment = {
   production: true,
   getCSWRecordEndP: 'getKnownLayers.do',
   portalBaseUrl: 'http://portal.auscope.org.au/api/',
+  portalProxyUrl: '/api/',
   hostUrl: 'http://portal.auscope.org.au/index.htm',
   nVCLAnalyticalUrl: 'https://nvclanalytics.azurewebsites.net/NVCLAnalyticalServices/',
   googleAnalyticsKey: null,

From 2bb85632bb871a6212656402012822d251dc56be Mon Sep 17 00:00:00 2001
From: "stuart.woodman" <stuart.woodman@csiro.au>
Date: Mon, 6 Feb 2023 10:15:33 +1100
Subject: [PATCH 3/3] Bump version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 774aaf5e7..cd5ab2d75 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "auscope-portal",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "license": "MIT",
   "scripts": {
     "ng": "ng",