From 406a33d79700849e8f3db583df0247c5d456055e Mon Sep 17 00:00:00 2001 From: Kuba Orlik Date: Fri, 3 May 2024 12:53:56 +0200 Subject: [PATCH] update sealious and sealgen --- package-lock.json | 18 +++++++++--------- package.json | 4 ++-- src/back/collections/users.ts | 4 ++-- src/back/policy-types/roles.ts | 5 ++++- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 562c8fb..5cd9939 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@playwright/test": "^1.36.1", "@sealcode/file-manager": "^1.0.2", "@sealcode/jdd": "^0.4.7", - "@sealcode/sealgen": "^0.15.12", + "@sealcode/sealgen": "^0.15.13", "@sealcode/ts-predicates": "^0.6.2", "@types/kill-port": "^2.0.0", "@types/leaflet": "^1.9.8", @@ -29,7 +29,7 @@ "nodemon": "^3.0.1", "object-path": "^0.11.8", "qs": "^6.12.0", - "sealious": "^0.19.6", + "sealious": "^0.19.8", "stimulus": "^2.0.0", "tempstream": "^0.3.16" }, @@ -844,9 +844,9 @@ "integrity": "sha512-EZI7e8EY8gI1pw2bKdevjl+fBJbcSlpNkCZ8XoEOV3cHakPujiT6M4l775RDkfxJSbLX7jhOBkhgPNDfmCpZbg==" }, "node_modules/@sealcode/sealgen": { - "version": "0.15.12", - "resolved": "https://registry.npmjs.org/@sealcode/sealgen/-/sealgen-0.15.12.tgz", - "integrity": "sha512-110dZlytiTxaHLJ2AK3a7CfUTfuwXLsIo2kQX4l1hP2cDrYYEyxhJkTyZe5KWBNr2lOmq6Gy4XLvhd95ZYVNhA==", + "version": "0.15.13", + "resolved": "https://registry.npmjs.org/@sealcode/sealgen/-/sealgen-0.15.13.tgz", + "integrity": "sha512-WhvQzgcTxPSMz80TV1LFrndG2AkNy7f0w3lsS8kSql+/kiHq84sxnwXCrmgtM9EjYV5yx/Jw2rQtMt9HWtGlcA==", "dependencies": { "@koa/router": "^12.0.1", "@sealcode/file-manager": "^1.0.2", @@ -874,7 +874,7 @@ "peerDependencies": { "koa": "^2.13.0", "koa-responsive-image-router": "^0.2.24", - "sealious": "^0.19.7" + "sealious": "^0.19.8" } }, "node_modules/@sealcode/sealgen/node_modules/@sealcode/ts-predicates": { @@ -8876,9 +8876,9 @@ } }, "node_modules/sealious": { - "version": "0.19.7", - "resolved": "https://registry.npmjs.org/sealious/-/sealious-0.19.7.tgz", - "integrity": "sha512-yhKSd+AsFqzCc7UUK4aBIk/YZS7XrvcGJLJyR9m8cVSzN9dmP3glx4xL+gogBOG+SirsDw6FQZz9VKdhshzVUA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/sealious/-/sealious-0.19.8.tgz", + "integrity": "sha512-oHvLX1hGxpWlLJVgmjYdehW66K5cS/ra/3xpOLMO/hdfzpE7/EdNGETw/4G30lSYW9RNiexjD1dotteF+T2IOQ==", "dependencies": { "@koa/router": "^12.0.1", "@sealcode/file-manager": "^1.0.1", diff --git a/package.json b/package.json index 7ebee82..aeaf156 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@playwright/test": "^1.36.1", "@sealcode/file-manager": "^1.0.2", "@sealcode/jdd": "^0.4.7", - "@sealcode/sealgen": "^0.15.12", + "@sealcode/sealgen": "^0.15.13", "@sealcode/ts-predicates": "^0.6.2", "@types/kill-port": "^2.0.0", "@types/leaflet": "^1.9.8", @@ -57,7 +57,7 @@ "nodemon": "^3.0.1", "object-path": "^0.11.8", "qs": "^6.12.0", - "sealious": "^0.19.6", + "sealious": "^0.19.8", "stimulus": "^2.0.0", "tempstream": "^0.3.16" }, diff --git a/src/back/collections/users.ts b/src/back/collections/users.ts index a9be885..c3452ac 100644 --- a/src/back/collections/users.ts +++ b/src/back/collections/users.ts @@ -8,7 +8,6 @@ export default class Users extends Collections.users { fields = { ...App.BaseCollections.users.fields, email: new FieldTypes.Email().setRequired(true), - username: new FieldTypes.Username().setRequired(true), roles: new FieldTypes.ReverseSingleReference({ referencing_collection: "user-roles", referencing_field: "user", @@ -48,6 +47,7 @@ export default class Users extends Collections.users { .filter({ user: ctx.user_id || "" }) .fetch(); - return rolesEntries.items.map((item) => item.get("role")); + // eslint-disable-next-line @typescript-eslint/consistent-type-assertions + return rolesEntries.items.map((item) => item.get("role") as string); } } diff --git a/src/back/policy-types/roles.ts b/src/back/policy-types/roles.ts index ddb8f9f..89a2479 100644 --- a/src/back/policy-types/roles.ts +++ b/src/back/policy-types/roles.ts @@ -16,7 +16,10 @@ export class Roles extends Policy { .list(context) .filter({ user: user_id }) .fetch(); - const roles = user_roles.items.map((user_role) => user_role.get("role")); + const roles = user_roles.items.map( + // eslint-disable-next-line @typescript-eslint/consistent-type-assertions + (user_role) => user_role.get("role") as string + ); return this.allowed_roles.filter((allowed_role) => roles.includes(allowed_role)) .length;