pulled in changes from develop so branch can be merged without conflicts

.github/workflows/build_test.web-app.yaml

@@ -39,7 +39,7 @@ jobs:
       - name: pack
         run: |
           npm pack ./web-app/dist/core-lib
-          npm pack ./web-app/dist/app
+          npm pack ./web-app/dist
       - name: upload packages
         uses: actions/upload-artifact@v3
         with:

README.md

@@ -295,7 +295,7 @@ npm run build
 After building the core packages, install them as dependencies in the `instance` package.
 ```bash
 cd instance
-npm i --omit dev ../service ../web-app/dist/app ../plugins/nga-msi
+npm i --omit dev ../service ../web-app/dist ../plugins/nga-msi
 ```
 The project's root [`package.json`](./package.json) provides some convenience script entries to install, build, and run
 the MAGE server components, however, those are deprecated and will likely go away after migrating to NPM 7+'s

instance/package.json

@@ -31,6 +31,6 @@
     "@ngageoint/mage.nga-msi": "../plugins/nga-msi",
     "@ngageoint/mage.random": "../plugins/random",
     "@ngageoint/mage.service": "../service",
-    "@ngageoint/mage.web-app": "../web-app/dist/app"
+    "@ngageoint/mage.web-app": "../web-app/dist"
   }
 }

plugins/arcgis/service/package.json

@@ -38,6 +38,8 @@
   },
   "homepage": "https://github.com/ngageoint/mage-server#readme",
   "dependencies": {
+    "@esri/arcgis-rest-feature-service": "^4.0.6",
+    "@esri/arcgis-rest-request": "^4.2.3",
     "@terraformer/arcgis": "2.1.2",
     "form-data": "^4.0.0"
   },

plugins/arcgis/service/src/ArcGISConfig.ts

@@ -13,6 +13,11 @@ export interface FeatureServiceConfig {
      */
     token?: string
 
+    /**
+     * Username and password for ArcGIS authentication
+     */
+    auth?: ArcGISAuthConfig
+
     /**
      * Create layers that don't exist
      */
@@ -72,6 +77,22 @@ export interface FeatureLayerConfig {
 
 }
 
+/**
+ * Contains username and password for ArcGIS server authentication.
+ */
+export interface ArcGISAuthConfig {
+
+    /**
+     * The username for authentication.
+     */
+    username: string
+
+    /**
+     * The password for authentication.
+     */
+    password: string
+}
+
 /**
  * Attribute configurations
  */