Store credentials for Geoserver account with write permissions in base configuration; remove serverConfiguration.json file

Author: tkleinke

Makefile

@@ -28,8 +28,6 @@ build: clean buildinfojson
 
 	cp l10n/$(PLUGIN_NAME).csv build/$(PLUGIN_NAME)/l10n/$(PLUGIN_NAME).csv
 
-	cp serverConfiguration.json build/$(PLUGIN_NAME)/serverConfiguration.json
-
 	cp manifest.master.yml build/$(PLUGIN_NAME)/manifest.yml
 
 	cp build-info.json build/$(PLUGIN_NAME)/build-info.json

l10n/custom-data-type-nfis-geometry.csv

@@ -26,8 +26,10 @@ custom.data.type.nfis.geometry.config.parameter.schema.multi_select.value.checkb
 custom.data.type.nfis.geometry.config.parameter.mask.value.value.label,Nicht ausfüllen,Do not fill in
 server.config.name.system.nfisGeoservices,NFIS-Geodienste,NFIS Geoservices
 server.config.parameter.system.nfisGeoservices.masterportal_url.label,Masterportal-URL,Masterportal URL
-server.config.parameter.system.nfisGeoservices.geoserver_username.label,Geoserver: Username,Geoserver: User name
-server.config.parameter.system.nfisGeoservices.geoserver_password.label,Geoserver: Passwort,Geoserver: Password
+server.config.parameter.system.nfisGeoservices.geoserver_read_username.label,Geoserver-Account (nur Leserechte): Username,Geoserver account (read only): User name
+server.config.parameter.system.nfisGeoservices.geoserver_read_password.label,Geoserver-Account (nur Leserechte): Passwort,Geoserver account (read only): Password
+server.config.parameter.system.nfisGeoservices.geoserver_write_username.label,Geoserver-Account (Schreibrechte): Username,Geoserver account (write): User name
+server.config.parameter.system.nfisGeoservices.geoserver_write_password.label,Geoserver-Account (Schreibrechte): Passwort,Geoserver account (write): Password
 server.config.parameter.system.nfisGeoservices.wfs_configuration.label,Objekttypen,Object types
 server.config.parameter.system.nfisGeoservices.wfs_configuration.object_type.label,Name des Objekttyps,Object type name
 server.config.parameter.system.nfisGeoservices.wfs_configuration.geometry_fields.label,Geometrie-Felder,Geometry fields

manifest.master.yml

@@ -40,12 +40,18 @@ base_config:
       masterportal_url:
         type: text
         position: 0
-      geoserver_username:
+      geoserver_read_username:
         type: text
-        position: 2
-      geoserver_password:
+        position: 1
+      geoserver_read_password:
         type: text
+        position: 2
+      geoserver_write_username:
+        type: secret
         position: 3
+      geoserver_write_password:
+        type: secret
+        position: 4
       wfs_configuration:
         type: table
         fields:
@@ -119,7 +125,7 @@ base_config:
                     position: 0
                 position: 13
             position: 1
-        position: 4
+        position: 5
 
 callbacks:
   db_pre_save:

serverConfiguration.json.template

@@ -1,5 +1,3 @@
-const serverConfiguration = require('../serverConfiguration.json');
-
 const info = process.argv.length >= 3
     ? JSON.parse(process.argv[2])
     : {};
@@ -17,7 +15,7 @@ process.stdin.on('data', d => {
 process.stdin.on('end', async () => {
     const data = JSON.parse(input);
     const configuration = getPluginConfiguration();
-    const authorizationString = getAuthorizationString(serverConfiguration);
+    const authorizationString = getAuthorizationString(configuration);
 
     for (let object of data.objects) {
         await updateObject(
@@ -45,9 +43,9 @@ function getWFSConfiguration(configuration, objectType) {
     return wfsConfiguration?.find(configuration => configuration.object_type === objectType);
 }
 
-function getAuthorizationString(serverConfiguration) {
-    const username = serverConfiguration.geoserver.username;
-    const password = serverConfiguration.geoserver.password;
+function getAuthorizationString(configuration) {
+    const username = configuration.geoserver_write_username;
+    const password = configuration.geoserver_write_password;
 
     return btoa(username + ':' + password);
 }

src/server/sendDataToGeoserver.js

@@ -628,8 +628,8 @@ function getWfsUrl(settings, geometryIds) {
 }
 
 function getAuthorizationString() {
-    const username = getBaseConfiguration().geoserver_username;
-    const password = getBaseConfiguration().geoserver_password;
+    const username = getBaseConfiguration().geoserver_read_username;
+    const password = getBaseConfiguration().geoserver_read_password;
 
     return 'Basic ' + window.btoa(username + ':' + password);
 }