From 93cb3c7bcc1ca7bc30166c0eb5b587ca6f02df62 Mon Sep 17 00:00:00 2001
From: DailisLangovskis <dailis.langovskis@gmail.com>
Date: Fri, 19 Nov 2021 23:00:43 +0200
Subject: [PATCH] fix: Check if user is logged in layman

Directly checking the endpoint without using some variable storing the boolean value
---
 .../src/components/add-data/add-data.service.ts    | 14 +-------------
 .../add-data/common/common-file.service.ts         |  2 +-
 .../vector/vector-file/vector-file.component.ts    |  9 +++++----
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/projects/hslayers/src/components/add-data/add-data.service.ts b/projects/hslayers/src/components/add-data/add-data.service.ts
index 34cfcc77e0..d489298c64 100644
--- a/projects/hslayers/src/components/add-data/add-data.service.ts
+++ b/projects/hslayers/src/components/add-data/add-data.service.ts
@@ -18,7 +18,6 @@ export type DatasetType = 'url' | 'catalogue' | 'file' | 'OWS';
   providedIn: 'root',
 })
 export class HsAddDataService {
-  isAuthorized = false;
   typeSelected: DatasetType;
   //Holds reference to data.url.component type selected
   urlType: AddDataUrlType;
@@ -33,18 +32,7 @@ export class HsAddDataService {
     public hsConfig: HsConfig,
     public hsCommonEndpointsService: HsCommonEndpointsService,
     public hsCommonLaymanService: HsCommonLaymanService
-  ) {
-    const layman = this.hsCommonEndpointsService.endpoints.filter(
-      (ep) => ep.type == 'layman'
-    )[0];
-    if (layman) {
-      this.hsCommonLaymanService.authChange.subscribe((endpoint: any) => {
-        this.isAuthorized = endpoint.authenticated;
-      });
-      this.isAuthorized =
-        layman.user !== 'anonymous' && layman.user !== 'browser';
-    }
-  }
+  ) {}
 
   addLayer(layer: Layer<Source>, underLayer?: Layer<Source>): void {
     if (underLayer) {
diff --git a/projects/hslayers/src/components/add-data/common/common-file.service.ts b/projects/hslayers/src/components/add-data/common/common-file.service.ts
index db357ea068..c9ff2b9295 100644
--- a/projects/hslayers/src/components/add-data/common/common-file.service.ts
+++ b/projects/hslayers/src/components/add-data/common/common-file.service.ts
@@ -315,6 +315,6 @@ export class HsAddDataCommonFileService {
   }
 
   isAuthorized(): boolean {
-    return this.hsAddDataService.isAuthorized;
+    return this.hsLaymanService.getLaymanEndpoint().authenticated;
   }
 }
diff --git a/projects/hslayers/src/components/add-data/vector/vector-file/vector-file.component.ts b/projects/hslayers/src/components/add-data/vector/vector-file/vector-file.component.ts
index 1e6cb9dc15..464cc0ff5f 100644
--- a/projects/hslayers/src/components/add-data/vector/vector-file/vector-file.component.ts
+++ b/projects/hslayers/src/components/add-data/vector/vector-file/vector-file.component.ts
@@ -9,7 +9,6 @@ import {
 
 import {Cluster} from 'ol/source';
 
-import {HsAddDataService} from '../../add-data.service';
 import {HsAddDataVectorService} from '../vector.service';
 import {HsCommonEndpointsService} from '../../../../common/endpoints/endpoints.service';
 import {HsLanguageService} from '../../../language/language.service';
@@ -44,8 +43,7 @@ export class HsAddDataVectorFileComponent implements OnInit, AfterViewInit {
     public hsLayerManagerService: HsLayerManagerService,
     public hsLayerUtilsService: HsLayerUtilsService,
     public hsLayoutService: HsLayoutService,
-    public hsUtilsService: HsUtilsService,
-    public hsAddDataService: HsAddDataService
+    public hsUtilsService: HsUtilsService
   ) {}
   ngAfterViewInit(): void {
     this.vectorFileInput = this.hsUploadComponent.getVectorFileInput();
@@ -139,7 +137,10 @@ export class HsAddDataVectorFileComponent implements OnInit, AfterViewInit {
           this.data.saveAvailable = false;
         } else {
           this.data.saveAvailable = true;
-          this.data.saveToLayman = this.hsAddDataService.isAuthorized;
+          this.data.saveToLayman =
+            this.hsCommonEndpointsService.endpoints.filter(
+              (ep) => ep.type == 'layman'
+            )[0].authenticated;
         }
         //add layman endpoint url as url to allow sync
         if (this.data.url == '' && this.data.saveToLayman) {