Merge branch 'develop' into ed25519

2024-03-01 05:04:54 +00:00
parent 87ded2bd1c 033d71ee28
commit a5cccf3799
13 changed files with 184 additions and 156 deletions
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -226,11 +226,11 @@
 		"@types/vary": "1.1.3",
 		"@types/web-push": "3.6.3",
 		"@types/ws": "8.5.10",
-		"@typescript-eslint/eslint-plugin": "6.18.1",
-		"@typescript-eslint/parser": "6.18.1",
+		"@typescript-eslint/eslint-plugin": "7.1.0",
+		"@typescript-eslint/parser": "7.1.0",
 		"aws-sdk-client-mock": "3.0.1",
 		"cross-env": "7.0.3",
-		"eslint": "8.56.0",
+		"eslint": "8.57.0",
 		"eslint-plugin-import": "2.29.1",
 		"execa": "8.0.1",
 		"fkill": "^9.0.0",
--- a/packages/backend/src/models/json-schema/role.ts
+++ b/packages/backend/src/models/json-schema/role.ts
@@ -60,6 +60,9 @@ export const packedRoleCondFormulaValueIsLocalOrRemoteSchema = {
 export const packedRoleCondFormulaValueAssignedRoleSchema = {
 	type: 'object',
 	properties: {
+		id: {
+			type: 'string', optional: false,
+		},
 		type: {
 			type: 'string',
 			nullable: false, optional: false,