From 2ff770166f4874c91bb30d03b3612dfec2833d6e Mon Sep 17 00:00:00 2001
From: Stijn Taelemans <stijn@digita.ai>
Date: Wed, 1 Dec 2021 15:26:38 +0100
Subject: [PATCH 1/7] feat: implement image upload

---
 packages/solid-crs-client/lib/index.ts        |    2 +-
 .../lib/collections/collection-object.ts      |    5 +
 .../solid/collection-object-solid-store.ts    |   29 +-
 packages/solid-crs-core/package-lock.json     |  857 +++++++++-
 .../features/object/object-root.component.ts  |   31 +-
 .../solid-crs-manage/lib/public/nl-NL.json    |    3 +-
 .../lib/object-creation.component.ts          |    2 +-
 .../lib/object-dimensions.component.ts        |    2 +-
 .../lib/object-identification.component.ts    |    2 +-
 .../lib/object-imagery.component.ts           |  100 +-
 .../lib/object-representation.component.ts    |    2 +-
 .../package-lock.json                         | 1392 ++++++++++++++---
 .../solid-crs-semcom-components/package.json  |    1 +
 13 files changed, 2143 insertions(+), 285 deletions(-)

diff --git a/packages/solid-crs-client/lib/index.ts b/packages/solid-crs-client/lib/index.ts
index db48b0a8..342388d1 100644
--- a/packages/solid-crs-client/lib/index.ts
+++ b/packages/solid-crs-client/lib/index.ts
@@ -1,2 +1,2 @@
 export { login, handleIncomingRedirect, logout, fetch, getDefaultSession } from '@inrupt/solid-client-authn-browser';
-export { getSolidDataset, getThing, getStringNoLocale, getStringNoLocaleAll, getUrl, getStringByLocaleAll, getStringWithLocale, getStringWithLocaleAll, getThingAll, getUrlAll, removeAll, removeThing, saveSolidDatasetAt, setThing, removeUrl, Thing, addStringWithLocale, addStringNoLocale, addUrl, addDatetime, getDatetime, createThing, asUrl, overwriteFile, deleteFile, ThingPersisted, getInteger, addInteger, access, addDecimal, getDecimal, SolidDataset, createSolidDataset } from '@inrupt/solid-client';
+export { getSolidDataset, getThing, getStringNoLocale, getStringNoLocaleAll, getUrl, getStringByLocaleAll, getStringWithLocale, getStringWithLocaleAll, getThingAll, getUrlAll, removeAll, removeThing, saveSolidDatasetAt, setThing, removeUrl, Thing, addStringWithLocale, addStringNoLocale, addUrl, addDatetime, getDatetime, createThing, asUrl, overwriteFile, deleteFile, ThingPersisted, getInteger, addInteger, access, addDecimal, getDecimal, SolidDataset, createSolidDataset, saveFileInContainer } from '@inrupt/solid-client';
diff --git a/packages/solid-crs-core/lib/collections/collection-object.ts b/packages/solid-crs-core/lib/collections/collection-object.ts
index f485b950..5e2c5a7b 100644
--- a/packages/solid-crs-core/lib/collections/collection-object.ts
+++ b/packages/solid-crs-core/lib/collections/collection-object.ts
@@ -145,6 +145,11 @@ export interface CollectionObject extends Resource {
    */
   image: string;
 
+  /**
+   * The image file to be uploaded to the pod
+   */
+  imageFile: File;
+
   /**
    * A link to the digital representation of this object.
    */
diff --git a/packages/solid-crs-core/lib/solid/collection-object-solid-store.ts b/packages/solid-crs-core/lib/solid/collection-object-solid-store.ts
index 296591fd..b31defb5 100644
--- a/packages/solid-crs-core/lib/solid/collection-object-solid-store.ts
+++ b/packages/solid-crs-core/lib/solid/collection-object-solid-store.ts
@@ -1,4 +1,4 @@
-import { getUrl, getSolidDataset, getThing, getStringWithLocale, getThingAll, asUrl, ThingPersisted, fetch, createThing, addStringNoLocale, addUrl, addStringWithLocale, getStringNoLocale, saveSolidDatasetAt, setThing, removeThing, getDecimal, addDecimal, SolidDataset, getUrlAll, Thing } from '@netwerk-digitaal-erfgoed/solid-crs-client';
+import { getUrl, getSolidDataset, getThing, getStringWithLocale, getThingAll, asUrl, ThingPersisted, fetch, createThing, addStringNoLocale, addUrl, addStringWithLocale, getStringNoLocale, saveSolidDatasetAt, setThing, removeThing, getDecimal, addDecimal, SolidDataset, getUrlAll, saveFileInContainer } from '@netwerk-digitaal-erfgoed/solid-crs-client';
 import { v4, v5 } from 'uuid';
 import { Collection } from '../collections/collection';
 import { CollectionObject } from '../collections/collection-object';
@@ -315,6 +315,13 @@ export class CollectionObjectSolidStore implements CollectionObjectStore {
 
     });
 
+    // upload the image if a file is set and update image URI
+    if (object.imageFile) {
+
+      object.image = await this.uploadImage(object.imageFile, object.image);
+
+    }
+
     const {
       object: objectThing,
       digitalObject: digitalObjectThing,
@@ -684,6 +691,26 @@ export class CollectionObjectSolidStore implements CollectionObjectStore {
 
   }
 
+  /**
+   * Uploads an image file to an 'images' directory next to the collection object.
+   *
+   * @param imageFile The image file to upload.
+   * @param objectUri The URI of the related object.
+   *
+   * @returns The URI of the uploaded image.
+   */
+  async uploadImage(imageFile: File, objectUri: string): Promise<string> {
+
+    const savedFile = await saveFileInContainer(
+      `${new URL(objectUri).origin}${new URL(objectUri).pathname.split('/').slice(0, -1).join('/')}/`,
+      imageFile,
+      { slug: imageFile.name, contentType: imageFile.type, fetch }
+    );
+
+    return savedFile.internal_resourceInfo.sourceIri;
+
+  }
+
   /**
    * Retrieves the URI of the digital object for a given CollectionObject
    *
diff --git a/packages/solid-crs-core/package-lock.json b/packages/solid-crs-core/package-lock.json
index a7cf7f21..0c5b1fd2 100644
--- a/packages/solid-crs-core/package-lock.json
+++ b/packages/solid-crs-core/package-lock.json
@@ -532,6 +532,86 @@
 				}
 			}
 		},
+		"@inrupt/jose-legacy-modules": {
+			"version": "0.0.3-3.15.4",
+			"resolved": "https://registry.npmjs.org/@inrupt/jose-legacy-modules/-/jose-legacy-modules-0.0.3-3.15.4.tgz",
+			"integrity": "sha512-gcmIqLLFyhNZWw9OKK3kNgEbpKU0z6kn6NPWQlJf0Dy5QtuIgwcS7aRU2GJScz+Dx9KGQVvyAapYX3buHyrBXw==",
+			"requires": {
+				"jose": "3.15.4"
+			},
+			"dependencies": {
+				"jose": {
+					"version": "3.15.4",
+					"resolved": "https://registry.npmjs.org/jose/-/jose-3.15.4.tgz",
+					"integrity": "sha512-SXeGi+g5ZcNgV6o7f+Mx3Q1gaYMSBzAi3cmcZPxoeCEZPgfSCnnyfmMXzXoLDh+XL4KMtGvhOsYBoqQhnuR2rQ=="
+				}
+			}
+		},
+		"@inrupt/oidc-client-ext": {
+			"version": "1.11.2",
+			"resolved": "https://registry.npmjs.org/@inrupt/oidc-client-ext/-/oidc-client-ext-1.11.2.tgz",
+			"integrity": "sha512-htdqsFnLOSUhi+AkhyYCTA1vjUsZT8TeQOiXEtLDgneCRxwxCGfRwVSgXSC30OeophlgrZ7/QVixaz3BB5yXEA==",
+			"requires": {
+				"@inrupt/jose-legacy-modules": "0.0.3-3.15.4",
+				"@inrupt/solid-client-authn-core": "^1.11.2",
+				"@types/uuid": "^8.3.0",
+				"form-urlencoded": "~6.0.3",
+				"oidc-client": "^1.11.3",
+				"uuid": "^8.3.1"
+			},
+			"dependencies": {
+				"form-urlencoded": {
+					"version": "6.0.5",
+					"resolved": "https://registry.npmjs.org/form-urlencoded/-/form-urlencoded-6.0.5.tgz",
+					"integrity": "sha512-7M7IhZNujsHqjYovM1WTSqcAVOqfvgF8acu6ok1ct1a00l6LVrmagJKkOdRUH/PYKEDOZ7ZAw/Mtq1/Q8CuRTQ=="
+				}
+			}
+		},
+		"@inrupt/solid-client": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/@inrupt/solid-client/-/solid-client-1.6.1.tgz",
+			"integrity": "sha512-fTU30u73Re+vl7Rn4+U6jgodCtaLNGjlgLgiHivArsczApCf+fzh5MqD6uZlf0kRKsZpHm6q+7n5JRwBhOr/8Q==",
+			"requires": {
+				"@rdfjs/dataset": "^1.0.1",
+				"@types/n3": "^1.1.6",
+				"@types/rdf-js": "^4.0.0",
+				"@types/rdfjs__dataset": "^1.0.2",
+				"cross-fetch": "^3.0.4",
+				"http-link-header": "^1.0.2",
+				"n3": "1.8.1"
+			},
+			"dependencies": {
+				"n3": {
+					"version": "1.8.1",
+					"resolved": "https://registry.npmjs.org/n3/-/n3-1.8.1.tgz",
+					"integrity": "sha512-oS0XBNhHH+1TFByvJs84q2lsy3MqpkIeLNT8r9OPyblcvcQbZHcKspwdVcWWzNrlMpSHmbOG1KO5AbXy2++Csw==",
+					"requires": {
+						"queue-microtask": "^1.1.2",
+						"readable-stream": "^3.6.0"
+					}
+				}
+			}
+		},
+		"@inrupt/solid-client-authn-core": {
+			"version": "1.11.2",
+			"resolved": "https://registry.npmjs.org/@inrupt/solid-client-authn-core/-/solid-client-authn-core-1.11.2.tgz",
+			"integrity": "sha512-hL+BC81lE4V0EXZE8PJ418y/vFvW+rfcmHgHqi0ZKSSxLNVE08Ok4W2d+g6wcW3wyePZ9FOL2K8BIh7/jCGj8Q==",
+			"requires": {
+				"@inrupt/jose-legacy-modules": "0.0.3-3.15.4",
+				"@inrupt/solid-common-vocab": "^1.0.0",
+				"@types/lodash.clonedeep": "^4.5.6",
+				"@types/uuid": "^8.3.0",
+				"cross-fetch": "^3.0.6",
+				"events": "^3.3.0",
+				"lodash.clonedeep": "^4.5.0",
+				"uuid": "^8.3.1"
+			}
+		},
+		"@inrupt/solid-common-vocab": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@inrupt/solid-common-vocab/-/solid-common-vocab-1.0.0.tgz",
+			"integrity": "sha512-LcImhJqqPsNl/OlULzEEK2rYevty0eh1zaOLVz3lnydEU1DQkeaJ8fKBxKdp5/QjCtnIYcaDjh5U11PGh29Dgg=="
+		},
 		"@istanbuljs/load-nyc-config": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -751,6 +831,122 @@
 				"chalk": "^4.0.0"
 			}
 		},
+		"@netwerk-digitaal-erfgoed/solid-crs-client": {
+			"version": "0.11.0",
+			"resolved": "https://npm.pkg.github.com/download/@netwerk-digitaal-erfgoed/solid-crs-client/0.11.0/ad896fdc991380f96581aac07887b03cc7c2079c3f87b7361ddefff0e1a04b15",
+			"integrity": "sha512-AIxMybp3EqfIAOcvPht95SRhH0YrteUh3+JJNWJf7Gq4xe1kcdsXYkv1lCYKZ+ZgbMfSxoMAb60on+fwhDiEcA==",
+			"requires": {
+				"@inrupt/solid-client": "1.6.1",
+				"@inrupt/solid-client-authn-browser": "1.11.2",
+				"@peculiar/webcrypto": "^1.1.7",
+				"buffer": "^6.0.3",
+				"crypto": "^1.0.1",
+				"crypto-browserify": "^3.12.0",
+				"process": "^0.11.10",
+				"rxjs": "^6.6.7",
+				"stream-browserify": "^3.0.0",
+				"util": "^0.12.4"
+			},
+			"dependencies": {
+				"@inrupt/solid-client-authn-browser": {
+					"version": "1.11.2",
+					"resolved": "https://registry.npmjs.org/@inrupt/solid-client-authn-browser/-/solid-client-authn-browser-1.11.2.tgz",
+					"integrity": "sha512-DifF7hSMuFEB9+lDAYjRq6E7DOIZjQwdk9gUkPj93tdIb4icHXQ9JTMwBAxXmdTruPC2g5Pzu0PQ0PCvbIpuDA==",
+					"requires": {
+						"@inrupt/jose-legacy-modules": "0.0.3-3.15.4",
+						"@inrupt/oidc-client-ext": "^1.11.2",
+						"@inrupt/solid-client-authn-core": "^1.11.2",
+						"@types/lodash.clonedeep": "^4.5.6",
+						"@types/node": "^15.0.1",
+						"@types/uuid": "^8.3.0",
+						"events": "^3.3.0",
+						"lodash.clonedeep": "^4.5.0",
+						"uuid": "^8.3.1"
+					}
+				},
+				"@types/node": {
+					"version": "15.14.9",
+					"resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz",
+					"integrity": "sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A=="
+				}
+			}
+		},
+		"@peculiar/asn1-schema": {
+			"version": "2.0.44",
+			"resolved": "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.0.44.tgz",
+			"integrity": "sha512-uaCnjQ9A9WwQSMuDJcNOCYEPXTahgKbFMvI7eMOMd8lXgx0J1eU7F3BoMsK5PFxa3dVUxjSQbaOjfgGoeHGgoQ==",
+			"requires": {
+				"@types/asn1js": "^2.0.2",
+				"asn1js": "^2.1.1",
+				"pvtsutils": "^1.2.1",
+				"tslib": "^2.3.0"
+			},
+			"dependencies": {
+				"tslib": {
+					"version": "2.3.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+					"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+				}
+			}
+		},
+		"@peculiar/json-schema": {
+			"version": "1.1.12",
+			"resolved": "https://registry.npmjs.org/@peculiar/json-schema/-/json-schema-1.1.12.tgz",
+			"integrity": "sha512-coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w==",
+			"requires": {
+				"tslib": "^2.0.0"
+			},
+			"dependencies": {
+				"tslib": {
+					"version": "2.3.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+					"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+				}
+			}
+		},
+		"@peculiar/webcrypto": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/@peculiar/webcrypto/-/webcrypto-1.2.3.tgz",
+			"integrity": "sha512-q7wDfZy3k/tpnsYB23/MyyDkjn6IdHh8w+xwoVMS5cu6CjVoFzngXDZEOOuSE4zus2yO6ciQhhHxd4XkLpwVnQ==",
+			"requires": {
+				"@peculiar/asn1-schema": "^2.0.44",
+				"@peculiar/json-schema": "^1.1.12",
+				"pvtsutils": "^1.2.1",
+				"tslib": "^2.3.1",
+				"webcrypto-core": "^1.4.0"
+			},
+			"dependencies": {
+				"tslib": {
+					"version": "2.3.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+					"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+				}
+			}
+		},
+		"@rdfjs/data-model": {
+			"version": "1.3.4",
+			"resolved": "https://registry.npmjs.org/@rdfjs/data-model/-/data-model-1.3.4.tgz",
+			"integrity": "sha512-iKzNcKvJotgbFDdti7GTQDCYmL7GsGldkYStiP0K8EYtN7deJu5t7U11rKTz+nR7RtesUggT+lriZ7BakFv8QQ==",
+			"requires": {
+				"@rdfjs/types": ">=1.0.1"
+			}
+		},
+		"@rdfjs/dataset": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/@rdfjs/dataset/-/dataset-1.1.1.tgz",
+			"integrity": "sha512-BNwCSvG0cz0srsG5esq6CQKJc1m8g/M0DZpLuiEp0MMpfwguXX7VeS8TCg4UUG3DV/DqEvhy83ZKSEjdsYseeA==",
+			"requires": {
+				"@rdfjs/data-model": "^1.2.0"
+			}
+		},
+		"@rdfjs/types": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@rdfjs/types/-/types-1.0.1.tgz",
+			"integrity": "sha512-YxVkH0XrCNG3MWeZxfg596GFe+oorTVusmNxRP6ZHTsGczZ8AGvG3UchRNkg3Fy4MyysI7vBAA5YZbESL+VmHQ==",
+			"requires": {
+				"@types/node": "*"
+			}
+		},
 		"@sinonjs/commons": {
 			"version": "1.8.3",
 			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
@@ -775,6 +971,11 @@
 			"integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
 			"dev": true
 		},
+		"@types/asn1js": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/@types/asn1js/-/asn1js-2.0.2.tgz",
+			"integrity": "sha512-t4YHCgtD+ERvH0FyxvNlYwJ2ezhqw7t+Ygh4urQ7dJER8i185JPv6oIM3ey5YQmGN6Zp9EMbpohkjZi9t3UxwA=="
+		},
 		"@types/babel__core": {
 			"version": "7.1.14",
 			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.14.tgz",
@@ -859,11 +1060,32 @@
 				"pretty-format": "^26.0.0"
 			}
 		},
+		"@types/lodash": {
+			"version": "4.14.177",
+			"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz",
+			"integrity": "sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw=="
+		},
+		"@types/lodash.clonedeep": {
+			"version": "4.5.6",
+			"resolved": "https://registry.npmjs.org/@types/lodash.clonedeep/-/lodash.clonedeep-4.5.6.tgz",
+			"integrity": "sha512-cE1jYr2dEg1wBImvXlNtp0xDoS79rfEdGozQVgliDZj1uERH4k+rmEMTudP9b4VQ8O6nRb5gPqft0QzEQGMQgA==",
+			"requires": {
+				"@types/lodash": "*"
+			}
+		},
+		"@types/n3": {
+			"version": "1.10.4",
+			"resolved": "https://registry.npmjs.org/@types/n3/-/n3-1.10.4.tgz",
+			"integrity": "sha512-FfRTwcbXcScVHuAjIASveRWL6Fi6fPALl1Ge8tMESYLqU7R42LJvtdBpUi+f9YK0oQPqIN+zFFgMDFJfLMx0bg==",
+			"requires": {
+				"@types/node": "*",
+				"rdf-js": "^4.0.2"
+			}
+		},
 		"@types/node": {
 			"version": "14.17.1",
 			"resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.1.tgz",
-			"integrity": "sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw==",
-			"dev": true
+			"integrity": "sha512-/tpUyFD7meeooTRwl3sYlihx2BrJE7q9XF71EguPFIySj9B7qgnRtHsHTho+0AUm4m1SvWGm6uSncrR94q6Vtw=="
 		},
 		"@types/node-gettext": {
 			"version": "3.0.2",
@@ -889,6 +1111,22 @@
 			"integrity": "sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==",
 			"dev": true
 		},
+		"@types/rdf-js": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/@types/rdf-js/-/rdf-js-4.0.2.tgz",
+			"integrity": "sha512-soR/+RMogGiDU1lrpuQl5ZL55/L1eq/JlR2dWx052Uh/RYs9okh3XZHFlIJXHZqjqyjEn4WdbOMfBj7vvc2WVQ==",
+			"requires": {
+				"rdf-js": "*"
+			}
+		},
+		"@types/rdfjs__dataset": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/@types/rdfjs__dataset/-/rdfjs__dataset-1.0.5.tgz",
+			"integrity": "sha512-8OBC9Kr/ZSgNoUTe5mHTDPHaPt8Xen4XbYfqcbYv56d+4WdKliHXaFmFc0L4I5vsynE5JGu21Hvg2zWgX1Az6Q==",
+			"requires": {
+				"rdf-js": "^4.0.2"
+			}
+		},
 		"@types/stack-utils": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
@@ -898,8 +1136,7 @@
 		"@types/uuid": {
 			"version": "8.3.0",
 			"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.0.tgz",
-			"integrity": "sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ==",
-			"dev": true
+			"integrity": "sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ=="
 		},
 		"@types/yargs": {
 			"version": "15.0.13",
@@ -925,8 +1162,7 @@
 		"acorn": {
 			"version": "7.4.1",
 			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-			"dev": true
+			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
 		},
 		"acorn-globals": {
 			"version": "6.0.0",
@@ -1068,6 +1304,32 @@
 			"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
 			"dev": true
 		},
+		"asn1.js": {
+			"version": "5.4.1",
+			"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+			"integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+			"requires": {
+				"bn.js": "^4.0.0",
+				"inherits": "^2.0.1",
+				"minimalistic-assert": "^1.0.0",
+				"safer-buffer": "^2.1.0"
+			},
+			"dependencies": {
+				"bn.js": {
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+				}
+			}
+		},
+		"asn1js": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/asn1js/-/asn1js-2.1.1.tgz",
+			"integrity": "sha512-t9u0dU0rJN4ML+uxgN6VM2Z4H5jWIYm0w8LsZLzMJaQsgL3IJNbxHgmbWDvJAwspyHpDFuzUaUFh4c05UB4+6g==",
+			"requires": {
+				"pvutils": "^1.0.17"
+			}
+		},
 		"assign-symbols": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -1095,8 +1357,7 @@
 		"available-typed-arrays": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz",
-			"integrity": "sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA==",
-			"dev": true
+			"integrity": "sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA=="
 		},
 		"babel-jest": {
 			"version": "26.6.3",
@@ -1230,6 +1491,16 @@
 				}
 			}
 		},
+		"base64-js": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+			"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+		},
+		"bn.js": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+			"integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw=="
+		},
 		"brace-expansion": {
 			"version": "1.1.11",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -1249,12 +1520,83 @@
 				"fill-range": "^7.0.1"
 			}
 		},
+		"brorand": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+			"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
+		},
 		"browser-process-hrtime": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
 			"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
 			"dev": true
 		},
+		"browserify-aes": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+			"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+			"requires": {
+				"buffer-xor": "^1.0.3",
+				"cipher-base": "^1.0.0",
+				"create-hash": "^1.1.0",
+				"evp_bytestokey": "^1.0.3",
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.0.1"
+			}
+		},
+		"browserify-cipher": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+			"integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+			"requires": {
+				"browserify-aes": "^1.0.4",
+				"browserify-des": "^1.0.0",
+				"evp_bytestokey": "^1.0.0"
+			}
+		},
+		"browserify-des": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+			"integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+			"requires": {
+				"cipher-base": "^1.0.1",
+				"des.js": "^1.0.0",
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.1.2"
+			}
+		},
+		"browserify-rsa": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+			"integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+			"requires": {
+				"bn.js": "^5.0.0",
+				"randombytes": "^2.0.1"
+			}
+		},
+		"browserify-sign": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+			"integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+			"requires": {
+				"bn.js": "^5.1.1",
+				"browserify-rsa": "^4.0.1",
+				"create-hash": "^1.2.0",
+				"create-hmac": "^1.1.7",
+				"elliptic": "^6.5.3",
+				"inherits": "^2.0.4",
+				"parse-asn1": "^5.1.5",
+				"readable-stream": "^3.6.0",
+				"safe-buffer": "^5.2.0"
+			},
+			"dependencies": {
+				"safe-buffer": {
+					"version": "5.2.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+				}
+			}
+		},
 		"browserslist": {
 			"version": "4.16.6",
 			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
@@ -1277,12 +1619,26 @@
 				"node-int64": "^0.4.0"
 			}
 		},
+		"buffer": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+			"integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+			"requires": {
+				"base64-js": "^1.3.1",
+				"ieee754": "^1.2.1"
+			}
+		},
 		"buffer-from": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
 			"integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
 			"dev": true
 		},
+		"buffer-xor": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+			"integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
+		},
 		"cache-base": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
@@ -1304,7 +1660,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
 			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-			"dev": true,
 			"requires": {
 				"function-bind": "^1.1.1",
 				"get-intrinsic": "^1.0.2"
@@ -1359,6 +1714,15 @@
 			"integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
 			"dev": true
 		},
+		"cipher-base": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+			"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+			"requires": {
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.0.1"
+			}
+		},
 		"cjs-module-lexer": {
 			"version": "0.6.0",
 			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
@@ -1522,6 +1886,11 @@
 			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
 			"dev": true
 		},
+		"core-js": {
+			"version": "3.19.2",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.2.tgz",
+			"integrity": "sha512-ciYCResnLIATSsXuXnIOH4CbdfgV+H1Ltg16hJFN7/v6OxqnFr/IFGeLacaZ+fHLAm0TBbXwNK9/DNBzBUrO/g=="
+		},
 		"cosmiconfig": {
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
@@ -1535,6 +1904,47 @@
 				"yaml": "^1.10.0"
 			}
 		},
+		"create-ecdh": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+			"integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+			"requires": {
+				"bn.js": "^4.1.0",
+				"elliptic": "^6.5.3"
+			},
+			"dependencies": {
+				"bn.js": {
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+				}
+			}
+		},
+		"create-hash": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+			"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+			"requires": {
+				"cipher-base": "^1.0.1",
+				"inherits": "^2.0.1",
+				"md5.js": "^1.3.4",
+				"ripemd160": "^2.0.1",
+				"sha.js": "^2.4.0"
+			}
+		},
+		"create-hmac": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+			"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+			"requires": {
+				"cipher-base": "^1.0.3",
+				"create-hash": "^1.1.0",
+				"inherits": "^2.0.1",
+				"ripemd160": "^2.0.0",
+				"safe-buffer": "^5.0.1",
+				"sha.js": "^2.4.8"
+			}
+		},
 		"create-require": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
@@ -1545,7 +1955,6 @@
 			"version": "3.1.4",
 			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz",
 			"integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
-			"dev": true,
 			"requires": {
 				"node-fetch": "2.6.1"
 			}
@@ -1564,8 +1973,30 @@
 		"crypto": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/crypto/-/crypto-1.0.1.tgz",
-			"integrity": "sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig==",
-			"dev": true
+			"integrity": "sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig=="
+		},
+		"crypto-browserify": {
+			"version": "3.12.0",
+			"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+			"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+			"requires": {
+				"browserify-cipher": "^1.0.0",
+				"browserify-sign": "^4.0.0",
+				"create-ecdh": "^4.0.0",
+				"create-hash": "^1.1.0",
+				"create-hmac": "^1.1.0",
+				"diffie-hellman": "^5.0.0",
+				"inherits": "^2.0.1",
+				"pbkdf2": "^3.0.3",
+				"public-encrypt": "^4.0.0",
+				"randombytes": "^2.0.0",
+				"randomfill": "^1.0.3"
+			}
+		},
+		"crypto-js": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
+			"integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
 		},
 		"cssom": {
 			"version": "0.4.4",
@@ -1650,7 +2081,6 @@
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
 			"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-			"dev": true,
 			"requires": {
 				"object-keys": "^1.0.12"
 			}
@@ -1702,6 +2132,15 @@
 			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
 			"dev": true
 		},
+		"des.js": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+			"integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+			"requires": {
+				"inherits": "^2.0.1",
+				"minimalistic-assert": "^1.0.0"
+			}
+		},
 		"detect-newline": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
@@ -1720,6 +2159,23 @@
 			"integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
 			"dev": true
 		},
+		"diffie-hellman": {
+			"version": "5.0.3",
+			"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+			"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+			"requires": {
+				"bn.js": "^4.1.0",
+				"miller-rabin": "^4.0.0",
+				"randombytes": "^2.0.0"
+			},
+			"dependencies": {
+				"bn.js": {
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+				}
+			}
+		},
 		"doctrine": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -1752,6 +2208,27 @@
 			"integrity": "sha512-P/B84AgUSQXaum7a8m11HUsYL8tj9h/Pt5f7Hg7Ty6bm5DxlFq+e5+ouHUoNQMsKDJ7u4yGfI8mOErCmSH9wyg==",
 			"dev": true
 		},
+		"elliptic": {
+			"version": "6.5.4",
+			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+			"integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+			"requires": {
+				"bn.js": "^4.11.9",
+				"brorand": "^1.1.0",
+				"hash.js": "^1.0.0",
+				"hmac-drbg": "^1.0.1",
+				"inherits": "^2.0.4",
+				"minimalistic-assert": "^1.0.1",
+				"minimalistic-crypto-utils": "^1.0.1"
+			},
+			"dependencies": {
+				"bn.js": {
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+				}
+			}
+		},
 		"emittery": {
 			"version": "0.7.2",
 			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
@@ -1795,7 +2272,6 @@
 			"version": "1.18.5",
 			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
 			"integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
-			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
 				"es-to-primitive": "^1.2.1",
@@ -1820,7 +2296,6 @@
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
 			"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-			"dev": true,
 			"requires": {
 				"is-callable": "^1.1.4",
 				"is-date-object": "^1.0.1",
@@ -2062,6 +2537,20 @@
 			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
 			"dev": true
 		},
+		"events": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
+		},
+		"evp_bytestokey": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+			"requires": {
+				"md5.js": "^1.3.4",
+				"safe-buffer": "^5.1.1"
+			}
+		},
 		"exec-sh": {
 			"version": "0.3.6",
 			"resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
@@ -2387,8 +2876,7 @@
 		"foreach": {
 			"version": "2.0.5",
 			"resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-			"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
-			"dev": true
+			"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
 		},
 		"form-data": {
 			"version": "3.0.1",
@@ -2426,8 +2914,7 @@
 		"function-bind": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-			"dev": true
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
 		},
 		"functional-red-black-tree": {
 			"version": "1.0.1",
@@ -2451,7 +2938,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
 			"integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-			"dev": true,
 			"requires": {
 				"function-bind": "^1.1.1",
 				"has": "^1.0.3",
@@ -2542,7 +3028,6 @@
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
 			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-			"dev": true,
 			"requires": {
 				"function-bind": "^1.1.1"
 			}
@@ -2550,8 +3035,7 @@
 		"has-bigints": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-			"integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-			"dev": true
+			"integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="
 		},
 		"has-flag": {
 			"version": "4.0.0",
@@ -2562,14 +3046,12 @@
 		"has-symbols": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-			"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-			"dev": true
+			"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
 		},
 		"has-tostringtag": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
 			"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-			"dev": true,
 			"requires": {
 				"has-symbols": "^1.0.2"
 			}
@@ -2626,6 +3108,42 @@
 				}
 			}
 		},
+		"hash-base": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+			"integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+			"requires": {
+				"inherits": "^2.0.4",
+				"readable-stream": "^3.6.0",
+				"safe-buffer": "^5.2.0"
+			},
+			"dependencies": {
+				"safe-buffer": {
+					"version": "5.2.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+				}
+			}
+		},
+		"hash.js": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+			"requires": {
+				"inherits": "^2.0.3",
+				"minimalistic-assert": "^1.0.1"
+			}
+		},
+		"hmac-drbg": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+			"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+			"requires": {
+				"hash.js": "^1.0.3",
+				"minimalistic-assert": "^1.0.0",
+				"minimalistic-crypto-utils": "^1.0.1"
+			}
+		},
 		"hosted-git-info": {
 			"version": "2.8.9",
 			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
@@ -2647,6 +3165,11 @@
 			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
 			"dev": true
 		},
+		"http-link-header": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/http-link-header/-/http-link-header-1.0.3.tgz",
+			"integrity": "sha512-nARK1wSKoBBrtcoESlHBx36c1Ln/gnbNQi1eB6MeTUefJIT3NvUOsV15bClga0k38f0q/kN5xxrGSDS3EFnm9w=="
+		},
 		"http-proxy-agent": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
@@ -2683,6 +3206,11 @@
 				"safer-buffer": ">= 2.1.2 < 3"
 			}
 		},
+		"ieee754": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+			"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+		},
 		"ignore": {
 			"version": "4.0.6",
 			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
@@ -2734,14 +3262,12 @@
 		"inherits": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-			"dev": true
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
 		},
 		"internal-slot": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
 			"integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-			"dev": true,
 			"requires": {
 				"get-intrinsic": "^1.1.0",
 				"has": "^1.0.3",
@@ -2778,7 +3304,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
 			"integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
 				"has-tostringtag": "^1.0.0"
@@ -2794,7 +3319,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
 			"integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-			"dev": true,
 			"requires": {
 				"has-bigints": "^1.0.1"
 			}
@@ -2803,7 +3327,6 @@
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
 			"integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
 				"has-tostringtag": "^1.0.0"
@@ -2818,8 +3341,7 @@
 		"is-callable": {
 			"version": "1.2.4",
 			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-			"integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-			"dev": true
+			"integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
 		},
 		"is-ci": {
 			"version": "2.0.0",
@@ -2863,7 +3385,6 @@
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
 			"integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-			"dev": true,
 			"requires": {
 				"has-tostringtag": "^1.0.0"
 			}
@@ -2922,7 +3443,6 @@
 			"version": "1.0.10",
 			"resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
 			"integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
-			"dev": true,
 			"requires": {
 				"has-tostringtag": "^1.0.0"
 			}
@@ -2939,8 +3459,7 @@
 		"is-negative-zero": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-			"integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
-			"dev": true
+			"integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="
 		},
 		"is-number": {
 			"version": "7.0.0",
@@ -2952,7 +3471,6 @@
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
 			"integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
-			"dev": true,
 			"requires": {
 				"has-tostringtag": "^1.0.0"
 			}
@@ -2982,7 +3500,6 @@
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
 			"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
 				"has-tostringtag": "^1.0.0"
@@ -3004,7 +3521,6 @@
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
 			"integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-			"dev": true,
 			"requires": {
 				"has-tostringtag": "^1.0.0"
 			}
@@ -3013,7 +3529,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
 			"integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-			"dev": true,
 			"requires": {
 				"has-symbols": "^1.0.2"
 			}
@@ -3022,7 +3537,6 @@
 			"version": "1.1.7",
 			"resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.7.tgz",
 			"integrity": "sha512-VxlpTBGknhQ3o7YiVjIhdLU6+oD8dPz/79vvvH4F+S/c8608UCVa9fgDpa1kZgFoUST2DCgacc70UszKgzKuvA==",
-			"dev": true,
 			"requires": {
 				"available-typed-arrays": "^1.0.4",
 				"call-bind": "^1.0.2",
@@ -4061,8 +4575,7 @@
 		"lodash.clonedeep": {
 			"version": "4.5.0",
 			"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-			"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-			"dev": true
+			"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
 		},
 		"lodash.merge": {
 			"version": "4.6.2",
@@ -4172,6 +4685,16 @@
 				"object-visit": "^1.0.0"
 			}
 		},
+		"md5.js": {
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+			"integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+			"requires": {
+				"hash-base": "^3.0.0",
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.1.2"
+			}
+		},
 		"merge-stream": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -4188,6 +4711,22 @@
 				"picomatch": "^2.2.3"
 			}
 		},
+		"miller-rabin": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+			"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+			"requires": {
+				"bn.js": "^4.0.0",
+				"brorand": "^1.0.1"
+			},
+			"dependencies": {
+				"bn.js": {
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+				}
+			}
+		},
 		"mime-db": {
 			"version": "1.47.0",
 			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz",
@@ -4209,6 +4748,16 @@
 			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
 			"dev": true
 		},
+		"minimalistic-assert": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+			"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+		},
+		"minimalistic-crypto-utils": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+			"integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
+		},
 		"minimatch": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -4296,8 +4845,7 @@
 		"node-fetch": {
 			"version": "2.6.1",
 			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-			"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
-			"dev": true
+			"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
 		},
 		"node-int64": {
 			"version": "0.4.0",
@@ -4415,14 +4963,12 @@
 		"object-inspect": {
 			"version": "1.11.0",
 			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
-			"integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
-			"dev": true
+			"integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="
 		},
 		"object-keys": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-			"dev": true
+			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
 		},
 		"object-visit": {
 			"version": "1.0.1",
@@ -4437,7 +4983,6 @@
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
 			"integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.0",
 				"define-properties": "^1.1.3",
@@ -4454,6 +4999,18 @@
 				"isobject": "^3.0.1"
 			}
 		},
+		"oidc-client": {
+			"version": "1.11.5",
+			"resolved": "https://registry.npmjs.org/oidc-client/-/oidc-client-1.11.5.tgz",
+			"integrity": "sha512-LcKrKC8Av0m/KD/4EFmo9Sg8fSQ+WFJWBrmtWd+tZkNn3WT/sQG3REmPANE9tzzhbjW6VkTNy4xhAXCfPApAOg==",
+			"requires": {
+				"acorn": "^7.4.1",
+				"base64-js": "^1.5.1",
+				"core-js": "^3.8.3",
+				"crypto-js": "^4.0.0",
+				"serialize-javascript": "^4.0.0"
+			}
+		},
 		"once": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -4540,6 +5097,18 @@
 				"callsites": "^3.0.0"
 			}
 		},
+		"parse-asn1": {
+			"version": "5.1.6",
+			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+			"integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+			"requires": {
+				"asn1.js": "^5.2.0",
+				"browserify-aes": "^1.0.0",
+				"evp_bytestokey": "^1.0.0",
+				"pbkdf2": "^3.0.3",
+				"safe-buffer": "^5.1.1"
+			}
+		},
 		"parse-json": {
 			"version": "5.2.0",
 			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -4594,6 +5163,18 @@
 			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
 			"dev": true
 		},
+		"pbkdf2": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+			"integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+			"requires": {
+				"create-hash": "^1.1.2",
+				"create-hmac": "^1.1.4",
+				"ripemd160": "^2.0.1",
+				"safe-buffer": "^5.0.1",
+				"sha.js": "^2.4.8"
+			}
+		},
 		"picomatch": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
@@ -4662,6 +5243,11 @@
 				"react-is": "^17.0.1"
 			}
 		},
+		"process": {
+			"version": "0.11.10",
+			"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+			"integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+		},
 		"progress": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -4690,6 +5276,26 @@
 			"integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
 			"dev": true
 		},
+		"public-encrypt": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+			"integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+			"requires": {
+				"bn.js": "^4.1.0",
+				"browserify-rsa": "^4.0.0",
+				"create-hash": "^1.1.0",
+				"parse-asn1": "^5.0.0",
+				"randombytes": "^2.0.1",
+				"safe-buffer": "^5.1.2"
+			},
+			"dependencies": {
+				"bn.js": {
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+				}
+			}
+		},
 		"pump": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -4706,6 +5312,56 @@
 			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
 			"dev": true
 		},
+		"pvtsutils": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/pvtsutils/-/pvtsutils-1.2.1.tgz",
+			"integrity": "sha512-Q867jEr30lBR2YSFFLZ0/XsEvpweqH6Kj096wmlRAFXrdRGPCNq2iz9B5Tk085EZ+OBZyYAVA5UhPkjSHGrUzQ==",
+			"requires": {
+				"tslib": "^2.3.1"
+			},
+			"dependencies": {
+				"tslib": {
+					"version": "2.3.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+					"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+				}
+			}
+		},
+		"pvutils": {
+			"version": "1.0.17",
+			"resolved": "https://registry.npmjs.org/pvutils/-/pvutils-1.0.17.tgz",
+			"integrity": "sha512-wLHYUQxWaXVQvKnwIDWFVKDJku9XDCvyhhxoq8dc5MFdIlRenyPI9eSfEtcvgHgD7FlvCyGAlWgOzRnZD99GZQ=="
+		},
+		"queue-microtask": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
+		},
+		"randombytes": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+			"requires": {
+				"safe-buffer": "^5.1.0"
+			}
+		},
+		"randomfill": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+			"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+			"requires": {
+				"randombytes": "^2.0.5",
+				"safe-buffer": "^5.1.0"
+			}
+		},
+		"rdf-js": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/rdf-js/-/rdf-js-4.0.2.tgz",
+			"integrity": "sha512-ApvlFa/WsQh8LpPK/6hctQwG06Z9ztQQGWVtrcrf9L6+sejHNXLPOqL+w7q3hF+iL0C4sv3AX1PUtGkLNzyZ0Q==",
+			"requires": {
+				"@rdfjs/types": "*"
+			}
+		},
 		"react-is": {
 			"version": "17.0.2",
 			"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
@@ -4743,6 +5399,16 @@
 				"type-fest": "^0.8.1"
 			}
 		},
+		"readable-stream": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+			"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+			"requires": {
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			}
+		},
 		"rechoir": {
 			"version": "0.6.2",
 			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
@@ -4868,6 +5534,15 @@
 				"glob": "^7.1.3"
 			}
 		},
+		"ripemd160": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+			"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+			"requires": {
+				"hash-base": "^3.0.0",
+				"inherits": "^2.0.1"
+			}
+		},
 		"rollup": {
 			"version": "2.49.0",
 			"resolved": "https://registry.npmjs.org/rollup/-/rollup-2.49.0.tgz",
@@ -4923,8 +5598,7 @@
 		"safe-buffer": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-			"dev": true
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
 		},
 		"safe-regex": {
 			"version": "1.1.0",
@@ -4938,8 +5612,7 @@
 		"safer-buffer": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-			"dev": true
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
 		"sane": {
 			"version": "4.1.0",
@@ -5106,6 +5779,14 @@
 			"integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
 			"dev": true
 		},
+		"serialize-javascript": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+			"integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+			"requires": {
+				"randombytes": "^2.1.0"
+			}
+		},
 		"set-blocking": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -5135,6 +5816,15 @@
 				}
 			}
 		},
+		"sha.js": {
+			"version": "2.4.11",
+			"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+			"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+			"requires": {
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.0.1"
+			}
+		},
 		"shebang-command": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -5182,7 +5872,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
 			"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.0",
 				"get-intrinsic": "^1.0.2",
@@ -5478,6 +6167,15 @@
 				}
 			}
 		},
+		"stream-browserify": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
+			"integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",
+			"requires": {
+				"inherits": "~2.0.4",
+				"readable-stream": "^3.5.0"
+			}
+		},
 		"string-argv": {
 			"version": "0.3.1",
 			"resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
@@ -5509,7 +6207,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
 			"integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.3"
@@ -5519,12 +6216,26 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
 			"integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.3"
 			}
 		},
+		"string_decoder": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+			"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+			"requires": {
+				"safe-buffer": "~5.2.0"
+			},
+			"dependencies": {
+				"safe-buffer": {
+					"version": "5.2.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+				}
+			}
+		},
 		"stringify-object": {
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
@@ -5799,7 +6510,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
 			"integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-			"dev": true,
 			"requires": {
 				"function-bind": "^1.1.1",
 				"has-bigints": "^1.0.1",
@@ -5890,7 +6600,6 @@
 			"version": "0.12.4",
 			"resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz",
 			"integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==",
-			"dev": true,
 			"requires": {
 				"inherits": "^2.0.3",
 				"is-arguments": "^1.0.4",
@@ -5900,6 +6609,11 @@
 				"which-typed-array": "^1.1.2"
 			}
 		},
+		"util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+		},
 		"uuid": {
 			"version": "8.3.2",
 			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
@@ -5980,6 +6694,25 @@
 				"makeerror": "1.0.x"
 			}
 		},
+		"webcrypto-core": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-1.4.0.tgz",
+			"integrity": "sha512-HY3Zo0GcRIQUUDnlZ/shGjN+4f7LVMkdJZoGPog+oHhJsJdMz6iM8Za5xZ0t6qg7Fx/JXXz+oBv2J2p982hGTQ==",
+			"requires": {
+				"@peculiar/asn1-schema": "^2.0.44",
+				"@peculiar/json-schema": "^1.1.12",
+				"asn1js": "^2.1.1",
+				"pvtsutils": "^1.2.0",
+				"tslib": "^2.3.1"
+			},
+			"dependencies": {
+				"tslib": {
+					"version": "2.3.1",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+					"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+				}
+			}
+		},
 		"webidl-conversions": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
@@ -6025,7 +6758,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
 			"integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-			"dev": true,
 			"requires": {
 				"is-bigint": "^1.0.1",
 				"is-boolean-object": "^1.1.0",
@@ -6044,7 +6776,6 @@
 			"version": "1.1.6",
 			"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.6.tgz",
 			"integrity": "sha512-DdY984dGD5sQ7Tf+x1CkXzdg85b9uEel6nr4UkFg1LoE9OXv3uRuZhe5CoWdawhGACeFpEZXH8fFLQnDhbpm/Q==",
-			"dev": true,
 			"requires": {
 				"available-typed-arrays": "^1.0.4",
 				"call-bind": "^1.0.2",
diff --git a/packages/solid-crs-manage/lib/features/object/object-root.component.ts b/packages/solid-crs-manage/lib/features/object/object-root.component.ts
index ef739acb..aa5e54be 100644
--- a/packages/solid-crs-manage/lib/features/object/object-root.component.ts
+++ b/packages/solid-crs-manage/lib/features/object/object-root.component.ts
@@ -3,16 +3,17 @@ import { ArgumentError, Collection, CollectionObject, Logger, Translator } from
 import { FormSubmissionStates, FormEvents, Alert, FormRootStates, FormCleanlinessStates, FormValidationStates, FormUpdatedEvent, formMachine, PopupComponent } from '@netwerk-digitaal-erfgoed/solid-crs-components';
 import { map } from 'rxjs/operators';
 import { from } from 'rxjs';
-import { ActorRef, interpret, Interpreter, InterpreterStatus, State, DoneInvokeEvent, doneInvoke } from 'xstate';
+import { ActorRef, interpret, Interpreter, InterpreterStatus, State, DoneInvokeEvent } from 'xstate';
 import { RxLitElement } from 'rx-lit';
 import { Cross, Object as ObjectIcon, Save, Theme, Trash, Connect } from '@netwerk-digitaal-erfgoed/solid-crs-theme';
 import { ObjectImageryComponent, ObjectCreationComponent, ObjectIdentificationComponent, ObjectRepresentationComponent, ObjectDimensionsComponent } from '@netwerk-digitaal-erfgoed/solid-crs-semcom-components';
 import { unsafeSVG } from 'lit-html/directives/unsafe-svg';
 import { ComponentMetadata } from '@digita-ai/semcom-core';
+import { v4 } from 'uuid';
 import { DismissAlertEvent } from '../../app.events';
 import { SemComService } from '../../common/semcom/semcom.service';
 import { ObjectContext, ObjectStates, validateObjectForm } from './object.machine';
-import { ClickedDeleteObjectEvent, ClickedObjectSidebarItem, ClickedResetEvent, ClickedSaveEvent, ClickedTermFieldEvent, ObjectEvents, SelectedObjectEvent, SelectedTermsEvent } from './object.events';
+import { ClickedDeleteObjectEvent, ClickedObjectSidebarItem, ClickedResetEvent, ClickedSaveEvent, ClickedTermFieldEvent, SelectedTermsEvent } from './object.events';
 import { TermActors } from './terms/term.machine';
 import { TermEvent } from './terms/term.events';
 
@@ -149,6 +150,12 @@ export class ObjectRootComponent extends RxLitElement {
   @query('nde-popup#delete-popup')
   deletePopup: PopupComponent;
 
+  /**
+   * The image file to be uploaded
+   */
+  @internalProperty()
+  imageFile?: File;
+
   /**
    * Hook called on first update after connection to the DOM.
    */
@@ -322,6 +329,8 @@ export class ObjectRootComponent extends RxLitElement {
           person: this.object?.person,
           organization: this.object?.organization,
           event: this.object?.event,
+          // set the image file as it is not included in form machine's data
+          imageFile: this.object.imageFile,
         }));
 
       });
@@ -357,6 +366,23 @@ export class ObjectRootComponent extends RxLitElement {
 
   }
 
+  /**
+   * Prepares for a new image upload when an image is selected
+   *
+   * @param event The custom image-selected event containing the image file.
+   */
+  private onImageSelected(event: CustomEvent<File>): void {
+
+    this.object.imageFile = event.detail;
+
+    this.formActor.send(new FormUpdatedEvent(
+      'image',
+      // use the object's uri to determine object storage directory
+      `${new URL(this.object.uri).origin}${new URL(this.object.uri).pathname.split('/').slice(0, -1).join('/')}/${v4()}-${this.object.imageFile.name}`
+    ));
+
+  }
+
   /**
    * Handles a dismiss event by sending a dismiss alert event to its parent.
    *
@@ -417,6 +443,7 @@ export class ObjectRootComponent extends RxLitElement {
 
         element = document.createElement(component.tag) as ObjectImageryComponent;
         element.id = 'object.sidebar.image';
+        element.addEventListener('image-selected', this.onImageSelected);
 
       } else if (component.tag.includes('creation')) {
 
diff --git a/packages/solid-crs-manage/lib/public/nl-NL.json b/packages/solid-crs-manage/lib/public/nl-NL.json
index 1d82b956..9eee6fb2 100644
--- a/packages/solid-crs-manage/lib/public/nl-NL.json
+++ b/packages/solid-crs-manage/lib/public/nl-NL.json
@@ -65,7 +65,8 @@
                 "field": {
                     "file": {
                         "title": "Bestand",
-                        "description": "Het webadres (URL) waar het beeldmateriaal staat, zoals een scan van een bidprentje of een foto van een gebouw. Gebruik bij voorkeur beeldmateriaal van hoge kwaliteit en van type JPEG of PNG."
+                        "description": "Het webadres (URL) waar het beeldmateriaal staat, zoals een scan van een bidprentje of een foto van een gebouw. Gebruik bij voorkeur beeldmateriaal van hoge kwaliteit en van type JPEG of PNG.",
+                        "or": "of"
                     },
                     "license": {
                         "title": "Licentie",
diff --git a/packages/solid-crs-semcom-components/lib/object-creation.component.ts b/packages/solid-crs-semcom-components/lib/object-creation.component.ts
index beb57d33..9c82ee7d 100644
--- a/packages/solid-crs-semcom-components/lib/object-creation.component.ts
+++ b/packages/solid-crs-semcom-components/lib/object-creation.component.ts
@@ -122,7 +122,7 @@ export class ObjectCreationComponent extends RxLitElement {
         nde-large-card div[slot="content"] {
           display: flex;
           flex-direction: column;
-          gap: var(--gap-normal);
+          gap: var(--gap-large);
         }
       `,
     ];
diff --git a/packages/solid-crs-semcom-components/lib/object-dimensions.component.ts b/packages/solid-crs-semcom-components/lib/object-dimensions.component.ts
index 2ecc7b7c..3bdc598b 100644
--- a/packages/solid-crs-semcom-components/lib/object-dimensions.component.ts
+++ b/packages/solid-crs-semcom-components/lib/object-dimensions.component.ts
@@ -134,7 +134,7 @@ export class ObjectDimensionsComponent extends RxLitElement {
         nde-large-card div[slot="content"] {
           display: flex;
           flex-direction: column;
-          gap: var(--gap-normal);
+          gap: var(--gap-large);
         }
         .dimension-field {
           width: 100%;
diff --git a/packages/solid-crs-semcom-components/lib/object-identification.component.ts b/packages/solid-crs-semcom-components/lib/object-identification.component.ts
index fe5a1a77..029f2941 100644
--- a/packages/solid-crs-semcom-components/lib/object-identification.component.ts
+++ b/packages/solid-crs-semcom-components/lib/object-identification.component.ts
@@ -113,7 +113,7 @@ export class ObjectIdentificationComponent extends RxLitElement {
         nde-large-card div[slot="content"] {
           display: flex;
           flex-direction: column;
-          gap: var(--gap-normal);
+          gap: var(--gap-large);
         }
       `,
     ];
diff --git a/packages/solid-crs-semcom-components/lib/object-imagery.component.ts b/packages/solid-crs-semcom-components/lib/object-imagery.component.ts
index 1db8d598..1b5f1b93 100644
--- a/packages/solid-crs-semcom-components/lib/object-imagery.component.ts
+++ b/packages/solid-crs-semcom-components/lib/object-imagery.component.ts
@@ -5,6 +5,7 @@ import { SpawnedActorRef } from 'xstate';
 import { RxLitElement } from 'rx-lit';
 import { Theme, Image, Open, Cross } from '@netwerk-digitaal-erfgoed/solid-crs-theme';
 import { unsafeSVG } from 'lit-html/directives/unsafe-svg';
+import { SeparatorComponent } from '@digita-ai/dgt-components';
 
 /**
  * The root page of the object feature.
@@ -63,6 +64,39 @@ export class ObjectImageryComponent extends RxLitElement {
   @query('nde-popup#image-popup')
   imagePopup: PopupComponent;
 
+  /**
+   * Emits a custom 'image-selected' event, containing the uploaded image file.
+   *
+   * @param event The change event from the input field
+   */
+  private onSelectedFile = (event: Event): void => {
+
+    const input = this.shadowRoot.querySelector<HTMLInputElement>('#image-upload');
+    // update label with correct filename
+    this.shadowRoot.querySelector<HTMLParagraphElement>('#image-upload-label').textContent = input.files[0].name;
+    // send event
+    this.dispatchEvent(new CustomEvent('image-selected', { detail: input.files[0] }));
+
+  };
+
+  constructor() {
+
+    super();
+
+    if(!customElements.get('nde-popup')) {
+
+      customElements.define('nde-popup', PopupComponent);
+
+    }
+
+    if(!customElements.get('nde-separator')) {
+
+      customElements.define('nde-separator', SeparatorComponent);
+
+    }
+
+  }
+
   /**
    * Renders the component as HTML.
    *
@@ -81,15 +115,29 @@ export class ObjectImageryComponent extends RxLitElement {
         ${unsafeSVG(Image)}
       </div>
       <div slot="content">
+
         <div class="overlay" @click="${ () => toggleImage() }">
             ${ unsafeSVG(Open) }
             <img slot="image" src="${this.object.image}"/>
         </div>
-        <nde-form-element .actor="${this.formActor}" .translator="${this.translator}" field="image">
-          <label slot="label" for="image">${this.translator?.translate('object.card.image.field.file.title')}</label>
-          <input type="text" slot="input" name="image" id="image"/>
-          <div slot="help" for="event">${this.translator?.translate('object.card.image.field.file.description')}</div>
-        </nde-form-element>
+
+        <div class="image-container">
+          <nde-form-element .actor="${this.formActor}" .translator="${this.translator}" field="image">
+            <label slot="label" for="image">${this.translator?.translate('object.card.image.field.file.title')}</label>
+            <input type="text" slot="input" name="image" id="image"/>
+            <div slot="help" for="event">${this.translator?.translate('object.card.image.field.file.description')}</div>
+          </nde-form-element>
+        
+          <nde-separator>${ this.translator?.translate('object.card.image.field.file.or') }</nde-separator>
+
+          <!-- image upload -->
+          <div class="image-upload-container">
+            <button @click="${() => this.shadowRoot.getElementById('image-upload').click()}">Bestand kiezen</button>
+            <p id="image-upload-label">Geen bestand gekozen</p>
+            <input type="file" id="image-upload" @change="${this.onSelectedFile}" accept="image/*"/>
+          </div>
+        </div>
+
         <nde-form-element .actor="${this.formActor}" .translator="${this.translator}" field="license">
           <label slot="label" for="license">${this.translator?.translate('object.card.image.field.license.title')}</label>
           <select slot="input" name="license" id="license">
@@ -97,30 +145,20 @@ export class ObjectImageryComponent extends RxLitElement {
           </select>
           <div slot="help" for="event">${this.translator?.translate('object.card.image.field.license.description')}</div>
         </nde-form-element>
+
         <nde-popup dark id="image-popup">
           <div slot="content">
             <div id="dismiss-popup" @click="${ () => toggleImage() }"> ${ unsafeSVG(Cross) } </div>
             <img src="${ this.object.image }"/>
           </div>
         </nde-popup>
+
       </div>
     </nde-large-card>
   ` : html``;
 
   }
 
-  constructor() {
-
-    super();
-
-    if(!customElements.get('nde-popup')) {
-
-      customElements.define('nde-popup', PopupComponent);
-
-    }
-
-  }
-
   static get styles(): CSSResult[] {
 
     return [
@@ -129,7 +167,7 @@ export class ObjectImageryComponent extends RxLitElement {
         nde-large-card div[slot="content"] {
           display: flex;
           flex-direction: column;
-          gap: var(--gap-normal);
+          gap: var(--gap-large);
         }
         nde-large-card .overlay {
           position: relative;
@@ -137,7 +175,6 @@ export class ObjectImageryComponent extends RxLitElement {
           height: 200px;
           width: 100%;
           display: block;
-          margin-bottom: var(--gap-normal);
         }
         nde-large-card .overlay svg {
           position: absolute;
@@ -151,6 +188,31 @@ export class ObjectImageryComponent extends RxLitElement {
           width: 100%;
           object-fit: cover;
         }
+        nde-separator {
+          height: var(--gap-normal);
+        }
+        .image-container {
+          display: flex;
+          flex-direction: column;
+          gap: var(--gap-normal);
+        }
+        .image-upload-container {
+          display: flex;
+          gap: var(--gap-normal);
+          align-items: center;
+        }
+        .image-upload-container p {
+          margin: 0;
+        }
+        .image-upload-container button {
+          background-color: var(--colors-primary-light);
+          max-height: var(--gap-large);
+          text-transform: none;
+          padding: var(--gap-small) var(--gap-normal);
+        }
+        input[type="file"] {
+          display: none;
+        }
         #image-popup div[slot="content"] {
           max-height: 90%;
           width: 90%;
diff --git a/packages/solid-crs-semcom-components/lib/object-representation.component.ts b/packages/solid-crs-semcom-components/lib/object-representation.component.ts
index 007e6995..39b27a8b 100644
--- a/packages/solid-crs-semcom-components/lib/object-representation.component.ts
+++ b/packages/solid-crs-semcom-components/lib/object-representation.component.ts
@@ -145,7 +145,7 @@ export class ObjectRepresentationComponent extends RxLitElement {
         nde-large-card div[slot="content"] {
           display: flex;
           flex-direction: column;
-          gap: var(--gap-normal);
+          gap: var(--gap-large);
         }
       `,
     ];
diff --git a/packages/solid-crs-semcom-components/package-lock.json b/packages/solid-crs-semcom-components/package-lock.json
index e93add74..2cceb5c0 100644
--- a/packages/solid-crs-semcom-components/package-lock.json
+++ b/packages/solid-crs-semcom-components/package-lock.json
@@ -4,6 +4,14 @@
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
+		"@appnest/lit-translate": {
+			"version": "1.1.18",
+			"resolved": "https://registry.npmjs.org/@appnest/lit-translate/-/lit-translate-1.1.18.tgz",
+			"integrity": "sha512-iVdyYw6EXsg8/+WeAJ3Ex2izp3nsfhBs1wyo1AAqOEUcbKOa7xzQhWHFoejNgoV+PpDBeqDlfbqrCZsKqV6F3Q==",
+			"requires": {
+				"lit-html": "^1.1.2"
+			}
+		},
 		"@babel/code-frame": {
 			"version": "7.12.11",
 			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
@@ -490,6 +498,344 @@
 				"minimist": "^1.2.0"
 			}
 		},
+		"@digita-ai/dgt-components": {
+			"version": "0.8.5",
+			"resolved": "https://npm.pkg.github.com/download/@digita-ai/dgt-components/0.8.5/64b38c5264a16553d3182e64ea5c252be4d903ccb0803f08dd2bf4acb70cc979",
+			"integrity": "sha512-tq71M9WxiW+AMetp2B9zo+FK64TMpp3ww0Z47QmzJdyF7BPvWGd+zYgg2knY3DeiJ9qFm7rb/WBa1o4qiBG/uw==",
+			"requires": {
+				"@appnest/lit-translate": "^1.1.18",
+				"@digita-ai/dgt-theme": "0.8.5",
+				"@digita-ai/dgt-utils": "0.8.5",
+				"@digita-ai/inrupt-solid-service": "^0.9.2",
+				"@digita-ai/semcom-core": "0.4.1",
+				"@digita-ai/semcom-sdk": "0.4.1",
+				"buffer": "6.0.3",
+				"jsbarcode": "^3.11.5",
+				"lit-element": "2.4.0",
+				"n3": "1.8.0",
+				"rx-lit": "1.0.1",
+				"rxjs": "^7.4.0",
+				"xstate": "^4.26.0"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "7.4.0",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz",
+					"integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==",
+					"requires": {
+						"tslib": "~2.1.0"
+					}
+				},
+				"tslib": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
+					"integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="
+				},
+				"xstate": {
+					"version": "4.26.1",
+					"resolved": "https://registry.npmjs.org/xstate/-/xstate-4.26.1.tgz",
+					"integrity": "sha512-JLofAEnN26l/1vbODgsDa+Phqa61PwDlxWu8+2pK+YbXf+y9pQSDLRvcYH2H1kkeUBA5fGp+xFL/zfE8jNMw4g=="
+				}
+			}
+		},
+		"@digita-ai/dgt-theme": {
+			"version": "0.8.5",
+			"resolved": "https://npm.pkg.github.com/download/@digita-ai/dgt-theme/0.8.5/eebfc8417551c6eaa617e9b7bce71d9cfa87066f59415573aaa23c068d78af7f",
+			"integrity": "sha512-QsanjBJLSzz3y3y7Q9JreOWC7DFa7FAPxDDKWDrSOj+M9ViiX+ZMn7ybP6QtTf64iIwyUd0CfqwaRLrKgMw22A=="
+		},
+		"@digita-ai/dgt-utils": {
+			"version": "0.8.5",
+			"resolved": "https://npm.pkg.github.com/download/@digita-ai/dgt-utils/0.8.5/6ad37c049950d5542b9a2e8d917b4962f930735abd3f20144200952989ef83b1",
+			"integrity": "sha512-mNDne8q13MX28Y4MHxJhPu+fcg/NJuLs/fZa7+aWoz5COl4JBZJaQASsfrYlDml1n+NTPjJjrYLLLej0OgxQbg==",
+			"requires": {
+				"@types/node": "^14.14.14",
+				"rxjs": "^7.4.0",
+				"zone.js": "~0.8.26"
+			},
+			"dependencies": {
+				"rxjs": {
+					"version": "7.4.0",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.4.0.tgz",
+					"integrity": "sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==",
+					"requires": {
+						"tslib": "~2.1.0"
+					}
+				},
+				"tslib": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
+					"integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="
+				}
+			}
+		},
+		"@digita-ai/inrupt-solid-client": {
+			"version": "0.9.3",
+			"resolved": "https://npm.pkg.github.com/download/@digita-ai/inrupt-solid-client/0.9.3/8589da3182de3d7934e55e81f8d9351dba40ffa61f8321a28edd973844725bd1",
+			"integrity": "sha512-Y6V83a8AeITDoekZxwMKDvJ+n38blBICZldSj8nM6u7SDQdJE8xKbD7TMq+FhnyULYuKluE6EXSaWGUPn2Yaew==",
+			"requires": {
+				"@inrupt/solid-client": "1.6.1",
+				"@inrupt/solid-client-authn-browser": "1.8.0",
+				"rxjs": "^6.6.7"
+			}
+		},
+		"@digita-ai/inrupt-solid-service": {
+			"version": "0.9.3",
+			"resolved": "https://npm.pkg.github.com/download/@digita-ai/inrupt-solid-service/0.9.3/2b1119ca535e8a971c70919d12f684670cc03857bbbbda369029da9a2bca9476",
+			"integrity": "sha512-pKPt5VhCA8Ta0dIQaVuv21TEE4wxneKdLmkw5QGZBPYqkW+xTvzau8P1zviXT90tCVECK9VR3uYVUCa1RUl4Tg==",
+			"requires": {
+				"@digita-ai/inrupt-solid-client": "0.9.3",
+				"crypto-js": "^4.1.1",
+				"jest-environment-jsdom": "^27.2.0",
+				"jose": "3.14.3",
+				"n3": "^1.11.0",
+				"rdf-js": "^4.0.2",
+				"uuid": "^8.3.2"
+			},
+			"dependencies": {
+				"@babel/code-frame": {
+					"version": "7.16.0",
+					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",
+					"integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==",
+					"requires": {
+						"@babel/highlight": "^7.16.0"
+					}
+				},
+				"@babel/helper-validator-identifier": {
+					"version": "7.15.7",
+					"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
+					"integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="
+				},
+				"@babel/highlight": {
+					"version": "7.16.0",
+					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz",
+					"integrity": "sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==",
+					"requires": {
+						"@babel/helper-validator-identifier": "^7.15.7",
+						"chalk": "^2.0.0",
+						"js-tokens": "^4.0.0"
+					},
+					"dependencies": {
+						"chalk": {
+							"version": "2.4.2",
+							"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+							"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+							"requires": {
+								"ansi-styles": "^3.2.1",
+								"escape-string-regexp": "^1.0.5",
+								"supports-color": "^5.3.0"
+							}
+						}
+					}
+				},
+				"@jest/environment": {
+					"version": "27.4.2",
+					"resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.4.2.tgz",
+					"integrity": "sha512-uSljKxh/rGlHlmhyeG4ZoVK9hOec+EPBkwTHkHKQ2EqDu5K+MaG9uJZ8o1CbRsSdZqSuhXvJCYhBWsORPPg6qw==",
+					"requires": {
+						"@jest/fake-timers": "^27.4.2",
+						"@jest/types": "^27.4.2",
+						"@types/node": "*",
+						"jest-mock": "^27.4.2"
+					}
+				},
+				"@jest/fake-timers": {
+					"version": "27.4.2",
+					"resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.4.2.tgz",
+					"integrity": "sha512-f/Xpzn5YQk5adtqBgvw1V6bF8Nx3hY0OIRRpCvWcfPl0EAjdqWPdhH3t/3XpiWZqtjIEHDyMKP9ajpva1l4Zmg==",
+					"requires": {
+						"@jest/types": "^27.4.2",
+						"@sinonjs/fake-timers": "^8.0.1",
+						"@types/node": "*",
+						"jest-message-util": "^27.4.2",
+						"jest-mock": "^27.4.2",
+						"jest-util": "^27.4.2"
+					}
+				},
+				"@jest/types": {
+					"version": "27.4.2",
+					"resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz",
+					"integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==",
+					"requires": {
+						"@types/istanbul-lib-coverage": "^2.0.0",
+						"@types/istanbul-reports": "^3.0.0",
+						"@types/node": "*",
+						"@types/yargs": "^16.0.0",
+						"chalk": "^4.0.0"
+					}
+				},
+				"@sinonjs/fake-timers": {
+					"version": "8.1.0",
+					"resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+					"integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+					"requires": {
+						"@sinonjs/commons": "^1.7.0"
+					}
+				},
+				"@types/yargs": {
+					"version": "16.0.4",
+					"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+					"integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+					"requires": {
+						"@types/yargs-parser": "*"
+					}
+				},
+				"ansi-regex": {
+					"version": "5.0.1",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+					"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+				},
+				"ansi-styles": {
+					"version": "3.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+					"requires": {
+						"color-convert": "^1.9.0"
+					}
+				},
+				"ci-info": {
+					"version": "3.3.0",
+					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz",
+					"integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw=="
+				},
+				"color-convert": {
+					"version": "1.9.3",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+					"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+					"requires": {
+						"color-name": "1.1.3"
+					}
+				},
+				"color-name": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+					"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+				},
+				"escape-string-regexp": {
+					"version": "1.0.5",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+					"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+				},
+				"has-flag": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+					"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+				},
+				"jest-environment-jsdom": {
+					"version": "27.4.2",
+					"resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.2.tgz",
+					"integrity": "sha512-L0dV4oq4+Ll7hZ8QCGvSELn8uOr938/QKOg6o70kMHiZOpWOjAqSf7fMVAtGhG/BVSvk1GTzhGJNOWsxtH5KbQ==",
+					"requires": {
+						"@jest/environment": "^27.4.2",
+						"@jest/fake-timers": "^27.4.2",
+						"@jest/types": "^27.4.2",
+						"@types/jsdom": "^16.2.4",
+						"@types/node": "*",
+						"jest-mock": "^27.4.2",
+						"jest-util": "^27.4.2",
+						"jsdom": "^16.6.0"
+					}
+				},
+				"jest-message-util": {
+					"version": "27.4.2",
+					"resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.2.tgz",
+					"integrity": "sha512-OMRqRNd9E0DkBLZpFtZkAGYOXl6ZpoMtQJWTAREJKDOFa0M6ptB7L67tp+cszMBkvSgKOhNtQp2Vbcz3ZZKo/w==",
+					"requires": {
+						"@babel/code-frame": "^7.12.13",
+						"@jest/types": "^27.4.2",
+						"@types/stack-utils": "^2.0.0",
+						"chalk": "^4.0.0",
+						"graceful-fs": "^4.2.4",
+						"micromatch": "^4.0.4",
+						"pretty-format": "^27.4.2",
+						"slash": "^3.0.0",
+						"stack-utils": "^2.0.3"
+					}
+				},
+				"jest-mock": {
+					"version": "27.4.2",
+					"resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.2.tgz",
+					"integrity": "sha512-PDDPuyhoukk20JrQKeofK12hqtSka7mWH0QQuxSNgrdiPsrnYYLS6wbzu/HDlxZRzji5ylLRULeuI/vmZZDrYA==",
+					"requires": {
+						"@jest/types": "^27.4.2",
+						"@types/node": "*"
+					}
+				},
+				"jest-util": {
+					"version": "27.4.2",
+					"resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.4.2.tgz",
+					"integrity": "sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==",
+					"requires": {
+						"@jest/types": "^27.4.2",
+						"@types/node": "*",
+						"chalk": "^4.0.0",
+						"ci-info": "^3.2.0",
+						"graceful-fs": "^4.2.4",
+						"picomatch": "^2.2.3"
+					}
+				},
+				"n3": {
+					"version": "1.12.0",
+					"resolved": "https://registry.npmjs.org/n3/-/n3-1.12.0.tgz",
+					"integrity": "sha512-/t2sqeWtzUl1e5JNbl2F6+Kct3+ZCgjR5InEX9DRQMFb9zPihTYq0425C0mIGCGQP52JNwusxKEql59E3WNIVA==",
+					"requires": {
+						"queue-microtask": "^1.1.2",
+						"readable-stream": "^3.6.0"
+					}
+				},
+				"pretty-format": {
+					"version": "27.4.2",
+					"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.2.tgz",
+					"integrity": "sha512-p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw==",
+					"requires": {
+						"@jest/types": "^27.4.2",
+						"ansi-regex": "^5.0.1",
+						"ansi-styles": "^5.0.0",
+						"react-is": "^17.0.1"
+					},
+					"dependencies": {
+						"ansi-styles": {
+							"version": "5.2.0",
+							"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+							"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
+						}
+					}
+				},
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+					"requires": {
+						"has-flag": "^3.0.0"
+					}
+				}
+			}
+		},
+		"@digita-ai/semcom-core": {
+			"version": "0.4.1",
+			"resolved": "https://npm.pkg.github.com/download/@digita-ai/semcom-core/0.4.1/729e478d7ba70181aa9c524a6abc0b31899a2bc3853e01aa90f7c98e93195c40",
+			"integrity": "sha512-ugKoiFgdj7ruMKfHAIExPbpg+z3NOSczpaAlbH2WLqN/7YN0fHYeo3BX565CO5x3LgcMuSyYIOG6rctg+lHT9w=="
+		},
+		"@digita-ai/semcom-sdk": {
+			"version": "0.4.1",
+			"resolved": "https://npm.pkg.github.com/download/@digita-ai/semcom-sdk/0.4.1/dde8a07b980df69d747aa65d06c96e55fc0c2de3bd4935924e87f1759ac89aa8",
+			"integrity": "sha512-9jXx5OIuwLrUQ5eLQi4xyKJpmwRE9Lf1A/I61nLN+LSSR141DcnTAc2VJrl2Gjwvde8rm2Y9zWXW7Wk2IWe8Kg==",
+			"requires": {
+				"@digita-ai/semcom-core": "0.4.1",
+				"buffer": "6.0.3",
+				"n3": "1.10.0"
+			},
+			"dependencies": {
+				"n3": {
+					"version": "1.10.0",
+					"resolved": "https://registry.npmjs.org/n3/-/n3-1.10.0.tgz",
+					"integrity": "sha512-y+qpS0GktEBttOaDR+BF1t1G2fw4Xn4nCZWNn+7MvEmD2I4YpMH6OJF/xHKSwInCxOC9vu9eI6pluB9/RDUyZQ==",
+					"requires": {
+						"queue-microtask": "^1.1.2",
+						"readable-stream": "^3.6.0"
+					}
+				}
+			}
+		},
 		"@digita-ai/typescript-config": {
 			"version": "0.3.4",
 			"resolved": "https://npm.pkg.github.com/download/@digita-ai/typescript-config/0.3.4/16c8755238a358331f20ff2c6ab36abe32c45e74f83ec0bad66965a5ff5fdf6a",
@@ -524,6 +870,122 @@
 				}
 			}
 		},
+		"@inrupt/jose-legacy-modules": {
+			"version": "0.0.3-3.15.4",
+			"resolved": "https://registry.npmjs.org/@inrupt/jose-legacy-modules/-/jose-legacy-modules-0.0.3-3.15.4.tgz",
+			"integrity": "sha512-gcmIqLLFyhNZWw9OKK3kNgEbpKU0z6kn6NPWQlJf0Dy5QtuIgwcS7aRU2GJScz+Dx9KGQVvyAapYX3buHyrBXw==",
+			"requires": {
+				"jose": "3.15.4"
+			},
+			"dependencies": {
+				"jose": {
+					"version": "3.15.4",
+					"resolved": "https://registry.npmjs.org/jose/-/jose-3.15.4.tgz",
+					"integrity": "sha512-SXeGi+g5ZcNgV6o7f+Mx3Q1gaYMSBzAi3cmcZPxoeCEZPgfSCnnyfmMXzXoLDh+XL4KMtGvhOsYBoqQhnuR2rQ=="
+				}
+			}
+		},
+		"@inrupt/oidc-client-ext": {
+			"version": "1.11.2",
+			"resolved": "https://registry.npmjs.org/@inrupt/oidc-client-ext/-/oidc-client-ext-1.11.2.tgz",
+			"integrity": "sha512-htdqsFnLOSUhi+AkhyYCTA1vjUsZT8TeQOiXEtLDgneCRxwxCGfRwVSgXSC30OeophlgrZ7/QVixaz3BB5yXEA==",
+			"requires": {
+				"@inrupt/jose-legacy-modules": "0.0.3-3.15.4",
+				"@inrupt/solid-client-authn-core": "^1.11.2",
+				"@types/uuid": "^8.3.0",
+				"form-urlencoded": "~6.0.3",
+				"oidc-client": "^1.11.3",
+				"uuid": "^8.3.1"
+			},
+			"dependencies": {
+				"form-urlencoded": {
+					"version": "6.0.5",
+					"resolved": "https://registry.npmjs.org/form-urlencoded/-/form-urlencoded-6.0.5.tgz",
+					"integrity": "sha512-7M7IhZNujsHqjYovM1WTSqcAVOqfvgF8acu6ok1ct1a00l6LVrmagJKkOdRUH/PYKEDOZ7ZAw/Mtq1/Q8CuRTQ=="
+				}
+			}
+		},
+		"@inrupt/solid-client": {
+			"version": "1.6.1",
+			"resolved": "https://registry.npmjs.org/@inrupt/solid-client/-/solid-client-1.6.1.tgz",
+			"integrity": "sha512-fTU30u73Re+vl7Rn4+U6jgodCtaLNGjlgLgiHivArsczApCf+fzh5MqD6uZlf0kRKsZpHm6q+7n5JRwBhOr/8Q==",
+			"requires": {
+				"@rdfjs/dataset": "^1.0.1",
+				"@types/n3": "^1.1.6",
+				"@types/rdf-js": "^4.0.0",
+				"@types/rdfjs__dataset": "^1.0.2",
+				"cross-fetch": "^3.0.4",
+				"http-link-header": "^1.0.2",
+				"n3": "1.8.1"
+			},
+			"dependencies": {
+				"n3": {
+					"version": "1.8.1",
+					"resolved": "https://registry.npmjs.org/n3/-/n3-1.8.1.tgz",
+					"integrity": "sha512-oS0XBNhHH+1TFByvJs84q2lsy3MqpkIeLNT8r9OPyblcvcQbZHcKspwdVcWWzNrlMpSHmbOG1KO5AbXy2++Csw==",
+					"requires": {
+						"queue-microtask": "^1.1.2",
+						"readable-stream": "^3.6.0"
+					}
+				}
+			}
+		},
+		"@inrupt/solid-client-authn-browser": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/@inrupt/solid-client-authn-browser/-/solid-client-authn-browser-1.8.0.tgz",
+			"integrity": "sha512-1zYE5mYzmgsZi9AOVmMAkCEXFXBOwGlOOG0p3vV4h2YnDC7YsP7cszQ3jfxwm4nnIEK+h9g3UjWKHevAKWAkzQ==",
+			"requires": {
+				"@inrupt/oidc-client-ext": "^1.8.0",
+				"@inrupt/solid-client-authn-core": "^1.8.0",
+				"@types/form-urlencoded": "^2.0.1",
+				"@types/lodash.clonedeep": "^4.5.6",
+				"@types/node": "^14.14.14",
+				"@types/uuid": "^8.3.0",
+				"assert": "^2.0.0",
+				"browserify-zlib": "^0.2.0",
+				"buffer": "^6.0.3",
+				"crypto-browserify": "^3.12.0",
+				"form-urlencoded": "^4.2.1",
+				"jose": "^2.0.2",
+				"lodash.clonedeep": "^4.5.0",
+				"os-browserify": "^0.3.0",
+				"reflect-metadata": "^0.1.13",
+				"stream-browserify": "^3.0.0",
+				"tsyringe": "^4.4.0",
+				"util": "^0.12.3",
+				"uuid": "^8.3.1"
+			},
+			"dependencies": {
+				"jose": {
+					"version": "2.0.5",
+					"resolved": "https://registry.npmjs.org/jose/-/jose-2.0.5.tgz",
+					"integrity": "sha512-BAiDNeDKTMgk4tvD0BbxJ8xHEHBZgpeRZ1zGPPsitSyMgjoMWiLGYAE7H7NpP5h0lPppQajQs871E8NHUrzVPA==",
+					"requires": {
+						"@panva/asn1.js": "^1.0.0"
+					}
+				}
+			}
+		},
+		"@inrupt/solid-client-authn-core": {
+			"version": "1.11.2",
+			"resolved": "https://registry.npmjs.org/@inrupt/solid-client-authn-core/-/solid-client-authn-core-1.11.2.tgz",
+			"integrity": "sha512-hL+BC81lE4V0EXZE8PJ418y/vFvW+rfcmHgHqi0ZKSSxLNVE08Ok4W2d+g6wcW3wyePZ9FOL2K8BIh7/jCGj8Q==",
+			"requires": {
+				"@inrupt/jose-legacy-modules": "0.0.3-3.15.4",
+				"@inrupt/solid-common-vocab": "^1.0.0",
+				"@types/lodash.clonedeep": "^4.5.6",
+				"@types/uuid": "^8.3.0",
+				"cross-fetch": "^3.0.6",
+				"events": "^3.3.0",
+				"lodash.clonedeep": "^4.5.0",
+				"uuid": "^8.3.1"
+			}
+		},
+		"@inrupt/solid-common-vocab": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@inrupt/solid-common-vocab/-/solid-common-vocab-1.0.0.tgz",
+			"integrity": "sha512-LcImhJqqPsNl/OlULzEEK2rYevty0eh1zaOLVz3lnydEU1DQkeaJ8fKBxKdp5/QjCtnIYcaDjh5U11PGh29Dgg=="
+		},
 		"@istanbuljs/load-nyc-config": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -743,11 +1205,39 @@
 				"chalk": "^4.0.0"
 			}
 		},
+		"@panva/asn1.js": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/@panva/asn1.js/-/asn1.js-1.0.0.tgz",
+			"integrity": "sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw=="
+		},
+		"@rdfjs/data-model": {
+			"version": "1.3.4",
+			"resolved": "https://registry.npmjs.org/@rdfjs/data-model/-/data-model-1.3.4.tgz",
+			"integrity": "sha512-iKzNcKvJotgbFDdti7GTQDCYmL7GsGldkYStiP0K8EYtN7deJu5t7U11rKTz+nR7RtesUggT+lriZ7BakFv8QQ==",
+			"requires": {
+				"@rdfjs/types": ">=1.0.1"
+			}
+		},
+		"@rdfjs/dataset": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/@rdfjs/dataset/-/dataset-1.1.1.tgz",
+			"integrity": "sha512-BNwCSvG0cz0srsG5esq6CQKJc1m8g/M0DZpLuiEp0MMpfwguXX7VeS8TCg4UUG3DV/DqEvhy83ZKSEjdsYseeA==",
+			"requires": {
+				"@rdfjs/data-model": "^1.2.0"
+			}
+		},
+		"@rdfjs/types": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@rdfjs/types/-/types-1.0.1.tgz",
+			"integrity": "sha512-YxVkH0XrCNG3MWeZxfg596GFe+oorTVusmNxRP6ZHTsGczZ8AGvG3UchRNkg3Fy4MyysI7vBAA5YZbESL+VmHQ==",
+			"requires": {
+				"@types/node": "*"
+			}
+		},
 		"@sinonjs/commons": {
 			"version": "1.8.3",
 			"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
 			"integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
-			"dev": true,
 			"requires": {
 				"type-detect": "4.0.8"
 			}
@@ -764,8 +1254,7 @@
 		"@tootallnate/once": {
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-			"integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-			"dev": true
+			"integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="
 		},
 		"@types/babel__core": {
 			"version": "7.1.14",
@@ -808,6 +1297,11 @@
 				"@babel/types": "^7.3.0"
 			}
 		},
+		"@types/form-urlencoded": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/@types/form-urlencoded/-/form-urlencoded-2.0.1.tgz",
+			"integrity": "sha512-Kz3LwezuNvsQF8ZcswMv4b5ZhKmjTkH2Rxle6l/520Npvaxho6b4HN9lStp6HhGrZsL/rwJHpWK9vM1RA7uZbw=="
+		},
 		"@types/graceful-fs": {
 			"version": "4.1.5",
 			"resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
@@ -820,14 +1314,12 @@
 		"@types/istanbul-lib-coverage": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
-			"integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
-			"dev": true
+			"integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw=="
 		},
 		"@types/istanbul-lib-report": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
 			"integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-			"dev": true,
 			"requires": {
 				"@types/istanbul-lib-coverage": "*"
 			}
@@ -836,7 +1328,6 @@
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
 			"integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
-			"dev": true,
 			"requires": {
 				"@types/istanbul-lib-report": "*"
 			}
@@ -851,11 +1342,42 @@
 				"pretty-format": "^26.0.0"
 			}
 		},
+		"@types/jsdom": {
+			"version": "16.2.13",
+			"resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.13.tgz",
+			"integrity": "sha512-8JQCjdeAidptSsOcRWk2iTm9wCcwn9l+kRG6k5bzUacrnm1ezV4forq0kWjUih/tumAeoG+OspOvQEbbRucBTw==",
+			"requires": {
+				"@types/node": "*",
+				"@types/parse5": "*",
+				"@types/tough-cookie": "*"
+			}
+		},
+		"@types/lodash": {
+			"version": "4.14.177",
+			"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.177.tgz",
+			"integrity": "sha512-0fDwydE2clKe9MNfvXHBHF9WEahRuj+msTuQqOmAApNORFvhMYZKNGGJdCzuhheVjMps/ti0Ak/iJPACMaevvw=="
+		},
+		"@types/lodash.clonedeep": {
+			"version": "4.5.6",
+			"resolved": "https://registry.npmjs.org/@types/lodash.clonedeep/-/lodash.clonedeep-4.5.6.tgz",
+			"integrity": "sha512-cE1jYr2dEg1wBImvXlNtp0xDoS79rfEdGozQVgliDZj1uERH4k+rmEMTudP9b4VQ8O6nRb5gPqft0QzEQGMQgA==",
+			"requires": {
+				"@types/lodash": "*"
+			}
+		},
+		"@types/n3": {
+			"version": "1.10.4",
+			"resolved": "https://registry.npmjs.org/@types/n3/-/n3-1.10.4.tgz",
+			"integrity": "sha512-FfRTwcbXcScVHuAjIASveRWL6Fi6fPALl1Ge8tMESYLqU7R42LJvtdBpUi+f9YK0oQPqIN+zFFgMDFJfLMx0bg==",
+			"requires": {
+				"@types/node": "*",
+				"rdf-js": "^4.0.2"
+			}
+		},
 		"@types/node": {
 			"version": "14.17.2",
 			"resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.2.tgz",
-			"integrity": "sha512-sld7b/xmFum66AAKuz/rp/CUO8+98fMpyQ3SBfzzBNGMd/1iHBTAg9oyAvcYlAj46bpc74r91jSw2iFdnx29nw==",
-			"dev": true
+			"integrity": "sha512-sld7b/xmFum66AAKuz/rp/CUO8+98fMpyQ3SBfzzBNGMd/1iHBTAg9oyAvcYlAj46bpc74r91jSw2iFdnx29nw=="
 		},
 		"@types/normalize-package-data": {
 			"version": "2.4.0",
@@ -863,23 +1385,47 @@
 			"integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
 			"dev": true
 		},
+		"@types/parse5": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz",
+			"integrity": "sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g=="
+		},
 		"@types/prettier": {
 			"version": "2.2.3",
 			"resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.2.3.tgz",
 			"integrity": "sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==",
 			"dev": true
 		},
+		"@types/rdf-js": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/@types/rdf-js/-/rdf-js-4.0.2.tgz",
+			"integrity": "sha512-soR/+RMogGiDU1lrpuQl5ZL55/L1eq/JlR2dWx052Uh/RYs9okh3XZHFlIJXHZqjqyjEn4WdbOMfBj7vvc2WVQ==",
+			"requires": {
+				"rdf-js": "*"
+			}
+		},
+		"@types/rdfjs__dataset": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/@types/rdfjs__dataset/-/rdfjs__dataset-1.0.5.tgz",
+			"integrity": "sha512-8OBC9Kr/ZSgNoUTe5mHTDPHaPt8Xen4XbYfqcbYv56d+4WdKliHXaFmFc0L4I5vsynE5JGu21Hvg2zWgX1Az6Q==",
+			"requires": {
+				"rdf-js": "^4.0.2"
+			}
+		},
 		"@types/stack-utils": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
-			"integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
-			"dev": true
+			"integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw=="
+		},
+		"@types/tough-cookie": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.1.tgz",
+			"integrity": "sha512-Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg=="
 		},
 		"@types/uuid": {
 			"version": "8.3.0",
 			"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.0.tgz",
-			"integrity": "sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ==",
-			"dev": true
+			"integrity": "sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ=="
 		},
 		"@types/yargs": {
 			"version": "15.0.13",
@@ -893,8 +1439,7 @@
 		"@types/yargs-parser": {
 			"version": "20.2.0",
 			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
-			"integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
-			"dev": true
+			"integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA=="
 		},
 		"@xstate/inspect": {
 			"version": "0.4.1",
@@ -907,20 +1452,17 @@
 		"abab": {
 			"version": "2.0.5",
 			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
-			"integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
-			"dev": true
+			"integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="
 		},
 		"acorn": {
 			"version": "7.4.1",
 			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-			"dev": true
+			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
 		},
 		"acorn-globals": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
 			"integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-			"dev": true,
 			"requires": {
 				"acorn": "^7.1.1",
 				"acorn-walk": "^7.1.1"
@@ -935,14 +1477,12 @@
 		"acorn-walk": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-			"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-			"dev": true
+			"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
 		},
 		"agent-base": {
 			"version": "6.0.2",
 			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
 			"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-			"dev": true,
 			"requires": {
 				"debug": "4"
 			}
@@ -992,7 +1532,6 @@
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
 			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-			"dev": true,
 			"requires": {
 				"color-convert": "^2.0.1"
 			}
@@ -1046,6 +1585,35 @@
 			"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
 			"dev": true
 		},
+		"asn1.js": {
+			"version": "5.4.1",
+			"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+			"integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+			"requires": {
+				"bn.js": "^4.0.0",
+				"inherits": "^2.0.1",
+				"minimalistic-assert": "^1.0.0",
+				"safer-buffer": "^2.1.0"
+			},
+			"dependencies": {
+				"bn.js": {
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+				}
+			}
+		},
+		"assert": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz",
+			"integrity": "sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==",
+			"requires": {
+				"es6-object-assign": "^1.1.0",
+				"is-nan": "^1.2.1",
+				"object-is": "^1.0.1",
+				"util": "^0.12.0"
+			}
+		},
 		"assign-symbols": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -1070,8 +1638,7 @@
 		"asynckit": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-			"dev": true
+			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
 		},
 		"atob": {
 			"version": "2.1.2",
@@ -1082,8 +1649,7 @@
 		"available-typed-arrays": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.4.tgz",
-			"integrity": "sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA==",
-			"dev": true
+			"integrity": "sha512-SA5mXJWrId1TaQjfxUYghbqQ/hYioKmLJvPJyDuYRtXXenFNMjj4hSSt1Cf1xsuXSXrtxrVC5Ot4eU6cOtBDdA=="
 		},
 		"babel-jest": {
 			"version": "26.6.3",
@@ -1217,12 +1783,22 @@
 				}
 			}
 		},
+		"base64-js": {
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+			"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+		},
 		"basic-auth": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.1.0.tgz",
 			"integrity": "sha1-RSIe5Cn37h5QNb4/UVM/HN/SmIQ=",
 			"dev": true
 		},
+		"bn.js": {
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+			"integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw=="
+		},
 		"brace-expansion": {
 			"version": "1.1.11",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -1237,16 +1813,93 @@
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
 			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-			"dev": true,
 			"requires": {
 				"fill-range": "^7.0.1"
 			}
 		},
+		"brorand": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+			"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
+		},
 		"browser-process-hrtime": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-			"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
-			"dev": true
+			"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
+		},
+		"browserify-aes": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+			"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+			"requires": {
+				"buffer-xor": "^1.0.3",
+				"cipher-base": "^1.0.0",
+				"create-hash": "^1.1.0",
+				"evp_bytestokey": "^1.0.3",
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.0.1"
+			}
+		},
+		"browserify-cipher": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+			"integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+			"requires": {
+				"browserify-aes": "^1.0.4",
+				"browserify-des": "^1.0.0",
+				"evp_bytestokey": "^1.0.0"
+			}
+		},
+		"browserify-des": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+			"integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+			"requires": {
+				"cipher-base": "^1.0.1",
+				"des.js": "^1.0.0",
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.1.2"
+			}
+		},
+		"browserify-rsa": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+			"integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+			"requires": {
+				"bn.js": "^5.0.0",
+				"randombytes": "^2.0.1"
+			}
+		},
+		"browserify-sign": {
+			"version": "4.2.1",
+			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+			"integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+			"requires": {
+				"bn.js": "^5.1.1",
+				"browserify-rsa": "^4.0.1",
+				"create-hash": "^1.2.0",
+				"create-hmac": "^1.1.7",
+				"elliptic": "^6.5.3",
+				"inherits": "^2.0.4",
+				"parse-asn1": "^5.1.5",
+				"readable-stream": "^3.6.0",
+				"safe-buffer": "^5.2.0"
+			},
+			"dependencies": {
+				"safe-buffer": {
+					"version": "5.2.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+				}
+			}
+		},
+		"browserify-zlib": {
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+			"integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+			"requires": {
+				"pako": "~1.0.5"
+			}
 		},
 		"browserslist": {
 			"version": "4.16.6",
@@ -1270,12 +1923,26 @@
 				"node-int64": "^0.4.0"
 			}
 		},
+		"buffer": {
+			"version": "6.0.3",
+			"resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+			"integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+			"requires": {
+				"base64-js": "^1.3.1",
+				"ieee754": "^1.2.1"
+			}
+		},
 		"buffer-from": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
 			"integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
 			"dev": true
 		},
+		"buffer-xor": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+			"integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
+		},
 		"cache-base": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
@@ -1297,7 +1964,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
 			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-			"dev": true,
 			"requires": {
 				"function-bind": "^1.1.1",
 				"get-intrinsic": "^1.0.2"
@@ -1334,7 +2000,6 @@
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
 			"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-			"dev": true,
 			"requires": {
 				"ansi-styles": "^4.1.0",
 				"supports-color": "^7.1.0"
@@ -1352,6 +2017,15 @@
 			"integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
 			"dev": true
 		},
+		"cipher-base": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+			"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+			"requires": {
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.0.1"
+			}
+		},
 		"cjs-module-lexer": {
 			"version": "0.6.0",
 			"resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
@@ -1418,7 +2092,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
 			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-			"dev": true,
 			"requires": {
 				"color-name": "~1.1.4"
 			}
@@ -1426,8 +2099,7 @@
 		"color-name": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true
+			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
 		},
 		"colorette": {
 			"version": "1.2.2",
@@ -1445,7 +2117,6 @@
 			"version": "1.0.8",
 			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
 			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-			"dev": true,
 			"requires": {
 				"delayed-stream": "~1.0.0"
 			}
@@ -1482,12 +2153,58 @@
 			"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
 			"dev": true
 		},
+		"core-js": {
+			"version": "3.19.2",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.2.tgz",
+			"integrity": "sha512-ciYCResnLIATSsXuXnIOH4CbdfgV+H1Ltg16hJFN7/v6OxqnFr/IFGeLacaZ+fHLAm0TBbXwNK9/DNBzBUrO/g=="
+		},
 		"corser": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/corser/-/corser-2.0.1.tgz",
 			"integrity": "sha1-jtolLsqrWEDc2XXOuQ2TcMgZ/4c=",
 			"dev": true
 		},
+		"create-ecdh": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+			"integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
+			"requires": {
+				"bn.js": "^4.1.0",
+				"elliptic": "^6.5.3"
+			},
+			"dependencies": {
+				"bn.js": {
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+				}
+			}
+		},
+		"create-hash": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+			"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+			"requires": {
+				"cipher-base": "^1.0.1",
+				"inherits": "^2.0.1",
+				"md5.js": "^1.3.4",
+				"ripemd160": "^2.0.1",
+				"sha.js": "^2.4.0"
+			}
+		},
+		"create-hmac": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+			"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+			"requires": {
+				"cipher-base": "^1.0.3",
+				"create-hash": "^1.1.0",
+				"inherits": "^2.0.1",
+				"ripemd160": "^2.0.0",
+				"safe-buffer": "^5.0.1",
+				"sha.js": "^2.4.8"
+			}
+		},
 		"create-require": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
@@ -1498,7 +2215,6 @@
 			"version": "3.1.4",
 			"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz",
 			"integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==",
-			"dev": true,
 			"requires": {
 				"node-fetch": "2.6.1"
 			}
@@ -1520,17 +2236,38 @@
 			"integrity": "sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig==",
 			"dev": true
 		},
+		"crypto-browserify": {
+			"version": "3.12.0",
+			"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+			"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+			"requires": {
+				"browserify-cipher": "^1.0.0",
+				"browserify-sign": "^4.0.0",
+				"create-ecdh": "^4.0.0",
+				"create-hash": "^1.1.0",
+				"create-hmac": "^1.1.0",
+				"diffie-hellman": "^5.0.0",
+				"inherits": "^2.0.1",
+				"pbkdf2": "^3.0.3",
+				"public-encrypt": "^4.0.0",
+				"randombytes": "^2.0.0",
+				"randomfill": "^1.0.3"
+			}
+		},
+		"crypto-js": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
+			"integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
+		},
 		"cssom": {
 			"version": "0.4.4",
 			"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-			"integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
-			"dev": true
+			"integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
 		},
 		"cssstyle": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
 			"integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-			"dev": true,
 			"requires": {
 				"cssom": "~0.3.6"
 			},
@@ -1538,8 +2275,7 @@
 				"cssom": {
 					"version": "0.3.8",
 					"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-					"integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-					"dev": true
+					"integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
 				}
 			}
 		},
@@ -1547,7 +2283,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
 			"integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
-			"dev": true,
 			"requires": {
 				"abab": "^2.0.3",
 				"whatwg-mimetype": "^2.3.0",
@@ -1558,7 +2293,6 @@
 			"version": "4.3.1",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
 			"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-			"dev": true,
 			"requires": {
 				"ms": "2.1.2"
 			}
@@ -1572,8 +2306,7 @@
 		"decimal.js": {
 			"version": "10.2.1",
 			"resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
-			"integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
-			"dev": true
+			"integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw=="
 		},
 		"decode-uri-component": {
 			"version": "0.2.0",
@@ -1584,8 +2317,7 @@
 		"deep-is": {
 			"version": "0.1.3",
 			"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-			"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-			"dev": true
+			"integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
 		},
 		"deepmerge": {
 			"version": "4.2.2",
@@ -1597,7 +2329,6 @@
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
 			"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-			"dev": true,
 			"requires": {
 				"object-keys": "^1.0.12"
 			}
@@ -1646,8 +2377,16 @@
 		"delayed-stream": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-			"dev": true
+			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+		},
+		"des.js": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+			"integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+			"requires": {
+				"inherits": "^2.0.1",
+				"minimalistic-assert": "^1.0.0"
+			}
 		},
 		"detect-newline": {
 			"version": "3.1.0",
@@ -1667,6 +2406,23 @@
 			"integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
 			"dev": true
 		},
+		"diffie-hellman": {
+			"version": "5.0.3",
+			"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+			"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+			"requires": {
+				"bn.js": "^4.1.0",
+				"miller-rabin": "^4.0.0",
+				"randombytes": "^2.0.0"
+			},
+			"dependencies": {
+				"bn.js": {
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+				}
+			}
+		},
 		"discontinuous-range": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
@@ -1685,7 +2441,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
 			"integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
-			"dev": true,
 			"requires": {
 				"webidl-conversions": "^5.0.0"
 			},
@@ -1693,8 +2448,7 @@
 				"webidl-conversions": {
 					"version": "5.0.0",
 					"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-					"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-					"dev": true
+					"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="
 				}
 			}
 		},
@@ -1731,6 +2485,27 @@
 			"integrity": "sha512-fmIKfYALVeEybk/L2ucdgt7jN3JsbGtg3K9pmF/MRWgkeADBI1VSAa5IzdG2gZwTxsnsrFtdMpOTSM5mrBRKVQ==",
 			"dev": true
 		},
+		"elliptic": {
+			"version": "6.5.4",
+			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+			"integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+			"requires": {
+				"bn.js": "^4.11.9",
+				"brorand": "^1.1.0",
+				"hash.js": "^1.0.0",
+				"hmac-drbg": "^1.0.1",
+				"inherits": "^2.0.4",
+				"minimalistic-assert": "^1.0.1",
+				"minimalistic-crypto-utils": "^1.0.1"
+			},
+			"dependencies": {
+				"bn.js": {
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+				}
+			}
+		},
 		"emittery": {
 			"version": "0.7.2",
 			"resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
@@ -1774,7 +2549,6 @@
 			"version": "1.18.5",
 			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz",
 			"integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==",
-			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
 				"es-to-primitive": "^1.2.1",
@@ -1798,8 +2572,7 @@
 				"object-inspect": {
 					"version": "1.11.0",
 					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
-					"integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
-					"dev": true
+					"integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="
 				}
 			}
 		},
@@ -1807,13 +2580,17 @@
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
 			"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-			"dev": true,
 			"requires": {
 				"is-callable": "^1.1.4",
 				"is-date-object": "^1.0.1",
 				"is-symbol": "^1.0.2"
 			}
 		},
+		"es6-object-assign": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
+			"integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw="
+		},
 		"esbuild": {
 			"version": "0.9.7",
 			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.9.7.tgz",
@@ -1836,7 +2613,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
 			"integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-			"dev": true,
 			"requires": {
 				"esprima": "^4.0.1",
 				"estraverse": "^5.2.0",
@@ -1848,14 +2624,12 @@
 				"estraverse": {
 					"version": "5.2.0",
 					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-					"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-					"dev": true
+					"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
 				},
 				"levn": {
 					"version": "0.3.0",
 					"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
 					"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-					"dev": true,
 					"requires": {
 						"prelude-ls": "~1.1.2",
 						"type-check": "~0.3.2"
@@ -1865,7 +2639,6 @@
 					"version": "0.8.3",
 					"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
 					"integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-					"dev": true,
 					"requires": {
 						"deep-is": "~0.1.3",
 						"fast-levenshtein": "~2.0.6",
@@ -1878,14 +2651,12 @@
 				"prelude-ls": {
 					"version": "1.1.2",
 					"resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-					"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-					"dev": true
+					"integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
 				},
 				"type-check": {
 					"version": "0.3.2",
 					"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
 					"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-					"dev": true,
 					"requires": {
 						"prelude-ls": "~1.1.2"
 					}
@@ -1994,8 +2765,7 @@
 		"esprima": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-			"dev": true
+			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
 		},
 		"esquery": {
 			"version": "1.4.0",
@@ -2040,8 +2810,7 @@
 		"esutils": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-			"dev": true
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
 		},
 		"eventemitter3": {
 			"version": "4.0.7",
@@ -2049,6 +2818,20 @@
 			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
 			"dev": true
 		},
+		"events": {
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
+		},
+		"evp_bytestokey": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+			"requires": {
+				"md5.js": "^1.3.4",
+				"safe-buffer": "^5.1.1"
+			}
+		},
 		"exec-sh": {
 			"version": "0.3.6",
 			"resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
@@ -2292,8 +3075,7 @@
 		"fast-levenshtein": {
 			"version": "2.0.6",
 			"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-			"dev": true
+			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
 		},
 		"fast-safe-stringify": {
 			"version": "2.0.7",
@@ -2322,7 +3104,6 @@
 			"version": "7.0.1",
 			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
 			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-			"dev": true,
 			"requires": {
 				"to-regex-range": "^5.0.1"
 			}
@@ -2368,20 +3149,23 @@
 		"foreach": {
 			"version": "2.0.5",
 			"resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-			"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
-			"dev": true
+			"integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
 		},
 		"form-data": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
 			"integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-			"dev": true,
 			"requires": {
 				"asynckit": "^0.4.0",
 				"combined-stream": "^1.0.8",
 				"mime-types": "^2.1.12"
 			}
 		},
+		"form-urlencoded": {
+			"version": "4.5.1",
+			"resolved": "https://registry.npmjs.org/form-urlencoded/-/form-urlencoded-4.5.1.tgz",
+			"integrity": "sha512-Rkd/RdMaprsMJEGzEbxolwacp78WupH7u369KEyIY3pEZ1fhL6HtyQ1FX+4HSfA1VVhET18UwCUcr5DVaDIaqg=="
+		},
 		"fragment-cache": {
 			"version": "0.2.1",
 			"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
@@ -2407,8 +3191,7 @@
 		"function-bind": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-			"dev": true
+			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
 		},
 		"functional-red-black-tree": {
 			"version": "1.0.1",
@@ -2432,7 +3215,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
 			"integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
-			"dev": true,
 			"requires": {
 				"function-bind": "^1.1.1",
 				"has": "^1.0.3",
@@ -2503,8 +3285,7 @@
 		"graceful-fs": {
 			"version": "4.2.6",
 			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-			"integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
-			"dev": true
+			"integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
 		},
 		"growly": {
 			"version": "1.3.0",
@@ -2517,7 +3298,6 @@
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
 			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-			"dev": true,
 			"requires": {
 				"function-bind": "^1.1.1"
 			}
@@ -2525,26 +3305,22 @@
 		"has-bigints": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
-			"integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
-			"dev": true
+			"integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="
 		},
 		"has-flag": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-			"dev": true
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
 		},
 		"has-symbols": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-			"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
-			"dev": true
+			"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
 		},
 		"has-tostringtag": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
 			"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-			"dev": true,
 			"requires": {
 				"has-symbols": "^1.0.2"
 			}
@@ -2601,12 +3377,48 @@
 				}
 			}
 		},
+		"hash-base": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+			"integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+			"requires": {
+				"inherits": "^2.0.4",
+				"readable-stream": "^3.6.0",
+				"safe-buffer": "^5.2.0"
+			},
+			"dependencies": {
+				"safe-buffer": {
+					"version": "5.2.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+				}
+			}
+		},
+		"hash.js": {
+			"version": "1.1.7",
+			"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+			"requires": {
+				"inherits": "^2.0.3",
+				"minimalistic-assert": "^1.0.1"
+			}
+		},
 		"he": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
 			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
 			"dev": true
 		},
+		"hmac-drbg": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+			"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+			"requires": {
+				"hash.js": "^1.0.3",
+				"minimalistic-assert": "^1.0.0",
+				"minimalistic-crypto-utils": "^1.0.1"
+			}
+		},
 		"hosted-git-info": {
 			"version": "2.8.9",
 			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
@@ -2617,7 +3429,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
 			"integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
-			"dev": true,
 			"requires": {
 				"whatwg-encoding": "^1.0.5"
 			}
@@ -2628,6 +3439,11 @@
 			"integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
 			"dev": true
 		},
+		"http-link-header": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/http-link-header/-/http-link-header-1.0.3.tgz",
+			"integrity": "sha512-nARK1wSKoBBrtcoESlHBx36c1Ln/gnbNQi1eB6MeTUefJIT3NvUOsV15bClga0k38f0q/kN5xxrGSDS3EFnm9w=="
+		},
 		"http-proxy": {
 			"version": "1.18.1",
 			"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
@@ -2643,7 +3459,6 @@
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
 			"integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-			"dev": true,
 			"requires": {
 				"@tootallnate/once": "1",
 				"agent-base": "6",
@@ -2672,7 +3487,6 @@
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
 			"integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-			"dev": true,
 			"requires": {
 				"agent-base": "6",
 				"debug": "4"
@@ -2688,11 +3502,15 @@
 			"version": "0.4.24",
 			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
 			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-			"dev": true,
 			"requires": {
 				"safer-buffer": ">= 2.1.2 < 3"
 			}
 		},
+		"ieee754": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+			"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+		},
 		"ignore": {
 			"version": "4.0.6",
 			"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
@@ -2738,14 +3556,12 @@
 		"inherits": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-			"dev": true
+			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
 		},
 		"internal-slot": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
 			"integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-			"dev": true,
 			"requires": {
 				"get-intrinsic": "^1.1.0",
 				"has": "^1.0.3",
@@ -2782,7 +3598,6 @@
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
 			"integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
 				"has-tostringtag": "^1.0.0"
@@ -2798,7 +3613,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
 			"integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-			"dev": true,
 			"requires": {
 				"has-bigints": "^1.0.1"
 			}
@@ -2807,7 +3621,6 @@
 			"version": "1.1.2",
 			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
 			"integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
 				"has-tostringtag": "^1.0.0"
@@ -2822,8 +3635,7 @@
 		"is-callable": {
 			"version": "1.2.4",
 			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-			"integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-			"dev": true
+			"integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
 		},
 		"is-ci": {
 			"version": "2.0.0",
@@ -2867,7 +3679,6 @@
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
 			"integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-			"dev": true,
 			"requires": {
 				"has-tostringtag": "^1.0.0"
 			}
@@ -2926,7 +3737,6 @@
 			"version": "1.0.10",
 			"resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
 			"integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
-			"dev": true,
 			"requires": {
 				"has-tostringtag": "^1.0.0"
 			}
@@ -2940,23 +3750,29 @@
 				"is-extglob": "^2.1.1"
 			}
 		},
+		"is-nan": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
+			"integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
+			"requires": {
+				"call-bind": "^1.0.0",
+				"define-properties": "^1.1.3"
+			}
+		},
 		"is-negative-zero": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-			"integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
-			"dev": true
+			"integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="
 		},
 		"is-number": {
 			"version": "7.0.0",
 			"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-			"dev": true
+			"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
 		},
 		"is-number-object": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
 			"integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
-			"dev": true,
 			"requires": {
 				"has-tostringtag": "^1.0.0"
 			}
@@ -2973,14 +3789,12 @@
 		"is-potential-custom-element-name": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-			"integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
-			"dev": true
+			"integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
 		},
 		"is-regex": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
 			"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
 				"has-tostringtag": "^1.0.0"
@@ -2996,7 +3810,6 @@
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
 			"integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-			"dev": true,
 			"requires": {
 				"has-tostringtag": "^1.0.0"
 			}
@@ -3005,7 +3818,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
 			"integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-			"dev": true,
 			"requires": {
 				"has-symbols": "^1.0.2"
 			}
@@ -3014,7 +3826,6 @@
 			"version": "1.1.7",
 			"resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.7.tgz",
 			"integrity": "sha512-VxlpTBGknhQ3o7YiVjIhdLU6+oD8dPz/79vvvH4F+S/c8608UCVa9fgDpa1kZgFoUST2DCgacc70UszKgzKuvA==",
-			"dev": true,
 			"requires": {
 				"available-typed-arrays": "^1.0.4",
 				"call-bind": "^1.0.2",
@@ -3787,11 +4598,15 @@
 				"supports-color": "^7.0.0"
 			}
 		},
+		"jose": {
+			"version": "3.14.3",
+			"resolved": "https://registry.npmjs.org/jose/-/jose-3.14.3.tgz",
+			"integrity": "sha512-j1vO5oWqa6LmdpiZvhkM9NYxN3EuTrmzVIqSGWtJVP6BOByujZdefZZjSFGzxmbf4GLYWaXLZMKTyVPbm00S2Q=="
+		},
 		"js-tokens": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-			"dev": true
+			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
 		},
 		"js-yaml": {
 			"version": "3.14.1",
@@ -3803,11 +4618,15 @@
 				"esprima": "^4.0.0"
 			}
 		},
+		"jsbarcode": {
+			"version": "3.11.5",
+			"resolved": "https://registry.npmjs.org/jsbarcode/-/jsbarcode-3.11.5.tgz",
+			"integrity": "sha512-zv3KsH51zD00I/LrFzFSM6dst7rDn0vIMzaiZFL7qusTjPZiPtxg3zxetp0RR7obmjTw4f6NyGgbdkBCgZUIrA=="
+		},
 		"jsdom": {
 			"version": "16.6.0",
 			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.6.0.tgz",
 			"integrity": "sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg==",
-			"dev": true,
 			"requires": {
 				"abab": "^2.0.5",
 				"acorn": "^8.2.4",
@@ -3841,8 +4660,7 @@
 				"acorn": {
 					"version": "8.3.0",
 					"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.3.0.tgz",
-					"integrity": "sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw==",
-					"dev": true
+					"integrity": "sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw=="
 				}
 			}
 		},
@@ -3938,14 +4756,12 @@
 		"lodash": {
 			"version": "4.17.21",
 			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-			"dev": true
+			"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
 		},
 		"lodash.clonedeep": {
 			"version": "4.5.0",
 			"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-			"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-			"dev": true
+			"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
 		},
 		"lodash.merge": {
 			"version": "4.6.2",
@@ -4024,6 +4840,16 @@
 				"object-visit": "^1.0.0"
 			}
 		},
+		"md5.js": {
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+			"integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+			"requires": {
+				"hash-base": "^3.0.0",
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.1.2"
+			}
+		},
 		"merge-stream": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -4034,12 +4860,27 @@
 			"version": "4.0.4",
 			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
 			"integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-			"dev": true,
 			"requires": {
 				"braces": "^3.0.1",
 				"picomatch": "^2.2.3"
 			}
 		},
+		"miller-rabin": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+			"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+			"requires": {
+				"bn.js": "^4.0.0",
+				"brorand": "^1.0.1"
+			},
+			"dependencies": {
+				"bn.js": {
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+				}
+			}
+		},
 		"mime": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -4049,14 +4890,12 @@
 		"mime-db": {
 			"version": "1.48.0",
 			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
-			"integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==",
-			"dev": true
+			"integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ=="
 		},
 		"mime-types": {
 			"version": "2.1.31",
 			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
 			"integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
-			"dev": true,
 			"requires": {
 				"mime-db": "1.48.0"
 			}
@@ -4067,6 +4906,16 @@
 			"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
 			"dev": true
 		},
+		"minimalistic-assert": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+			"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+		},
+		"minimalistic-crypto-utils": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+			"integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
+		},
 		"minimatch": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -4120,8 +4969,16 @@
 		"ms": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-			"dev": true
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+		},
+		"n3": {
+			"version": "1.8.0",
+			"resolved": "https://registry.npmjs.org/n3/-/n3-1.8.0.tgz",
+			"integrity": "sha512-/PEmoB3UJrG6aXGZenDHFBJtmPp2rtfB2YLzAm2dU9stInD+ztvy4fKv5fv2ggsrSlpu7BYDTsz/c6S391uuEg==",
+			"requires": {
+				"queue-microtask": "^1.1.2",
+				"readable-stream": "^3.6.0"
+			}
 		},
 		"nanoid": {
 			"version": "3.1.23",
@@ -4185,8 +5042,7 @@
 		"node-fetch": {
 			"version": "2.6.1",
 			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-			"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
-			"dev": true
+			"integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
 		},
 		"node-int64": {
 			"version": "0.4.0",
@@ -4267,8 +5123,7 @@
 		"nwsapi": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-			"integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
-			"dev": true
+			"integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="
 		},
 		"object-copy": {
 			"version": "0.1.0",
@@ -4304,14 +5159,21 @@
 		"object-inspect": {
 			"version": "1.10.3",
 			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-			"integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
-			"dev": true
+			"integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw=="
+		},
+		"object-is": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+			"integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
+			"requires": {
+				"call-bind": "^1.0.2",
+				"define-properties": "^1.1.3"
+			}
 		},
 		"object-keys": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-			"dev": true
+			"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
 		},
 		"object-visit": {
 			"version": "1.0.1",
@@ -4326,7 +5188,6 @@
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
 			"integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
-			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.0",
 				"define-properties": "^1.1.3",
@@ -4343,6 +5204,18 @@
 				"isobject": "^3.0.1"
 			}
 		},
+		"oidc-client": {
+			"version": "1.11.5",
+			"resolved": "https://registry.npmjs.org/oidc-client/-/oidc-client-1.11.5.tgz",
+			"integrity": "sha512-LcKrKC8Av0m/KD/4EFmo9Sg8fSQ+WFJWBrmtWd+tZkNn3WT/sQG3REmPANE9tzzhbjW6VkTNy4xhAXCfPApAOg==",
+			"requires": {
+				"acorn": "^7.4.1",
+				"base64-js": "^1.5.1",
+				"core-js": "^3.8.3",
+				"crypto-js": "^4.0.0",
+				"serialize-javascript": "^4.0.0"
+			}
+		},
 		"once": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -4381,6 +5254,11 @@
 				"word-wrap": "^1.2.3"
 			}
 		},
+		"os-browserify": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+			"integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
+		},
 		"p-each-series": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
@@ -4417,6 +5295,11 @@
 			"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
 			"dev": true
 		},
+		"pako": {
+			"version": "1.0.11",
+			"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+			"integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+		},
 		"parent-module": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -4426,6 +5309,18 @@
 				"callsites": "^3.0.0"
 			}
 		},
+		"parse-asn1": {
+			"version": "5.1.6",
+			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+			"integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+			"requires": {
+				"asn1.js": "^5.2.0",
+				"browserify-aes": "^1.0.0",
+				"evp_bytestokey": "^1.0.0",
+				"pbkdf2": "^3.0.3",
+				"safe-buffer": "^5.1.1"
+			}
+		},
 		"parse-json": {
 			"version": "5.2.0",
 			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -4441,8 +5336,7 @@
 		"parse5": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-			"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-			"dev": true
+			"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
 		},
 		"pascalcase": {
 			"version": "0.1.1",
@@ -4474,11 +5368,22 @@
 			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
 			"dev": true
 		},
+		"pbkdf2": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+			"integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
+			"requires": {
+				"create-hash": "^1.1.2",
+				"create-hmac": "^1.1.4",
+				"ripemd160": "^2.0.1",
+				"safe-buffer": "^5.0.1",
+				"sha.js": "^2.4.8"
+			}
+		},
 		"picomatch": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-			"integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
-			"dev": true
+			"integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
 		},
 		"pirates": {
 			"version": "4.0.1",
@@ -4580,8 +5485,27 @@
 		"psl": {
 			"version": "1.8.0",
 			"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-			"integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
-			"dev": true
+			"integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+		},
+		"public-encrypt": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+			"integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+			"requires": {
+				"bn.js": "^4.1.0",
+				"browserify-rsa": "^4.0.0",
+				"create-hash": "^1.1.0",
+				"parse-asn1": "^5.0.0",
+				"randombytes": "^2.0.1",
+				"safe-buffer": "^5.1.2"
+			},
+			"dependencies": {
+				"bn.js": {
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+				}
+			}
 		},
 		"pump": {
 			"version": "3.0.0",
@@ -4596,8 +5520,7 @@
 		"punycode": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-			"dev": true
+			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
 		},
 		"qs": {
 			"version": "6.10.1",
@@ -4608,6 +5531,11 @@
 				"side-channel": "^1.0.4"
 			}
 		},
+		"queue-microtask": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+			"integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
+		},
 		"railroad-diagrams": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
@@ -4631,11 +5559,35 @@
 				}
 			}
 		},
+		"randombytes": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+			"requires": {
+				"safe-buffer": "^5.1.0"
+			}
+		},
+		"randomfill": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+			"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+			"requires": {
+				"randombytes": "^2.0.5",
+				"safe-buffer": "^5.1.0"
+			}
+		},
+		"rdf-js": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/rdf-js/-/rdf-js-4.0.2.tgz",
+			"integrity": "sha512-ApvlFa/WsQh8LpPK/6hctQwG06Z9ztQQGWVtrcrf9L6+sejHNXLPOqL+w7q3hF+iL0C4sv3AX1PUtGkLNzyZ0Q==",
+			"requires": {
+				"@rdfjs/types": "*"
+			}
+		},
 		"react-is": {
 			"version": "17.0.2",
 			"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-			"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-			"dev": true
+			"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
 		},
 		"read-pkg": {
 			"version": "5.2.0",
@@ -4668,6 +5620,16 @@
 				"type-fest": "^0.8.1"
 			}
 		},
+		"readable-stream": {
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+			"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+			"requires": {
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			}
+		},
 		"rechoir": {
 			"version": "0.6.2",
 			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
@@ -4677,6 +5639,11 @@
 				"resolve": "^1.1.6"
 			}
 		},
+		"reflect-metadata": {
+			"version": "0.1.13",
+			"resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
+			"integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="
+		},
 		"regex-not": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
@@ -4788,6 +5755,15 @@
 				"glob": "^7.1.3"
 			}
 		},
+		"ripemd160": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+			"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+			"requires": {
+				"hash-base": "^3.0.0",
+				"inherits": "^2.0.1"
+			}
+		},
 		"rollup": {
 			"version": "2.51.0",
 			"resolved": "https://registry.npmjs.org/rollup/-/rollup-2.51.0.tgz",
@@ -4819,8 +5795,7 @@
 		"safe-buffer": {
 			"version": "5.1.2",
 			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-			"dev": true
+			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
 		},
 		"safe-regex": {
 			"version": "1.1.0",
@@ -4834,8 +5809,7 @@
 		"safer-buffer": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-			"dev": true
+			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
 		"sane": {
 			"version": "4.1.0",
@@ -4982,7 +5956,6 @@
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
 			"integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
-			"dev": true,
 			"requires": {
 				"xmlchars": "^2.2.0"
 			}
@@ -5002,6 +5975,14 @@
 				"lru-cache": "^6.0.0"
 			}
 		},
+		"serialize-javascript": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+			"integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+			"requires": {
+				"randombytes": "^2.1.0"
+			}
+		},
 		"set-blocking": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -5031,6 +6012,15 @@
 				}
 			}
 		},
+		"sha.js": {
+			"version": "2.4.11",
+			"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+			"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+			"requires": {
+				"inherits": "^2.0.1",
+				"safe-buffer": "^5.0.1"
+			}
+		},
 		"shebang-command": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -5078,7 +6068,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
 			"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.0",
 				"get-intrinsic": "^1.0.2",
@@ -5100,8 +6089,7 @@
 		"slash": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-			"dev": true
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
 		},
 		"slice-ansi": {
 			"version": "4.0.0",
@@ -5245,8 +6233,7 @@
 		"source-map": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-			"dev": true
+			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
 		},
 		"source-map-js": {
 			"version": "0.6.2",
@@ -5334,7 +6321,6 @@
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
 			"integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
-			"dev": true,
 			"requires": {
 				"escape-string-regexp": "^2.0.0"
 			},
@@ -5342,8 +6328,7 @@
 				"escape-string-regexp": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-					"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-					"dev": true
+					"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
 				}
 			}
 		},
@@ -5368,6 +6353,15 @@
 				}
 			}
 		},
+		"stream-browserify": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz",
+			"integrity": "sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==",
+			"requires": {
+				"inherits": "~2.0.4",
+				"readable-stream": "^3.5.0"
+			}
+		},
 		"string-length": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -5393,7 +6387,6 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
 			"integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
-			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.3"
@@ -5403,12 +6396,26 @@
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
 			"integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
-			"dev": true,
 			"requires": {
 				"call-bind": "^1.0.2",
 				"define-properties": "^1.1.3"
 			}
 		},
+		"string_decoder": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+			"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+			"requires": {
+				"safe-buffer": "~5.2.0"
+			},
+			"dependencies": {
+				"safe-buffer": {
+					"version": "5.2.1",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+					"integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+				}
+			}
+		},
 		"strip-ansi": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
@@ -5446,7 +6453,6 @@
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
 			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
 			"requires": {
 				"has-flag": "^4.0.0"
 			}
@@ -5464,8 +6470,7 @@
 		"symbol-tree": {
 			"version": "3.2.4",
 			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-			"dev": true
+			"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
 		},
 		"table": {
 			"version": "6.7.1",
@@ -5582,7 +6587,6 @@
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
 			"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-			"dev": true,
 			"requires": {
 				"is-number": "^7.0.0"
 			}
@@ -5591,7 +6595,6 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
 			"integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
-			"dev": true,
 			"requires": {
 				"psl": "^1.1.33",
 				"punycode": "^2.1.1",
@@ -5602,7 +6605,6 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
 			"integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
-			"dev": true,
 			"requires": {
 				"punycode": "^2.1.1"
 			}
@@ -5626,6 +6628,14 @@
 			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
 			"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
 		},
+		"tsyringe": {
+			"version": "4.6.0",
+			"resolved": "https://registry.npmjs.org/tsyringe/-/tsyringe-4.6.0.tgz",
+			"integrity": "sha512-BMQAZamSfEmIQzH8WJeRu1yZGQbPSDuI9g+yEiKZFIcO46GPZuMOC2d0b52cVBdw1d++06JnDSIIZvEnogMdAw==",
+			"requires": {
+				"tslib": "^1.9.3"
+			}
+		},
 		"type-check": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -5638,8 +6648,7 @@
 		"type-detect": {
 			"version": "4.0.8",
 			"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-			"dev": true
+			"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
 		},
 		"type-fest": {
 			"version": "0.8.1",
@@ -5666,7 +6675,6 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
 			"integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
-			"dev": true,
 			"requires": {
 				"function-bind": "^1.1.1",
 				"has-bigints": "^1.0.1",
@@ -5698,8 +6706,7 @@
 		"universalify": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-			"dev": true
+			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
 		},
 		"unset-value": {
 			"version": "1.0.0",
@@ -5772,7 +6779,6 @@
 			"version": "0.12.4",
 			"resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz",
 			"integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==",
-			"dev": true,
 			"requires": {
 				"inherits": "^2.0.3",
 				"is-arguments": "^1.0.4",
@@ -5782,6 +6788,11 @@
 				"which-typed-array": "^1.1.2"
 			}
 		},
+		"util-deprecate": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+		},
 		"uuid": {
 			"version": "8.3.2",
 			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
@@ -5839,7 +6850,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
 			"integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-			"dev": true,
 			"requires": {
 				"browser-process-hrtime": "^1.0.0"
 			}
@@ -5848,7 +6858,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
 			"integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
-			"dev": true,
 			"requires": {
 				"xml-name-validator": "^3.0.0"
 			}
@@ -5865,14 +6874,12 @@
 		"webidl-conversions": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-			"integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-			"dev": true
+			"integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="
 		},
 		"whatwg-encoding": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
 			"integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-			"dev": true,
 			"requires": {
 				"iconv-lite": "0.4.24"
 			}
@@ -5880,14 +6887,12 @@
 		"whatwg-mimetype": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-			"integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-			"dev": true
+			"integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
 		},
 		"whatwg-url": {
 			"version": "8.5.0",
 			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.5.0.tgz",
 			"integrity": "sha512-fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg==",
-			"dev": true,
 			"requires": {
 				"lodash": "^4.7.0",
 				"tr46": "^2.0.2",
@@ -5907,7 +6912,6 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
 			"integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-			"dev": true,
 			"requires": {
 				"is-bigint": "^1.0.1",
 				"is-boolean-object": "^1.1.0",
@@ -5926,7 +6930,6 @@
 			"version": "1.1.6",
 			"resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.6.tgz",
 			"integrity": "sha512-DdY984dGD5sQ7Tf+x1CkXzdg85b9uEel6nr4UkFg1LoE9OXv3uRuZhe5CoWdawhGACeFpEZXH8fFLQnDhbpm/Q==",
-			"dev": true,
 			"requires": {
 				"available-typed-arrays": "^1.0.4",
 				"call-bind": "^1.0.2",
@@ -5939,8 +6942,7 @@
 		"word-wrap": {
 			"version": "1.2.3",
 			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-			"dev": true
+			"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
 		},
 		"wrap-ansi": {
 			"version": "6.2.0",
@@ -5974,20 +6976,17 @@
 		"ws": {
 			"version": "7.4.6",
 			"resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
-			"integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
-			"dev": true
+			"integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="
 		},
 		"xml-name-validator": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-			"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-			"dev": true
+			"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
 		},
 		"xmlchars": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-			"dev": true
+			"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
 		},
 		"xstate": {
 			"version": "4.20.0",
@@ -6040,6 +7039,11 @@
 			"resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
 			"integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
 			"dev": true
+		},
+		"zone.js": {
+			"version": "0.8.29",
+			"resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.29.tgz",
+			"integrity": "sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ=="
 		}
 	}
 }
diff --git a/packages/solid-crs-semcom-components/package.json b/packages/solid-crs-semcom-components/package.json
index aa5872f1..e63ae3f4 100644
--- a/packages/solid-crs-semcom-components/package.json
+++ b/packages/solid-crs-semcom-components/package.json
@@ -23,6 +23,7 @@
     "directory": "packages/solid-crs-semcom-node"
   },
   "dependencies": {
+    "@digita-ai/dgt-components": "^0.8.5",
     "@netwerk-digitaal-erfgoed/solid-crs-client": "0.11.0",
     "@netwerk-digitaal-erfgoed/solid-crs-components": "0.11.0",
     "@netwerk-digitaal-erfgoed/solid-crs-core": "0.11.0",

From 9e77f4267c3aaeab3bd88744154a9b5f3d605d5e Mon Sep 17 00:00:00 2001
From: Stijn Taelemans <stijn@digita.ai>
Date: Wed, 1 Dec 2021 15:59:54 +0100
Subject: [PATCH 2/7] test: update tests

---
 .../lib/collections/collection-object.ts      |   2 +-
 .../collection-object-solid-store.spec.ts     |  82 +++-
 .../solid/collection-object-solid-store.ts    |  12 +
 packages/solid-crs-core/package.json          |   8 +-
 .../object/object-root.component.spec.ts      | 395 ++++++++++--------
 .../features/object/object-root.component.ts  |   4 +-
 packages/solid-crs-manage/package.json        |   8 +-
 7 files changed, 321 insertions(+), 190 deletions(-)

diff --git a/packages/solid-crs-core/lib/collections/collection-object.ts b/packages/solid-crs-core/lib/collections/collection-object.ts
index 5e2c5a7b..35af9893 100644
--- a/packages/solid-crs-core/lib/collections/collection-object.ts
+++ b/packages/solid-crs-core/lib/collections/collection-object.ts
@@ -148,7 +148,7 @@ export interface CollectionObject extends Resource {
   /**
    * The image file to be uploaded to the pod
    */
-  imageFile: File;
+  imageFile?: File;
 
   /**
    * A link to the digital representation of this object.
diff --git a/packages/solid-crs-core/lib/solid/collection-object-solid-store.spec.ts b/packages/solid-crs-core/lib/solid/collection-object-solid-store.spec.ts
index 8ee4b324..04645b8a 100644
--- a/packages/solid-crs-core/lib/solid/collection-object-solid-store.spec.ts
+++ b/packages/solid-crs-core/lib/solid/collection-object-solid-store.spec.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import * as client from '@netwerk-digitaal-erfgoed/solid-crs-client';
 import { getStringNoLocale, getStringWithLocale, getUrl } from '@netwerk-digitaal-erfgoed/solid-crs-client';
+import { WithResourceInfo } from '@netwerk-digitaal-erfgoed/solid-crs-client/node_modules/@inrupt/solid-client';
 import { Collection } from '../collections/collection';
 import { CollectionObject } from '../collections/collection-object';
 import { CollectionObjectSolidStore } from './collection-object-solid-store';
@@ -53,6 +54,8 @@ describe('CollectionObjectSolidStore', () => {
       event: [ { name: 'event', uri: 'https://uri/' } ],
     };
 
+    (service.uploadImage as any) = jest.fn(async () => 'http://test.image');
+
   });
 
   it('should instantiate', () => {
@@ -425,8 +428,7 @@ describe('CollectionObjectSolidStore', () => {
         event: undefined,
       };
 
-      const result = await service.save(objectWithoutSubject)
-;
+      const result = await service.save(objectWithoutSubject);
 
       expect(result).toEqual(expect.objectContaining({
         description: objectWithoutSubject.description,
@@ -442,6 +444,32 @@ describe('CollectionObjectSolidStore', () => {
 
     });
 
+    it('should call uploadImage when imageFile is set', async () => {
+
+      (client.getSolidDataset as any) = jest.fn(async () => 'test-dataset');
+      (client.getThing as any) = jest.fn(() => client.createThing());
+      (client.getUrl as any) = jest.fn(() => 'http://test-uri/');
+      (client.getUrlAll as any) = jest.fn(() => [ 'http://test-uri/' ]);
+      (client.setThing as any) = jest.fn(() => 'test-thing');
+      (client.removeThing as any) = jest.fn(() => 'test-thing');
+      (client.saveSolidDatasetAt as any) = jest.fn(async () => 'test-dataset');
+      (client.addUrl as any) = jest.fn(() => 'test-url');
+      (client.addStringNoLocale as any) = jest.fn(() => 'test-url');
+      (client.addStringWithLocale as any) = jest.fn(() => 'test-url');
+      (client.addInteger as any) = jest.fn(() => 'test-url');
+      (client.addDecimal as any) = jest.fn(() => 'test-url');
+
+      const objectWithImageFile = {
+        ...mockObject,
+        imageFile: new File([ 'test-image' ], 'test-image.jpg'),
+      };
+
+      await service.save(objectWithImageFile);
+
+      expect(service.uploadImage).toHaveBeenCalledTimes(1);
+
+    });
+
   });
 
   describe('toThing()', () => {
@@ -799,4 +827,54 @@ describe('CollectionObjectSolidStore', () => {
 
   });
 
+  describe('uploadImage()', () => {
+
+    const imageUri = 'https://image.uri/image.png';
+    const objectUri = 'https://object.uri/objects/object-1';
+    const imageFile = new File([ 'test' ], 'image.png', { type: 'image/png' });
+
+    beforeEach(() => {
+
+      // reset mocked uploadImage
+      service = new CollectionObjectSolidStore();
+
+      (client.saveFileInContainer as any) = jest.fn(async (): Promise<WithResourceInfo> => ({
+        internal_resourceInfo: {
+          sourceIri: imageUri,
+          isRawData: true,
+          contentType: 'image/png',
+        },
+      }));
+
+    });
+
+    it.each([ null, undefined ])('should error when objectUri is %s', async (value) => {
+
+      await expect(() => service.uploadImage(imageFile, value)).rejects.toThrow('Argument objectUri should be set');
+
+    });
+
+    it.each([ null, undefined ])('should error when imageFile is %s', async (value) => {
+
+      await expect(() => service.uploadImage(value, objectUri)).rejects.toThrow('Argument imageFile should be set');
+
+    });
+
+    it('should return image Uri when successful', async () => {
+
+      const result = await service.uploadImage(imageFile, objectUri);
+
+      expect(result).toEqual(imageUri);
+      expect(client.saveFileInContainer).toHaveBeenCalledTimes(1);
+
+      expect(client.saveFileInContainer).toHaveBeenCalledWith(
+        `https://object.uri/objects/`,
+        imageFile,
+        expect.objectContaining({ slug: 'image.png', contentType: 'image/png' }),
+      );
+
+    });
+
+  });
+
 });
diff --git a/packages/solid-crs-core/lib/solid/collection-object-solid-store.ts b/packages/solid-crs-core/lib/solid/collection-object-solid-store.ts
index b31defb5..aa58940f 100644
--- a/packages/solid-crs-core/lib/solid/collection-object-solid-store.ts
+++ b/packages/solid-crs-core/lib/solid/collection-object-solid-store.ts
@@ -701,6 +701,18 @@ export class CollectionObjectSolidStore implements CollectionObjectStore {
    */
   async uploadImage(imageFile: File, objectUri: string): Promise<string> {
 
+    if (!imageFile) {
+
+      throw new ArgumentError('Argument imageFile should be set.', imageFile);
+
+    }
+
+    if (!objectUri) {
+
+      throw new ArgumentError('Argument objectUri should be set.', objectUri);
+
+    }
+
     const savedFile = await saveFileInContainer(
       `${new URL(objectUri).origin}${new URL(objectUri).pathname.split('/').slice(0, -1).join('/')}/`,
       imageFile,
diff --git a/packages/solid-crs-core/package.json b/packages/solid-crs-core/package.json
index 498c6ace..3a6160b0 100644
--- a/packages/solid-crs-core/package.json
+++ b/packages/solid-crs-core/package.json
@@ -74,9 +74,9 @@
     ],
     "coverageThreshold": {
       "global": {
-        "branches": 92.06,
-        "statements": 97.38,
-        "lines": 97.25,
+        "branches": 92.14,
+        "statements": 97.4,
+        "lines": 97.27,
         "functions": 99.38
       }
     },
@@ -102,4 +102,4 @@
     "preset": "@digita-ai/jest-config",
     "maxWorkers": 6
   }
-}
+}
\ No newline at end of file
diff --git a/packages/solid-crs-manage/lib/features/object/object-root.component.spec.ts b/packages/solid-crs-manage/lib/features/object/object-root.component.spec.ts
index dbc36f36..f2af0778 100644
--- a/packages/solid-crs-manage/lib/features/object/object-root.component.spec.ts
+++ b/packages/solid-crs-manage/lib/features/object/object-root.component.spec.ts
@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/dot-notation */
 import { Alert } from '@netwerk-digitaal-erfgoed/solid-crs-components';
 import { ArgumentError, CollectionObjectMemoryStore, ConsoleLogger, LoggerLevel, Collection, CollectionObject, CollectionMemoryStore, Term, SolidMockService, MockTranslator } from '@netwerk-digitaal-erfgoed/solid-crs-core';
 import { ObjectImageryComponent } from '@netwerk-digitaal-erfgoed/solid-crs-semcom-components';
@@ -14,7 +16,7 @@ describe('ObjectRootComponent', () => {
   let machine: Interpreter<ObjectContext>;
 
   const collection1: Collection = {
-    uri: 'object-uri-1',
+    uri: 'https://collection.uri-1/',
     name: 'Object 1',
     description: 'This is object 1',
     objectsUri: null,
@@ -22,7 +24,7 @@ describe('ObjectRootComponent', () => {
   };
 
   const collection2: Collection = {
-    uri: 'object-uri-2',
+    uri: 'https://collection.uri-2/',
     name: 'Object 2',
     description: 'This is object 2',
     objectsUri: null,
@@ -30,14 +32,14 @@ describe('ObjectRootComponent', () => {
   };
 
   const object1: CollectionObject = {
-    uri: 'object-uri-1',
+    uri: 'https://object.uri-1/',
     name: 'Object 1',
     description: 'This is object 1',
     image: null,
     subject: null,
     type: null,
     updated: '0',
-    collection: 'collection-uri-1',
+    collection: 'https://collection.uri-1/',
   };
 
   beforeEach(() => {
@@ -273,6 +275,199 @@ describe('ObjectRootComponent', () => {
 
   });
 
+  it('should send ClickedTermFieldEvent when CLICKED_TERM_FIELD event is caught', async (done) => {
+
+    machine.start();
+    machine.parent.start();
+
+    window.document.body.appendChild(component);
+    await component.updateComplete;
+
+    machine.onEvent((event) => {
+
+      if(event instanceof ClickedTermFieldEvent
+        && event.type === ObjectEvents.CLICKED_TERM_FIELD
+        && event.field === 'additionalType') {
+
+        done();
+
+      }
+
+    });
+
+    component.dispatchEvent(new CustomEvent<{ field: string; terms: Term[] }>(
+      'CLICKED_TERM_FIELD',
+      { bubbles: true, composed: true, detail: { field: 'additionalType', terms: [] } }
+    ));
+
+  });
+
+  it('should show content when formCards is set', async () => {
+
+    window.document.body.appendChild(component);
+
+    customElements.define('nde-object-imagery', ObjectImageryComponent);
+    const div = document.createElement('nde-object-imagery') as ObjectImageryComponent;
+    div.id = 'object.sidebar.image';
+
+    component.formCards = [ div ];
+    await component.updateComplete;
+
+    const sidebar = window.document.body.getElementsByTagName('nde-object-root')[0].shadowRoot.querySelector('div.content-and-sidebar nde-sidebar');
+    const formContent = window.document.body.getElementsByTagName('nde-object-root')[0].shadowRoot.querySelector('div.content-and-sidebar div.content');
+    const termSearch = window.document.body.getElementsByTagName('nde-object-root')[0].shadowRoot.querySelector('div.content-and-sidebar nde-term-search');
+    expect(sidebar).toBeTruthy();
+    expect(formContent).toBeTruthy();
+    expect(termSearch).toBeFalsy();
+
+  });
+
+  it('should show term search when editing term field', async () => {
+
+    window.document.body.appendChild(component);
+
+    // customElements.define('nde-object-imagery', ObjectImageryComponent);
+    const div = document.createElement('nde-object-imagery') as ObjectImageryComponent;
+    div.id = 'object.sidebar.image';
+
+    component.formCards = [ div ];
+    component.isEditingTermField = true;
+    await component.updateComplete;
+
+    const sidebar = window.document.body.getElementsByTagName('nde-object-root')[0].shadowRoot.querySelector('div.content-and-sidebar nde-sidebar');
+    const formContent = window.document.body.getElementsByTagName('nde-object-root')[0].shadowRoot.querySelector('div.content-and-sidebar div.content');
+    const termSearch = window.document.body.getElementsByTagName('nde-object-root')[0].shadowRoot.querySelector('div.content-and-sidebar nde-term-search');
+    expect(sidebar).toBeTruthy();
+    expect(formContent).toBeFalsy();
+    expect(termSearch).toBeTruthy();
+
+  });
+
+  it('should hide content when formCards is undefined', async () => {
+
+    window.document.body.appendChild(component);
+
+    component.formCards = undefined;
+    await component.updateComplete;
+
+    const sidebar = window.document.body.getElementsByTagName('nde-object-root')[0].shadowRoot.querySelector('div.content-and-sidebar nde-sidebar');
+    const formContent = window.document.body.getElementsByTagName('nde-object-root')[0].shadowRoot.querySelector('div.content-and-sidebar div.content');
+    const termSearch = window.document.body.getElementsByTagName('nde-object-root')[0].shadowRoot.querySelector('div.content-and-sidebar nde-term-search');
+    expect(sidebar).toBeFalsy();
+    expect(formContent).toBeFalsy();
+    expect(termSearch).toBeFalsy();
+
+  });
+
+  it('should prevent contextmenu events from being propagated on macos chrome', async () => {
+
+    Object.defineProperty(window, 'navigator', {
+      value: { userAgent: '... Macintosh ... Chrome/ ...' },
+      writable: true,
+    });
+
+    window.eval = jest.fn(() => ObjectImageryComponent);
+    customElements.define = jest.fn(() => ObjectImageryComponent);
+
+    component.components = [
+      {
+        description: 'Digita SemCom component voor beeldmateriaal informatie.',
+        label: 'Erfgoedobject Beeldmateriaal',
+        uri: 'http://localhost:3004/object-imagery.component.js',
+        shapes: [ 'http://xmlns.com/foaf/0.1/PersonalProfileDocument' ],
+        author: 'https://digita.ai',
+        tag: 'nde-object-imagery',
+        version: '0.1.0',
+        latest: true,
+      },
+    ];
+
+    window.document.body.appendChild(component);
+    await component.updateComplete;
+    await component.registerComponents(component.components);
+    await component.createComponents(component.components);
+
+    const event = new MouseEvent('contextmenu');
+    event.stopPropagation = jest.fn();
+    event.preventDefault = jest.fn();
+    component.formCards[0].dispatchEvent(event);
+
+    expect(event.stopPropagation).toHaveBeenCalled();
+    expect(event.preventDefault).toHaveBeenCalled();
+
+  });
+
+  describe('registerComponents()', () => {
+
+    it('should create customElements for this.components', async () => {
+
+      window.eval = jest.fn(() => ObjectImageryComponent);
+      customElements.define = jest.fn(() => ObjectImageryComponent);
+
+      machine.start();
+
+      window.document.body.appendChild(component);
+      await component.updateComplete;
+
+      component.components = [
+        {
+          description: 'Digita SemCom component voor beeldmateriaal informatie.',
+          label: 'Erfgoedobject Beeldmateriaal',
+          uri: 'http://localhost:3004/object-imagery.component.js',
+          shapes: [ 'http://xmlns.com/foaf/0.1/PersonalProfileDocument' ],
+          author: 'https://digita.ai',
+          tag: 'nde-object-imagery',
+          version: '0.1.0',
+          latest: true,
+        },
+        {
+          description: 'Digita SemCom component voor identificatie informatie.',
+          label: 'Erfgoedobject Identificatie',
+          uri: 'http://localhost:3004/object-identification.component.js',
+          shapes: [ 'http://xmlns.com/foaf/0.1/PersonalProfileDocument' ],
+          author: 'https://digita.ai',
+          tag: 'nde-object-identification',
+          version: '0.1.0',
+          latest: true,
+        },
+        {
+          description: 'Digita SemCom component voor vervaardiging informatie.',
+          label: 'Erfgoedobject Vervaardiging',
+          uri: 'http://localhost:3004/object-creation.component.js',
+          shapes: [ 'http://xmlns.com/foaf/0.1/PersonalProfileDocument' ],
+          author: 'https://digita.ai',
+          tag: 'nde-object-creation',
+          version: '0.1.0',
+          latest: true,
+        },
+        {
+          description: 'Digita SemCom component voor voorstellingsinformatie.',
+          label: 'Erfgoedobject Voorstelling',
+          uri: 'http://localhost:3004/object-representation.component.js',
+          shapes: [ 'http://digita.ai/voc/input#input' ],
+          author: 'https://digita.ai',
+          tag: 'nde-object-representation',
+          version: '0.1.0',
+          latest: true,
+        },
+        {
+          description: 'Digita SemCom component voor afmeting informatie.',
+          label: 'Erfgoedobject Afmetingen',
+          uri: 'http://localhost:3004/object-dimensions.component.js',
+          shapes: [ 'http://digita.ai/voc/payslip#payslip' ],
+          author: 'https://digita.ai',
+          tag: 'nde-object-dimensions',
+          version: '0.1.0',
+          latest: true,
+        },
+      ];
+
+      await component.registerComponents(component.components);
+
+    });
+
+  });
+
   describe('updateSelected()', () => {
 
     it('should set this.visibleCard to the currently visible card', async () => {
@@ -421,196 +616,40 @@ describe('ObjectRootComponent', () => {
 
   });
 
-  it('should send ClickedTermFieldEvent when CLICKED_TERM_FIELD event is caught', async (done) => {
-
-    machine.start();
-    machine.parent.start();
-
-    window.document.body.appendChild(component);
-    await component.updateComplete;
-
-    machine.onEvent((event) => {
-
-      if(event instanceof ClickedTermFieldEvent
-        && event.type === ObjectEvents.CLICKED_TERM_FIELD
-        && event.field === 'additionalType') {
-
-        done();
-
-      }
-
-    });
-
-    component.dispatchEvent(new CustomEvent<{ field: string; terms: Term[] }>(
-      'CLICKED_TERM_FIELD',
-      { bubbles: true, composed: true, detail: { field: 'additionalType', terms: [] } }
-    ));
-
-  });
-
-  describe('registerComponents()', () => {
+  describe('onImageSelected()', () => {
 
-    it('should create customElements for this.components', async () => {
+    const imageFile = new File([ 'foo' ], 'foo.jpg', { type: 'image/jpeg' });
 
-      window.eval = jest.fn(() => ObjectImageryComponent);
-      customElements.define = jest.fn(() => ObjectImageryComponent);
+    it('should set object.imageFile', async () => {
 
-      machine.start();
+      component.formActor = {
+        send: jest.fn(),
+      } as any;
 
       window.document.body.appendChild(component);
       await component.updateComplete;
 
-      component.components = [
-        {
-          description: 'Digita SemCom component voor beeldmateriaal informatie.',
-          label: 'Erfgoedobject Beeldmateriaal',
-          uri: 'http://localhost:3004/object-imagery.component.js',
-          shapes: [ 'http://xmlns.com/foaf/0.1/PersonalProfileDocument' ],
-          author: 'https://digita.ai',
-          tag: 'nde-object-imagery',
-          version: '0.1.0',
-          latest: true,
-        },
-        {
-          description: 'Digita SemCom component voor identificatie informatie.',
-          label: 'Erfgoedobject Identificatie',
-          uri: 'http://localhost:3004/object-identification.component.js',
-          shapes: [ 'http://xmlns.com/foaf/0.1/PersonalProfileDocument' ],
-          author: 'https://digita.ai',
-          tag: 'nde-object-identification',
-          version: '0.1.0',
-          latest: true,
-        },
-        {
-          description: 'Digita SemCom component voor vervaardiging informatie.',
-          label: 'Erfgoedobject Vervaardiging',
-          uri: 'http://localhost:3004/object-creation.component.js',
-          shapes: [ 'http://xmlns.com/foaf/0.1/PersonalProfileDocument' ],
-          author: 'https://digita.ai',
-          tag: 'nde-object-creation',
-          version: '0.1.0',
-          latest: true,
-        },
-        {
-          description: 'Digita SemCom component voor voorstellingsinformatie.',
-          label: 'Erfgoedobject Voorstelling',
-          uri: 'http://localhost:3004/object-representation.component.js',
-          shapes: [ 'http://digita.ai/voc/input#input' ],
-          author: 'https://digita.ai',
-          tag: 'nde-object-representation',
-          version: '0.1.0',
-          latest: true,
-        },
-        {
-          description: 'Digita SemCom component voor afmeting informatie.',
-          label: 'Erfgoedobject Afmetingen',
-          uri: 'http://localhost:3004/object-dimensions.component.js',
-          shapes: [ 'http://digita.ai/voc/payslip#payslip' ],
-          author: 'https://digita.ai',
-          tag: 'nde-object-dimensions',
-          version: '0.1.0',
-          latest: true,
-        },
-      ];
-
-      await component.registerComponents(component.components);
-
-    });
-
-  });
-
-  it('should show content when formCards is set', async () => {
-
-    window.document.body.appendChild(component);
-
-    customElements.define('nde-object-imagery', ObjectImageryComponent);
-    const div = document.createElement('nde-object-imagery') as ObjectImageryComponent;
-    div.id = 'object.sidebar.image';
-
-    component.formCards = [ div ];
-    await component.updateComplete;
-
-    const sidebar = window.document.body.getElementsByTagName('nde-object-root')[0].shadowRoot.querySelector('div.content-and-sidebar nde-sidebar');
-    const formContent = window.document.body.getElementsByTagName('nde-object-root')[0].shadowRoot.querySelector('div.content-and-sidebar div.content');
-    const termSearch = window.document.body.getElementsByTagName('nde-object-root')[0].shadowRoot.querySelector('div.content-and-sidebar nde-term-search');
-    expect(sidebar).toBeTruthy();
-    expect(formContent).toBeTruthy();
-    expect(termSearch).toBeFalsy();
-
-  });
-
-  it('should show term search when editing term field', async () => {
-
-    window.document.body.appendChild(component);
-
-    customElements.define('nde-object-imagery', ObjectImageryComponent);
-    const div = document.createElement('nde-object-imagery') as ObjectImageryComponent;
-    div.id = 'object.sidebar.image';
-
-    component.formCards = [ div ];
-    component.isEditingTermField = true;
-    await component.updateComplete;
-
-    const sidebar = window.document.body.getElementsByTagName('nde-object-root')[0].shadowRoot.querySelector('div.content-and-sidebar nde-sidebar');
-    const formContent = window.document.body.getElementsByTagName('nde-object-root')[0].shadowRoot.querySelector('div.content-and-sidebar div.content');
-    const termSearch = window.document.body.getElementsByTagName('nde-object-root')[0].shadowRoot.querySelector('div.content-and-sidebar nde-term-search');
-    expect(sidebar).toBeTruthy();
-    expect(formContent).toBeFalsy();
-    expect(termSearch).toBeTruthy();
-
-  });
+      expect(component.object.imageFile).toBeFalsy();
 
-  it('should hide content when formCards is undefined', async () => {
-
-    window.document.body.appendChild(component);
-
-    component.formCards = undefined;
-    await component.updateComplete;
+      component['onImageSelected'](new CustomEvent('image-selected', { detail: imageFile }));
 
-    const sidebar = window.document.body.getElementsByTagName('nde-object-root')[0].shadowRoot.querySelector('div.content-and-sidebar nde-sidebar');
-    const formContent = window.document.body.getElementsByTagName('nde-object-root')[0].shadowRoot.querySelector('div.content-and-sidebar div.content');
-    const termSearch = window.document.body.getElementsByTagName('nde-object-root')[0].shadowRoot.querySelector('div.content-and-sidebar nde-term-search');
-    expect(sidebar).toBeFalsy();
-    expect(formContent).toBeFalsy();
-    expect(termSearch).toBeFalsy();
+      expect(component.object.imageFile).toBeTruthy();
+      expect(component.object.imageFile).toEqual(imageFile);
 
-  });
-
-  it('should prevent contextmenu events from being propagated on macos chrome', async () => {
-
-    Object.defineProperty(window, 'navigator', {
-      value: { userAgent: '... Macintosh ... Chrome/ ...' },
-      writable: true,
     });
 
-    window.eval = jest.fn(() => ObjectImageryComponent);
-    customElements.define = jest.fn(() => ObjectImageryComponent);
+    it('should send FormUpdatedEvent to formactor', async (done) => {
 
-    component.components = [
-      {
-        description: 'Digita SemCom component voor beeldmateriaal informatie.',
-        label: 'Erfgoedobject Beeldmateriaal',
-        uri: 'http://localhost:3004/object-imagery.component.js',
-        shapes: [ 'http://xmlns.com/foaf/0.1/PersonalProfileDocument' ],
-        author: 'https://digita.ai',
-        tag: 'nde-object-imagery',
-        version: '0.1.0',
-        latest: true,
-      },
-    ];
+      component.formActor = {
+        send: done(),
+      } as any;
 
-    window.document.body.appendChild(component);
-    await component.updateComplete;
-    await component.registerComponents(component.components);
-    await component.createComponents(component.components);
+      window.document.body.appendChild(component);
+      await component.updateComplete;
 
-    const event = new MouseEvent('contextmenu');
-    event.stopPropagation = jest.fn();
-    event.preventDefault = jest.fn();
-    component.formCards[0].dispatchEvent(event);
+      component['onImageSelected'](new CustomEvent('image-selected', { detail: imageFile }));
 
-    expect(event.stopPropagation).toHaveBeenCalled();
-    expect(event.preventDefault).toHaveBeenCalled();
+    });
 
   });
 
diff --git a/packages/solid-crs-manage/lib/features/object/object-root.component.ts b/packages/solid-crs-manage/lib/features/object/object-root.component.ts
index aa5e54be..597213f1 100644
--- a/packages/solid-crs-manage/lib/features/object/object-root.component.ts
+++ b/packages/solid-crs-manage/lib/features/object/object-root.component.ts
@@ -378,7 +378,9 @@ export class ObjectRootComponent extends RxLitElement {
     this.formActor.send(new FormUpdatedEvent(
       'image',
       // use the object's uri to determine object storage directory
-      `${new URL(this.object.uri).origin}${new URL(this.object.uri).pathname.split('/').slice(0, -1).join('/')}/${v4()}-${this.object.imageFile.name}`
+      // this value will only be used temporarily until the object is saved
+      // after which it is set to a value chosen by the pod server
+      `${new URL(this.object.uri).origin}${new URL(this.object.uri).pathname.split('/').slice(0, -1).join('/')}/${this.object.imageFile.name}`
     ));
 
   }
diff --git a/packages/solid-crs-manage/package.json b/packages/solid-crs-manage/package.json
index 40b4fc53..f327b8c8 100644
--- a/packages/solid-crs-manage/package.json
+++ b/packages/solid-crs-manage/package.json
@@ -88,10 +88,10 @@
     ],
     "coverageThreshold": {
       "global": {
-        "statements": 86.51,
+        "statements": 86.56,
         "branches": 83.79,
-        "lines": 87.61,
-        "functions": 75.21
+        "lines": 87.66,
+        "functions": 75.28
       }
     },
     "automock": false,
@@ -113,4 +113,4 @@
     },
     "maxWorkers": 6
   }
-}
+}
\ No newline at end of file

From fe871446659c2037b915d29d15f09041354e6163 Mon Sep 17 00:00:00 2001
From: Stijn Taelemans <stijn@digita.ai>
Date: Wed, 1 Dec 2021 16:13:37 +0100
Subject: [PATCH 3/7] chore: typo in import

---
 packages/solid-crs-client/lib/index.ts                         | 2 +-
 .../lib/solid/collection-object-solid-store.spec.ts            | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/solid-crs-client/lib/index.ts b/packages/solid-crs-client/lib/index.ts
index 342388d1..0bb6d39a 100644
--- a/packages/solid-crs-client/lib/index.ts
+++ b/packages/solid-crs-client/lib/index.ts
@@ -1,2 +1,2 @@
 export { login, handleIncomingRedirect, logout, fetch, getDefaultSession } from '@inrupt/solid-client-authn-browser';
-export { getSolidDataset, getThing, getStringNoLocale, getStringNoLocaleAll, getUrl, getStringByLocaleAll, getStringWithLocale, getStringWithLocaleAll, getThingAll, getUrlAll, removeAll, removeThing, saveSolidDatasetAt, setThing, removeUrl, Thing, addStringWithLocale, addStringNoLocale, addUrl, addDatetime, getDatetime, createThing, asUrl, overwriteFile, deleteFile, ThingPersisted, getInteger, addInteger, access, addDecimal, getDecimal, SolidDataset, createSolidDataset, saveFileInContainer } from '@inrupt/solid-client';
+export { getSolidDataset, getThing, getStringNoLocale, getStringNoLocaleAll, getUrl, getStringByLocaleAll, getStringWithLocale, getStringWithLocaleAll, getThingAll, getUrlAll, removeAll, removeThing, saveSolidDatasetAt, setThing, removeUrl, Thing, addStringWithLocale, addStringNoLocale, addUrl, addDatetime, getDatetime, createThing, asUrl, overwriteFile, deleteFile, ThingPersisted, getInteger, addInteger, access, addDecimal, getDecimal, SolidDataset, createSolidDataset, saveFileInContainer, WithResourceInfo } from '@inrupt/solid-client';
diff --git a/packages/solid-crs-core/lib/solid/collection-object-solid-store.spec.ts b/packages/solid-crs-core/lib/solid/collection-object-solid-store.spec.ts
index 04645b8a..1db6ef7c 100644
--- a/packages/solid-crs-core/lib/solid/collection-object-solid-store.spec.ts
+++ b/packages/solid-crs-core/lib/solid/collection-object-solid-store.spec.ts
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import * as client from '@netwerk-digitaal-erfgoed/solid-crs-client';
-import { getStringNoLocale, getStringWithLocale, getUrl } from '@netwerk-digitaal-erfgoed/solid-crs-client';
-import { WithResourceInfo } from '@netwerk-digitaal-erfgoed/solid-crs-client/node_modules/@inrupt/solid-client';
+import { getStringNoLocale, getStringWithLocale, getUrl, WithResourceInfo } from '@netwerk-digitaal-erfgoed/solid-crs-client';
 import { Collection } from '../collections/collection';
 import { CollectionObject } from '../collections/collection-object';
 import { CollectionObjectSolidStore } from './collection-object-solid-store';

From 2f0d946a6b7d4596d489fd1730ee8610d12bd3de Mon Sep 17 00:00:00 2001
From: Stijn Taelemans <stijn@digita.ai>
Date: Thu, 2 Dec 2021 11:22:41 +0100
Subject: [PATCH 4/7] fix: updated styling

---
 .../lib/object-imagery.component.ts                           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/solid-crs-semcom-components/lib/object-imagery.component.ts b/packages/solid-crs-semcom-components/lib/object-imagery.component.ts
index 1b5f1b93..6ba56a1a 100644
--- a/packages/solid-crs-semcom-components/lib/object-imagery.component.ts
+++ b/packages/solid-crs-semcom-components/lib/object-imagery.component.ts
@@ -189,7 +189,8 @@ export class ObjectImageryComponent extends RxLitElement {
           object-fit: cover;
         }
         nde-separator {
-          height: var(--gap-normal);
+          margin: 10px 0;
+          font-size: var(--font-size-small);
         }
         .image-container {
           display: flex;
@@ -203,6 +204,7 @@ export class ObjectImageryComponent extends RxLitElement {
         }
         .image-upload-container p {
           margin: 0;
+          font-size: var(--font-size-small);
         }
         .image-upload-container button {
           background-color: var(--colors-primary-light);

From 8f780ef172878036dc420ea45152287f7a227f17 Mon Sep 17 00:00:00 2001
From: Stijn Taelemans <stijn@digita.ai>
Date: Thu, 2 Dec 2021 11:35:11 +0100
Subject: [PATCH 5/7] fix: styling for action icons in object page

---
 .../lib/features/collection/collection-root.component.ts     | 1 -
 .../lib/features/object/object-root.component.ts             | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/solid-crs-manage/lib/features/collection/collection-root.component.ts b/packages/solid-crs-manage/lib/features/collection/collection-root.component.ts
index 3c86670a..44eade1b 100644
--- a/packages/solid-crs-manage/lib/features/collection/collection-root.component.ts
+++ b/packages/solid-crs-manage/lib/features/collection/collection-root.component.ts
@@ -432,7 +432,6 @@ export class CollectionRootComponent extends RxLitElement {
         button.light {
           color:var(--colors-primary-dark);
         }
-
         div[slot="actions"] a svg {
           width: 20px;
           height: 20px;
diff --git a/packages/solid-crs-manage/lib/features/object/object-root.component.ts b/packages/solid-crs-manage/lib/features/object/object-root.component.ts
index 597213f1..2e57ddcf 100644
--- a/packages/solid-crs-manage/lib/features/object/object-root.component.ts
+++ b/packages/solid-crs-manage/lib/features/object/object-root.component.ts
@@ -690,6 +690,11 @@ export class ObjectRootComponent extends RxLitElement {
         button.light {
           color:var(--colors-primary-dark);
         }
+        div[slot="actions"] a svg {
+          width: 20px;
+          height: 20px;
+          fill: var(--colors-primary-light);
+        }
       `,
     ];
 

From c5f9ae938171f2d4be41f3b658d8500581e736c7 Mon Sep 17 00:00:00 2001
From: Stijn Taelemans <stijn@digita.ai>
Date: Thu, 2 Dec 2021 13:40:55 +0100
Subject: [PATCH 6/7] fix: ensure unique filenames for images

---
 .../lib/solid/collection-object-solid-store.spec.ts           | 4 ++--
 .../solid-crs-core/lib/solid/collection-object-solid-store.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/solid-crs-core/lib/solid/collection-object-solid-store.spec.ts b/packages/solid-crs-core/lib/solid/collection-object-solid-store.spec.ts
index 1db6ef7c..41b9c955 100644
--- a/packages/solid-crs-core/lib/solid/collection-object-solid-store.spec.ts
+++ b/packages/solid-crs-core/lib/solid/collection-object-solid-store.spec.ts
@@ -867,9 +867,9 @@ describe('CollectionObjectSolidStore', () => {
       expect(client.saveFileInContainer).toHaveBeenCalledTimes(1);
 
       expect(client.saveFileInContainer).toHaveBeenCalledWith(
-        `https://object.uri/objects/`,
+        expect.stringMatching(`https://object.uri/objects/`),
         imageFile,
-        expect.objectContaining({ slug: 'image.png', contentType: 'image/png' }),
+        expect.objectContaining({ slug: expect.stringMatching(/^.*-image\.png$/), contentType: 'image/png' }),
       );
 
     });
diff --git a/packages/solid-crs-core/lib/solid/collection-object-solid-store.ts b/packages/solid-crs-core/lib/solid/collection-object-solid-store.ts
index aa58940f..ab025503 100644
--- a/packages/solid-crs-core/lib/solid/collection-object-solid-store.ts
+++ b/packages/solid-crs-core/lib/solid/collection-object-solid-store.ts
@@ -716,7 +716,7 @@ export class CollectionObjectSolidStore implements CollectionObjectStore {
     const savedFile = await saveFileInContainer(
       `${new URL(objectUri).origin}${new URL(objectUri).pathname.split('/').slice(0, -1).join('/')}/`,
       imageFile,
-      { slug: imageFile.name, contentType: imageFile.type, fetch }
+      { slug: `${v4().split('-')[0]}-${imageFile.name}`, contentType: imageFile.type, fetch }
     );
 
     return savedFile.internal_resourceInfo.sourceIri;

From 3a41af692c79113f45751981e2fe73fa444b9921 Mon Sep 17 00:00:00 2001
From: Stijn Taelemans <stijn@digita.ai>
Date: Tue, 7 Dec 2021 11:24:34 +0100
Subject: [PATCH 7/7] fix: set public access for uploaded images

---
 package.json                                               | 4 ++--
 .../lib/solid/collection-object-solid-store.spec.ts        | 4 ++++
 .../lib/solid/collection-object-solid-store.ts             | 7 ++++++-
 packages/solid-crs-core/package.json                       | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 5153dea9..cc0a8d82 100644
--- a/package.json
+++ b/package.json
@@ -18,8 +18,8 @@
     "release:antora": "echo \"$(yaml set docs/antora.yml version $(dot-json lerna.json version))\" > docs/antora.yml",
     "start": "lerna run start --parallel",
     "start:watch": "lerna run start:watch --parallel",
-    "test": "lerna run test --since HEAD",
-    "test:all": "lerna run test",
+    "test": "lerna run test --since HEAD --parallel --concurrency 2",
+    "test:all": "lerna run test --parallel --concurrency 2",
     "test:ci": "lerna run test:ci"
   },
   "devDependencies": {
diff --git a/packages/solid-crs-core/lib/solid/collection-object-solid-store.spec.ts b/packages/solid-crs-core/lib/solid/collection-object-solid-store.spec.ts
index 615b0cb3..9e3ee330 100644
--- a/packages/solid-crs-core/lib/solid/collection-object-solid-store.spec.ts
+++ b/packages/solid-crs-core/lib/solid/collection-object-solid-store.spec.ts
@@ -851,6 +851,8 @@ describe('CollectionObjectSolidStore', () => {
         },
       }));
 
+      service.setPublicAccess = jest.fn(async () => undefined);
+
     });
 
     it.each([ null, undefined ])('should error when objectUri is %s', async (value) => {
@@ -878,6 +880,8 @@ describe('CollectionObjectSolidStore', () => {
         expect.objectContaining({ slug: expect.stringMatching(/^.*-image\.png$/), contentType: 'image/png' }),
       );
 
+      expect(service.setPublicAccess).toHaveBeenCalledTimes(1);
+
     });
 
   });
diff --git a/packages/solid-crs-core/lib/solid/collection-object-solid-store.ts b/packages/solid-crs-core/lib/solid/collection-object-solid-store.ts
index 406b0c81..df2e86c5 100644
--- a/packages/solid-crs-core/lib/solid/collection-object-solid-store.ts
+++ b/packages/solid-crs-core/lib/solid/collection-object-solid-store.ts
@@ -725,7 +725,12 @@ export class CollectionObjectSolidStore extends SolidStore<CollectionObject> imp
       { slug: `${v4().split('-')[0]}-${imageFile.name}`, contentType: imageFile.type, fetch }
     );
 
-    return savedFile.internal_resourceInfo.sourceIri;
+    const imageUri = savedFile.internal_resourceInfo.sourceIri;
+
+    // set public access for this image
+    await this.setPublicAccess(imageUri);
+
+    return imageUri;
 
   }
 
diff --git a/packages/solid-crs-core/package.json b/packages/solid-crs-core/package.json
index bbea31ef..f87d857f 100644
--- a/packages/solid-crs-core/package.json
+++ b/packages/solid-crs-core/package.json
@@ -76,7 +76,7 @@
       "global": {
         "branches": 92.23,
         "statements": 97.46,
-        "lines": 97.33,
+        "lines": 97.34,
         "functions": 99.39
       }
     },