@data-fair/lib-common-types 1.16.5 → 1.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/lib-common-types",
-  "version": "1.16.5",
+  "version": "1.17.0",
   "description": "Shared schemas and built type definitions in the data-fair stack.",
   "main": "index.js",
   "scripts": {

package/session/.type/index.d.ts

@@ -30,6 +30,7 @@ export type User = {
   isAdmin?: 1;
   adminMode?: 1;
   asAdmin?: UserRef;
+  asAdminOrg?: OrganizationMembership;
   pd?: string;
   ipa?: ShortForIgnorePersonalAccount;
   idp?: IsTheUserComingFromACoreIDProvider;

package/session/.type/validate.js

@@ -5,10 +5,10 @@ import { fullFormats } from "ajv-formats/dist/formats.js";
 "use strict";
 export const validate = validate14;
 export default validate14;
-const schema16 = {"$id":"https://github.com/data-fair/lib/session-state","x-exports":["types","validate"],"type":"object","title":"session state","additionalProperties":false,"required":["lang"],"properties":{"user":{"$ref":"#/$defs/user"},"organization":{"$ref":"#/$defs/organizationMembership"},"account":{"$ref":"#/$defs/account"},"accountRole":{"type":"string"},"siteRole":{"type":"string"},"lang":{"type":"string"},"dark":{"deprecated":true,"type":"boolean"}},"$defs":{"organizationMembership":{"type":"object","additionalProperties":false,"required":["id","name","role"],"properties":{"id":{"type":"string"},"name":{"type":"string"},"role":{"type":"string"},"roleLabel":{"type":"string"},"department":{"type":"string"},"departmentName":{"type":"string"},"dflt":{"type":"integer","enum":[1]}}},"userRef":{"type":"object","additionalProperties":false,"required":["id","name"],"properties":{"id":{"type":"string"},"name":{"type":"string"}}},"user":{"type":"object","additionalProperties":false,"required":["email","id","name","organizations"],"properties":{"email":{"type":"string","format":"email"},"id":{"type":"string"},"name":{"type":"string"},"organizations":{"type":"array","items":{"$ref":"#/$defs/organizationMembership"}},"isAdmin":{"type":"integer","enum":[1]},"adminMode":{"type":"integer","enum":[1]},"asAdmin":{"$ref":"#/$defs/userRef"},"pd":{"type":"string","format":"date"},"ipa":{"type":"integer","title":"short for ignorePersonalAccount","enum":[1]},"idp":{"type":"integer","title":"Is the user coming from a core ID provider ?","enum":[1]},"os":{"type":"integer","title":"short for orgStorage","enum":[1]},"rememberMe":{"type":"integer","enum":[1]},"siteOwner":{"$ref":"#/$defs/account"}}},"account":{"type":"object","additionalProperties":false,"required":["type","id","name"],"properties":{"type":{"type":"string","enum":["user","organization"]},"id":{"type":"string"},"name":{"type":"string"},"department":{"type":"string"},"departmentName":{"type":"string"}}}}};
+const schema16 = {"$id":"https://github.com/data-fair/lib/session-state","x-exports":["types","validate"],"type":"object","title":"session state","additionalProperties":false,"required":["lang"],"properties":{"user":{"$ref":"#/$defs/user"},"organization":{"$ref":"#/$defs/organizationMembership"},"account":{"$ref":"#/$defs/account"},"accountRole":{"type":"string"},"siteRole":{"type":"string"},"lang":{"type":"string"},"dark":{"deprecated":true,"type":"boolean"}},"$defs":{"organizationMembership":{"type":"object","additionalProperties":false,"required":["id","name","role"],"properties":{"id":{"type":"string"},"name":{"type":"string"},"role":{"type":"string"},"roleLabel":{"type":"string"},"department":{"type":"string"},"departmentName":{"type":"string"},"dflt":{"type":"integer","enum":[1]}}},"userRef":{"type":"object","additionalProperties":false,"required":["id","name"],"properties":{"id":{"type":"string"},"name":{"type":"string"}}},"user":{"type":"object","additionalProperties":false,"required":["email","id","name","organizations"],"properties":{"email":{"type":"string","format":"email"},"id":{"type":"string"},"name":{"type":"string"},"organizations":{"type":"array","items":{"$ref":"#/$defs/organizationMembership"}},"isAdmin":{"type":"integer","enum":[1]},"adminMode":{"type":"integer","enum":[1]},"asAdmin":{"$ref":"#/$defs/userRef"},"asAdminOrg":{"$ref":"#/$defs/organizationMembership"},"pd":{"type":"string","format":"date"},"ipa":{"type":"integer","title":"short for ignorePersonalAccount","enum":[1]},"idp":{"type":"integer","title":"Is the user coming from a core ID provider ?","enum":[1]},"os":{"type":"integer","title":"short for orgStorage","enum":[1]},"rememberMe":{"type":"integer","enum":[1]},"siteOwner":{"$ref":"#/$defs/account"}}},"account":{"type":"object","additionalProperties":false,"required":["type","id","name"],"properties":{"type":{"type":"string","enum":["user","organization"]},"id":{"type":"string"},"name":{"type":"string"},"department":{"type":"string"},"departmentName":{"type":"string"}}}}};
 const schema18 = {"type":"object","additionalProperties":false,"required":["id","name","role"],"properties":{"id":{"type":"string"},"name":{"type":"string"},"role":{"type":"string"},"roleLabel":{"type":"string"},"department":{"type":"string"},"departmentName":{"type":"string"},"dflt":{"type":"integer","enum":[1]}}};
-const schema20 = {"type":"object","additionalProperties":false,"required":["type","id","name"],"properties":{"type":{"type":"string","enum":["user","organization"]},"id":{"type":"string"},"name":{"type":"string"},"department":{"type":"string"},"departmentName":{"type":"string"}}};
-const schema17 = {"type":"object","additionalProperties":false,"required":["email","id","name","organizations"],"properties":{"email":{"type":"string","format":"email"},"id":{"type":"string"},"name":{"type":"string"},"organizations":{"type":"array","items":{"$ref":"#/$defs/organizationMembership"}},"isAdmin":{"type":"integer","enum":[1]},"adminMode":{"type":"integer","enum":[1]},"asAdmin":{"$ref":"#/$defs/userRef"},"pd":{"type":"string","format":"date"},"ipa":{"type":"integer","title":"short for ignorePersonalAccount","enum":[1]},"idp":{"type":"integer","title":"Is the user coming from a core ID provider ?","enum":[1]},"os":{"type":"integer","title":"short for orgStorage","enum":[1]},"rememberMe":{"type":"integer","enum":[1]},"siteOwner":{"$ref":"#/$defs/account"}}};
+const schema21 = {"type":"object","additionalProperties":false,"required":["type","id","name"],"properties":{"type":{"type":"string","enum":["user","organization"]},"id":{"type":"string"},"name":{"type":"string"},"department":{"type":"string"},"departmentName":{"type":"string"}}};
+const schema17 = {"type":"object","additionalProperties":false,"required":["email","id","name","organizations"],"properties":{"email":{"type":"string","format":"email"},"id":{"type":"string"},"name":{"type":"string"},"organizations":{"type":"array","items":{"$ref":"#/$defs/organizationMembership"}},"isAdmin":{"type":"integer","enum":[1]},"adminMode":{"type":"integer","enum":[1]},"asAdmin":{"$ref":"#/$defs/userRef"},"asAdminOrg":{"$ref":"#/$defs/organizationMembership"},"pd":{"type":"string","format":"date"},"ipa":{"type":"integer","title":"short for ignorePersonalAccount","enum":[1]},"idp":{"type":"integer","title":"Is the user coming from a core ID provider ?","enum":[1]},"os":{"type":"integer","title":"short for orgStorage","enum":[1]},"rememberMe":{"type":"integer","enum":[1]},"siteOwner":{"$ref":"#/$defs/account"}}};
 const schema19 = {"type":"object","additionalProperties":false,"required":["id","name"],"properties":{"id":{"type":"string"},"name":{"type":"string"}}};
 const func2 = Object.prototype.hasOwnProperty;
 const formats0 = /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i;
@@ -404,11 +404,11 @@ vErrors.push(err32);
 errors++;
 }
 }
-if(data.pd !== undefined){
-let data17 = data.pd;
-if(typeof data17 === "string"){
-if(!(formats2.validate(data17))){
-const err33 = {instancePath:instancePath+"/pd",schemaPath:"#/properties/pd/format",keyword:"format",params:{format: "date"},message:"must match format \""+"date"+"\""};
+if(data.asAdminOrg !== undefined){
+let data17 = data.asAdminOrg;
+if(data17 && typeof data17 == "object" && !Array.isArray(data17)){
+if(data17.id === undefined){
+const err33 = {instancePath:instancePath+"/asAdminOrg",schemaPath:"#/$defs/organizationMembership/required",keyword:"required",params:{missingProperty: "id"},message:"must have required property '"+"id"+"'"};
 if(vErrors === null){
 vErrors = [err33];
 }
@@ -417,9 +417,8 @@ vErrors.push(err33);
 }
 errors++;
 }
-}
-else {
-const err34 = {instancePath:instancePath+"/pd",schemaPath:"#/properties/pd/type",keyword:"type",params:{type: "string"},message:"must be string"};
+if(data17.name === undefined){
+const err34 = {instancePath:instancePath+"/asAdminOrg",schemaPath:"#/$defs/organizationMembership/required",keyword:"required",params:{missingProperty: "name"},message:"must have required property '"+"name"+"'"};
 if(vErrors === null){
 vErrors = [err34];
 }
@@ -428,11 +427,8 @@ vErrors.push(err34);
 }
 errors++;
 }
-}
-if(data.ipa !== undefined){
-let data18 = data.ipa;
-if(!((typeof data18 == "number") && (!(data18 % 1) && !isNaN(data18)))){
-const err35 = {instancePath:instancePath+"/ipa",schemaPath:"#/properties/ipa/type",keyword:"type",params:{type: "integer"},message:"must be integer"};
+if(data17.role === undefined){
+const err35 = {instancePath:instancePath+"/asAdminOrg",schemaPath:"#/$defs/organizationMembership/required",keyword:"required",params:{missingProperty: "role"},message:"must have required property '"+"role"+"'"};
 if(vErrors === null){
 vErrors = [err35];
 }
@@ -441,8 +437,9 @@ vErrors.push(err35);
 }
 errors++;
 }
-if(!(data18 === 1)){
-const err36 = {instancePath:instancePath+"/ipa",schemaPath:"#/properties/ipa/enum",keyword:"enum",params:{allowedValues: schema17.properties.ipa.enum},message:"must be equal to one of the allowed values"};
+for(const key3 in data17){
+if(!(((((((key3 === "id") || (key3 === "name")) || (key3 === "role")) || (key3 === "roleLabel")) || (key3 === "department")) || (key3 === "departmentName")) || (key3 === "dflt"))){
+const err36 = {instancePath:instancePath+"/asAdminOrg",schemaPath:"#/$defs/organizationMembership/additionalProperties",keyword:"additionalProperties",params:{additionalProperty: key3},message:"must NOT have additional properties"};
 if(vErrors === null){
 vErrors = [err36];
 }
@@ -452,10 +449,9 @@ vErrors.push(err36);
 errors++;
 }
 }
-if(data.idp !== undefined){
-let data19 = data.idp;
-if(!((typeof data19 == "number") && (!(data19 % 1) && !isNaN(data19)))){
-const err37 = {instancePath:instancePath+"/idp",schemaPath:"#/properties/idp/type",keyword:"type",params:{type: "integer"},message:"must be integer"};
+if(data17.id !== undefined){
+if(typeof data17.id !== "string"){
+const err37 = {instancePath:instancePath+"/asAdminOrg/id",schemaPath:"#/$defs/organizationMembership/properties/id/type",keyword:"type",params:{type: "string"},message:"must be string"};
 if(vErrors === null){
 vErrors = [err37];
 }
@@ -464,8 +460,10 @@ vErrors.push(err37);
 }
 errors++;
 }
-if(!(data19 === 1)){
-const err38 = {instancePath:instancePath+"/idp",schemaPath:"#/properties/idp/enum",keyword:"enum",params:{allowedValues: schema17.properties.idp.enum},message:"must be equal to one of the allowed values"};
+}
+if(data17.name !== undefined){
+if(typeof data17.name !== "string"){
+const err38 = {instancePath:instancePath+"/asAdminOrg/name",schemaPath:"#/$defs/organizationMembership/properties/name/type",keyword:"type",params:{type: "string"},message:"must be string"};
 if(vErrors === null){
 vErrors = [err38];
 }
@@ -475,10 +473,9 @@ vErrors.push(err38);
 errors++;
 }
 }
-if(data.os !== undefined){
-let data20 = data.os;
-if(!((typeof data20 == "number") && (!(data20 % 1) && !isNaN(data20)))){
-const err39 = {instancePath:instancePath+"/os",schemaPath:"#/properties/os/type",keyword:"type",params:{type: "integer"},message:"must be integer"};
+if(data17.role !== undefined){
+if(typeof data17.role !== "string"){
+const err39 = {instancePath:instancePath+"/asAdminOrg/role",schemaPath:"#/$defs/organizationMembership/properties/role/type",keyword:"type",params:{type: "string"},message:"must be string"};
 if(vErrors === null){
 vErrors = [err39];
 }
@@ -487,8 +484,10 @@ vErrors.push(err39);
 }
 errors++;
 }
-if(!(data20 === 1)){
-const err40 = {instancePath:instancePath+"/os",schemaPath:"#/properties/os/enum",keyword:"enum",params:{allowedValues: schema17.properties.os.enum},message:"must be equal to one of the allowed values"};
+}
+if(data17.roleLabel !== undefined){
+if(typeof data17.roleLabel !== "string"){
+const err40 = {instancePath:instancePath+"/asAdminOrg/roleLabel",schemaPath:"#/$defs/organizationMembership/properties/roleLabel/type",keyword:"type",params:{type: "string"},message:"must be string"};
 if(vErrors === null){
 vErrors = [err40];
 }
@@ -498,10 +497,9 @@ vErrors.push(err40);
 errors++;
 }
 }
-if(data.rememberMe !== undefined){
-let data21 = data.rememberMe;
-if(!((typeof data21 == "number") && (!(data21 % 1) && !isNaN(data21)))){
-const err41 = {instancePath:instancePath+"/rememberMe",schemaPath:"#/properties/rememberMe/type",keyword:"type",params:{type: "integer"},message:"must be integer"};
+if(data17.department !== undefined){
+if(typeof data17.department !== "string"){
+const err41 = {instancePath:instancePath+"/asAdminOrg/department",schemaPath:"#/$defs/organizationMembership/properties/department/type",keyword:"type",params:{type: "string"},message:"must be string"};
 if(vErrors === null){
 vErrors = [err41];
 }
@@ -510,8 +508,10 @@ vErrors.push(err41);
 }
 errors++;
 }
-if(!(data21 === 1)){
-const err42 = {instancePath:instancePath+"/rememberMe",schemaPath:"#/properties/rememberMe/enum",keyword:"enum",params:{allowedValues: schema17.properties.rememberMe.enum},message:"must be equal to one of the allowed values"};
+}
+if(data17.departmentName !== undefined){
+if(typeof data17.departmentName !== "string"){
+const err42 = {instancePath:instancePath+"/asAdminOrg/departmentName",schemaPath:"#/$defs/organizationMembership/properties/departmentName/type",keyword:"type",params:{type: "string"},message:"must be string"};
 if(vErrors === null){
 vErrors = [err42];
 }
@@ -521,11 +521,10 @@ vErrors.push(err42);
 errors++;
 }
 }
-if(data.siteOwner !== undefined){
-let data22 = data.siteOwner;
-if(data22 && typeof data22 == "object" && !Array.isArray(data22)){
-if(data22.type === undefined){
-const err43 = {instancePath:instancePath+"/siteOwner",schemaPath:"#/$defs/account/required",keyword:"required",params:{missingProperty: "type"},message:"must have required property '"+"type"+"'"};
+if(data17.dflt !== undefined){
+let data24 = data17.dflt;
+if(!((typeof data24 == "number") && (!(data24 % 1) && !isNaN(data24)))){
+const err43 = {instancePath:instancePath+"/asAdminOrg/dflt",schemaPath:"#/$defs/organizationMembership/properties/dflt/type",keyword:"type",params:{type: "integer"},message:"must be integer"};
 if(vErrors === null){
 vErrors = [err43];
 }
@@ -534,8 +533,8 @@ vErrors.push(err43);
 }
 errors++;
 }
-if(data22.id === undefined){
-const err44 = {instancePath:instancePath+"/siteOwner",schemaPath:"#/$defs/account/required",keyword:"required",params:{missingProperty: "id"},message:"must have required property '"+"id"+"'"};
+if(!(data24 === 1)){
+const err44 = {instancePath:instancePath+"/asAdminOrg/dflt",schemaPath:"#/$defs/organizationMembership/properties/dflt/enum",keyword:"enum",params:{allowedValues: schema18.properties.dflt.enum},message:"must be equal to one of the allowed values"};
 if(vErrors === null){
 vErrors = [err44];
 }
@@ -544,8 +543,10 @@ vErrors.push(err44);
 }
 errors++;
 }
-if(data22.name === undefined){
-const err45 = {instancePath:instancePath+"/siteOwner",schemaPath:"#/$defs/account/required",keyword:"required",params:{missingProperty: "name"},message:"must have required property '"+"name"+"'"};
+}
+}
+else {
+const err45 = {instancePath:instancePath+"/asAdminOrg",schemaPath:"#/$defs/organizationMembership/type",keyword:"type",params:{type: "object"},message:"must be object"};
 if(vErrors === null){
 vErrors = [err45];
 }
@@ -554,9 +555,12 @@ vErrors.push(err45);
 }
 errors++;
 }
-for(const key3 in data22){
-if(!(((((key3 === "type") || (key3 === "id")) || (key3 === "name")) || (key3 === "department")) || (key3 === "departmentName"))){
-const err46 = {instancePath:instancePath+"/siteOwner",schemaPath:"#/$defs/account/additionalProperties",keyword:"additionalProperties",params:{additionalProperty: key3},message:"must NOT have additional properties"};
+}
+if(data.pd !== undefined){
+let data25 = data.pd;
+if(typeof data25 === "string"){
+if(!(formats2.validate(data25))){
+const err46 = {instancePath:instancePath+"/pd",schemaPath:"#/properties/pd/format",keyword:"format",params:{format: "date"},message:"must match format \""+"date"+"\""};
 if(vErrors === null){
 vErrors = [err46];
 }
@@ -566,10 +570,8 @@ vErrors.push(err46);
 errors++;
 }
 }
-if(data22.type !== undefined){
-let data23 = data22.type;
-if(typeof data23 !== "string"){
-const err47 = {instancePath:instancePath+"/siteOwner/type",schemaPath:"#/$defs/account/properties/type/type",keyword:"type",params:{type: "string"},message:"must be string"};
+else {
+const err47 = {instancePath:instancePath+"/pd",schemaPath:"#/properties/pd/type",keyword:"type",params:{type: "string"},message:"must be string"};
 if(vErrors === null){
 vErrors = [err47];
 }
@@ -578,8 +580,11 @@ vErrors.push(err47);
 }
 errors++;
 }
-if(!((data23 === "user") || (data23 === "organization"))){
-const err48 = {instancePath:instancePath+"/siteOwner/type",schemaPath:"#/$defs/account/properties/type/enum",keyword:"enum",params:{allowedValues: schema20.properties.type.enum},message:"must be equal to one of the allowed values"};
+}
+if(data.ipa !== undefined){
+let data26 = data.ipa;
+if(!((typeof data26 == "number") && (!(data26 % 1) && !isNaN(data26)))){
+const err48 = {instancePath:instancePath+"/ipa",schemaPath:"#/properties/ipa/type",keyword:"type",params:{type: "integer"},message:"must be integer"};
 if(vErrors === null){
 vErrors = [err48];
 }
@@ -588,10 +593,8 @@ vErrors.push(err48);
 }
 errors++;
 }
-}
-if(data22.id !== undefined){
-if(typeof data22.id !== "string"){
-const err49 = {instancePath:instancePath+"/siteOwner/id",schemaPath:"#/$defs/account/properties/id/type",keyword:"type",params:{type: "string"},message:"must be string"};
+if(!(data26 === 1)){
+const err49 = {instancePath:instancePath+"/ipa",schemaPath:"#/properties/ipa/enum",keyword:"enum",params:{allowedValues: schema17.properties.ipa.enum},message:"must be equal to one of the allowed values"};
 if(vErrors === null){
 vErrors = [err49];
 }
@@ -601,9 +604,10 @@ vErrors.push(err49);
 errors++;
 }
 }
-if(data22.name !== undefined){
-if(typeof data22.name !== "string"){
-const err50 = {instancePath:instancePath+"/siteOwner/name",schemaPath:"#/$defs/account/properties/name/type",keyword:"type",params:{type: "string"},message:"must be string"};
+if(data.idp !== undefined){
+let data27 = data.idp;
+if(!((typeof data27 == "number") && (!(data27 % 1) && !isNaN(data27)))){
+const err50 = {instancePath:instancePath+"/idp",schemaPath:"#/properties/idp/type",keyword:"type",params:{type: "integer"},message:"must be integer"};
 if(vErrors === null){
 vErrors = [err50];
 }
@@ -612,10 +616,8 @@ vErrors.push(err50);
 }
 errors++;
 }
-}
-if(data22.department !== undefined){
-if(typeof data22.department !== "string"){
-const err51 = {instancePath:instancePath+"/siteOwner/department",schemaPath:"#/$defs/account/properties/department/type",keyword:"type",params:{type: "string"},message:"must be string"};
+if(!(data27 === 1)){
+const err51 = {instancePath:instancePath+"/idp",schemaPath:"#/properties/idp/enum",keyword:"enum",params:{allowedValues: schema17.properties.idp.enum},message:"must be equal to one of the allowed values"};
 if(vErrors === null){
 vErrors = [err51];
 }
@@ -625,9 +627,10 @@ vErrors.push(err51);
 errors++;
 }
 }
-if(data22.departmentName !== undefined){
-if(typeof data22.departmentName !== "string"){
-const err52 = {instancePath:instancePath+"/siteOwner/departmentName",schemaPath:"#/$defs/account/properties/departmentName/type",keyword:"type",params:{type: "string"},message:"must be string"};
+if(data.os !== undefined){
+let data28 = data.os;
+if(!((typeof data28 == "number") && (!(data28 % 1) && !isNaN(data28)))){
+const err52 = {instancePath:instancePath+"/os",schemaPath:"#/properties/os/type",keyword:"type",params:{type: "integer"},message:"must be integer"};
 if(vErrors === null){
 vErrors = [err52];
 }
@@ -636,27 +639,176 @@ vErrors.push(err52);
 }
 errors++;
 }
+if(!(data28 === 1)){
+const err53 = {instancePath:instancePath+"/os",schemaPath:"#/properties/os/enum",keyword:"enum",params:{allowedValues: schema17.properties.os.enum},message:"must be equal to one of the allowed values"};
+if(vErrors === null){
+vErrors = [err53];
+}
+else {
+vErrors.push(err53);
+}
+errors++;
+}
 }
+if(data.rememberMe !== undefined){
+let data29 = data.rememberMe;
+if(!((typeof data29 == "number") && (!(data29 % 1) && !isNaN(data29)))){
+const err54 = {instancePath:instancePath+"/rememberMe",schemaPath:"#/properties/rememberMe/type",keyword:"type",params:{type: "integer"},message:"must be integer"};
+if(vErrors === null){
+vErrors = [err54];
 }
 else {
-const err53 = {instancePath:instancePath+"/siteOwner",schemaPath:"#/$defs/account/type",keyword:"type",params:{type: "object"},message:"must be object"};
+vErrors.push(err54);
+}
+errors++;
+}
+if(!(data29 === 1)){
+const err55 = {instancePath:instancePath+"/rememberMe",schemaPath:"#/properties/rememberMe/enum",keyword:"enum",params:{allowedValues: schema17.properties.rememberMe.enum},message:"must be equal to one of the allowed values"};
 if(vErrors === null){
-vErrors = [err53];
+vErrors = [err55];
 }
 else {
-vErrors.push(err53);
+vErrors.push(err55);
+}
+errors++;
+}
+}
+if(data.siteOwner !== undefined){
+let data30 = data.siteOwner;
+if(data30 && typeof data30 == "object" && !Array.isArray(data30)){
+if(data30.type === undefined){
+const err56 = {instancePath:instancePath+"/siteOwner",schemaPath:"#/$defs/account/required",keyword:"required",params:{missingProperty: "type"},message:"must have required property '"+"type"+"'"};
+if(vErrors === null){
+vErrors = [err56];
+}
+else {
+vErrors.push(err56);
 }
 errors++;
 }
+if(data30.id === undefined){
+const err57 = {instancePath:instancePath+"/siteOwner",schemaPath:"#/$defs/account/required",keyword:"required",params:{missingProperty: "id"},message:"must have required property '"+"id"+"'"};
+if(vErrors === null){
+vErrors = [err57];
+}
+else {
+vErrors.push(err57);
 }
+errors++;
+}
+if(data30.name === undefined){
+const err58 = {instancePath:instancePath+"/siteOwner",schemaPath:"#/$defs/account/required",keyword:"required",params:{missingProperty: "name"},message:"must have required property '"+"name"+"'"};
+if(vErrors === null){
+vErrors = [err58];
 }
 else {
-const err54 = {instancePath,schemaPath:"#/type",keyword:"type",params:{type: "object"},message:"must be object"};
+vErrors.push(err58);
+}
+errors++;
+}
+for(const key4 in data30){
+if(!(((((key4 === "type") || (key4 === "id")) || (key4 === "name")) || (key4 === "department")) || (key4 === "departmentName"))){
+const err59 = {instancePath:instancePath+"/siteOwner",schemaPath:"#/$defs/account/additionalProperties",keyword:"additionalProperties",params:{additionalProperty: key4},message:"must NOT have additional properties"};
 if(vErrors === null){
-vErrors = [err54];
+vErrors = [err59];
 }
 else {
-vErrors.push(err54);
+vErrors.push(err59);
+}
+errors++;
+}
+}
+if(data30.type !== undefined){
+let data31 = data30.type;
+if(typeof data31 !== "string"){
+const err60 = {instancePath:instancePath+"/siteOwner/type",schemaPath:"#/$defs/account/properties/type/type",keyword:"type",params:{type: "string"},message:"must be string"};
+if(vErrors === null){
+vErrors = [err60];
+}
+else {
+vErrors.push(err60);
+}
+errors++;
+}
+if(!((data31 === "user") || (data31 === "organization"))){
+const err61 = {instancePath:instancePath+"/siteOwner/type",schemaPath:"#/$defs/account/properties/type/enum",keyword:"enum",params:{allowedValues: schema21.properties.type.enum},message:"must be equal to one of the allowed values"};
+if(vErrors === null){
+vErrors = [err61];
+}
+else {
+vErrors.push(err61);
+}
+errors++;
+}
+}
+if(data30.id !== undefined){
+if(typeof data30.id !== "string"){
+const err62 = {instancePath:instancePath+"/siteOwner/id",schemaPath:"#/$defs/account/properties/id/type",keyword:"type",params:{type: "string"},message:"must be string"};
+if(vErrors === null){
+vErrors = [err62];
+}
+else {
+vErrors.push(err62);
+}
+errors++;
+}
+}
+if(data30.name !== undefined){
+if(typeof data30.name !== "string"){
+const err63 = {instancePath:instancePath+"/siteOwner/name",schemaPath:"#/$defs/account/properties/name/type",keyword:"type",params:{type: "string"},message:"must be string"};
+if(vErrors === null){
+vErrors = [err63];
+}
+else {
+vErrors.push(err63);
+}
+errors++;
+}
+}
+if(data30.department !== undefined){
+if(typeof data30.department !== "string"){
+const err64 = {instancePath:instancePath+"/siteOwner/department",schemaPath:"#/$defs/account/properties/department/type",keyword:"type",params:{type: "string"},message:"must be string"};
+if(vErrors === null){
+vErrors = [err64];
+}
+else {
+vErrors.push(err64);
+}
+errors++;
+}
+}
+if(data30.departmentName !== undefined){
+if(typeof data30.departmentName !== "string"){
+const err65 = {instancePath:instancePath+"/siteOwner/departmentName",schemaPath:"#/$defs/account/properties/departmentName/type",keyword:"type",params:{type: "string"},message:"must be string"};
+if(vErrors === null){
+vErrors = [err65];
+}
+else {
+vErrors.push(err65);
+}
+errors++;
+}
+}
+}
+else {
+const err66 = {instancePath:instancePath+"/siteOwner",schemaPath:"#/$defs/account/type",keyword:"type",params:{type: "object"},message:"must be object"};
+if(vErrors === null){
+vErrors = [err66];
+}
+else {
+vErrors.push(err66);
+}
+errors++;
+}
+}
+}
+else {
+const err67 = {instancePath,schemaPath:"#/type",keyword:"type",params:{type: "object"},message:"must be object"};
+if(vErrors === null){
+vErrors = [err67];
+}
+else {
+vErrors.push(err67);
 }
 errors++;
 }
@@ -908,7 +1060,7 @@ vErrors.push(err19);
 errors++;
 }
 if(!((data10 === "user") || (data10 === "organization"))){
-const err20 = {instancePath:instancePath+"/account/type",schemaPath:"#/$defs/account/properties/type/enum",keyword:"enum",params:{allowedValues: schema20.properties.type.enum},message:"must be equal to one of the allowed values"};
+const err20 = {instancePath:instancePath+"/account/type",schemaPath:"#/$defs/account/properties/type/enum",keyword:"enum",params:{allowedValues: schema21.properties.type.enum},message:"must be equal to one of the allowed values"};
 if(vErrors === null){
 vErrors = [err20];
 }

package/session/schema.d.ts

@@ -104,6 +104,9 @@ declare const _default: {
                 asAdmin: {
                     $ref: string;
                 };
+                asAdminOrg: {
+                    $ref: string;
+                };
                 pd: {
                     type: string;
                     format: string;

package/session/schema.js

@@ -116,6 +116,9 @@ export default {
                 asAdmin: {
                     $ref: '#/$defs/userRef'
                 },
+                asAdminOrg: {
+                    $ref: '#/$defs/organizationMembership'
+                },
                 pd: {
                     type: 'string',
                     format: 'date'