geonetwork-ui 2.6.0-dev.01d2b5fc0 → 2.6.0-dev.502fa026d

package/src/libs/util/data-fetcher/src/lib/model.ts

@@ -7,7 +7,14 @@ export class FetchError {
   stack = null
 
   constructor(
-    public type: 'http' | 'network' | 'parse' | 'unsupportedType' | 'unknown',
+    public type:
+      | 'http'
+      | 'forbidden'
+      | 'network'
+      | 'parse'
+      | 'unsupportedType'
+      | 'unknown',
+
     public info: string,
     public httpStatus = 0
   ) {
@@ -20,6 +27,9 @@ ${body}`
       : `${code}`
     return new FetchError('http', info, code)
   }
+  static forbidden(code: number) {
+    return new FetchError('forbidden', '', code)
+  }
   static corsOrNetwork(message: string) {
     return new FetchError('network', message, 0)
   }

package/src/libs/util/data-fetcher/src/lib/readers/wfs.ts

@@ -1,5 +1,5 @@
-import { WfsEndpoint, WfsVersion } from '@camptocamp/ogc-client'
-import { DataItem, DatasetInfo, PropertyInfo } from '../model'
+import { EndpointError, WfsEndpoint, WfsVersion } from '@camptocamp/ogc-client'
+import { DataItem, DatasetInfo, FetchError, PropertyInfo } from '../model'
 import { fetchDataAsText } from '../utils'
 import { GmlReader, parseGml } from './gml'
 import { GeojsonReader, parseGeojson } from './geojson'
@@ -7,6 +7,32 @@ import { BaseCacheReader } from './base-cache'
 import { getJsonDataItemsProxy, jsonToGeojsonFeature } from '../utils'
 import { generateSqlQuery } from '../sql-utils'
 
+export async function getWfsEndpoint(wfsUrl: string): Promise<WfsEndpoint> {
+  try {
+    return await new WfsEndpoint(wfsUrl).isReady()
+  } catch (e) {
+    if (
+      e instanceof Error &&
+      'isCrossOriginRelated' in e &&
+      'httpStatus' in e
+    ) {
+      const error = e as EndpointError
+      if (error.isCrossOriginRelated === true) {
+        throw new Error(`wfs.unreachable.cors`)
+      }
+      if (error.httpStatus === 401 || error.httpStatus === 403) {
+        throw FetchError.forbidden(error.httpStatus)
+      } else if (error.httpStatus === 400 || error.httpStatus > 403) {
+        throw FetchError.http(error.httpStatus)
+      } else {
+        throw FetchError.unknownType()
+      }
+    } else {
+      throw FetchError.unknownType()
+    }
+  }
+}
+
 export class WfsReader extends BaseCacheReader {
   endpoint: WfsEndpoint
   featureTypeName: string
@@ -53,7 +79,7 @@ export class WfsReader extends BaseCacheReader {
   }
 
   static async createReader(wfsUrlEndpoint: string, featureTypeName?: string) {
-    const wfsEndpoint = await new WfsEndpoint(wfsUrlEndpoint).isReady()
+    const wfsEndpoint = await getWfsEndpoint(wfsUrlEndpoint)
     const featureTypes = wfsEndpoint.getFeatureTypes()
     const featureType = wfsEndpoint.getFeatureTypeSummary(
       featureTypes.length === 1 && !featureTypeName

package/translations/de.json

@@ -68,6 +68,7 @@
   "datahub.search.filter.generatedByAPI": "Generiert durch eine API",
   "datahub.search.filter.generatedByWfs": "",
   "datahub.search.filter.others": "Andere",
+  "dataset.error.forbidden": "Der Zugriff auf diese Ressource ist eingeschränkt",
   "dataset.error.http": "Die Daten konnten aufgrund eines HTTP-Fehlers nicht geladen werden: \"{ info }\"",
   "dataset.error.network": "Die Daten konnten aufgrund eines Netzwerkfehlers oder CORS-Beschränkungen nicht geladen werden: \"{ info }\"",
   "dataset.error.parse": "Die Daten wurden geladen, konnten aber nicht gelesen werden: \"{ info }\"",

package/translations/en.json

@@ -68,6 +68,7 @@
   "datahub.search.filter.generatedByAPI": "Generated by an API",
   "datahub.search.filter.generatedByWfs": "",
   "datahub.search.filter.others": "Others",
+  "dataset.error.forbidden": "Access to this resource is restricted",
   "dataset.error.http": "The data could not be loaded because of an HTTP error: \"{ info }\"",
   "dataset.error.network": "The data could not be loaded because of a network error or CORS limitations: \"{ info }\"",
   "dataset.error.parse": "The data was loaded but could not be parsed: \"{ info }\"",

package/translations/es.json

@@ -68,6 +68,7 @@
   "datahub.search.filter.generatedByAPI": "",
   "datahub.search.filter.generatedByWfs": "",
   "datahub.search.filter.others": "",
+  "dataset.error.forbidden": "El acceso a este recurso está restringido",
   "dataset.error.http": "",
   "dataset.error.network": "",
   "dataset.error.parse": "",

package/translations/fr.json

@@ -68,6 +68,7 @@
   "datahub.search.filter.generatedByAPI": "généré par une API",
   "datahub.search.filter.generatedByWfs": "généré par un WFS",
   "datahub.search.filter.others": "Autres",
+  "dataset.error.forbidden": "L’accès à cette ressource est restreint",
   "dataset.error.http": "Le chargement des données a échoué en raison d'une erreur HTTP: \"{ info }\"",
   "dataset.error.network": "Le chargement des données a échoué en raison d'une erreur réseau ou de limitations CORS: \"{ info }\"",
   "dataset.error.parse": "Les données ont été chargées mais leur décodage a échoué: \"{ info }\"",

package/translations/it.json

@@ -68,6 +68,7 @@
   "datahub.search.filter.generatedByAPI": "generato da un'API",
   "datahub.search.filter.generatedByWfs": "generato da un WFS",
   "datahub.search.filter.others": "Altri",
+  "dataset.error.forbidden": "L'accesso a questa risorsa è limitato",
   "dataset.error.http": "Il caricamento dei dati non è riuscito a causa di un errore HTTP: \"{info}\"",
   "dataset.error.network": "Il caricamento dei dati non è riuscito a causa di un errore di rete o di limitazioni CORS: \"{info}\"",
   "dataset.error.parse": "I dati sono stati caricati ma la decodifica non è riuscita: \"{info}\"",

package/translations/nl.json

@@ -68,6 +68,7 @@
   "datahub.search.filter.generatedByAPI": "",
   "datahub.search.filter.generatedByWfs": "",
   "datahub.search.filter.others": "",
+  "dataset.error.forbidden": "",
   "dataset.error.http": "",
   "dataset.error.network": "",
   "dataset.error.parse": "",

package/translations/pt.json

@@ -68,6 +68,7 @@
   "datahub.search.filter.generatedByAPI": "",
   "datahub.search.filter.generatedByWfs": "",
   "datahub.search.filter.others": "",
+  "dataset.error.forbidden": "",
   "dataset.error.http": "",
   "dataset.error.network": "",
   "dataset.error.parse": "",

package/translations/sk.json

@@ -68,6 +68,7 @@
   "datahub.search.filter.generatedByAPI": "vygenerované cez API",
   "datahub.search.filter.generatedByWfs": "",
   "datahub.search.filter.others": "Iné",
+  "dataset.error.forbidden": "",
   "dataset.error.http": "Dáta sa nedajú načítať kvôli chybe HTTP: \"{ info }\"",
   "dataset.error.network": "Dáta sa nedajú načítať kvôli chybe v sieti alebo obmedzeniam CORS: \"{ info }\"",
   "dataset.error.parse": "Dáta boli načítané, ale nedajú sa analyzovať: \"{ info }\"",