From 9f04e28dc606e3c51e9342f35dff17bae648409c Mon Sep 17 00:00:00 2001 From: Joachim Van Herwegen Date: Wed, 2 Nov 2022 09:17:35 +0100 Subject: [PATCH] chore: Clean up ACP imports --- package-lock.json | 14 +++++++------- package.json | 2 +- src/authorization/AcpReader.ts | 6 ++---- src/authorization/AcpUtil.ts | 14 ++++++++------ test/unit/authorization/AcpUtil.test.ts | 2 +- .../server/middleware/AcpHeaderHandler.test.ts | 2 +- test/util/AcpHelper.ts | 5 +---- 7 files changed, 21 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index e5b5bef01..71784691a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@comunica/context-entries": "^2.2.0", "@comunica/query-sparql": "^2.2.1", "@rdfjs/types": "^1.1.0", - "@solid/access-control-policy": "^0.1.2", + "@solid/access-control-policy": "^0.1.3", "@solid/access-token-verifier": "^2.0.3", "@types/async-lock": "^1.1.5", "@types/bcryptjs": "^2.4.2", @@ -3834,9 +3834,9 @@ } }, "node_modules/@solid/access-control-policy": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@solid/access-control-policy/-/access-control-policy-0.1.2.tgz", - "integrity": "sha512-zviquBk05id837Ff3dJTGwlt0y+ocWtHuLEuZenramh7qVXUoJuFQ6BnxiMDxUJY/rCpNEmjyE8rn+dT/NpMqA==" + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@solid/access-control-policy/-/access-control-policy-0.1.3.tgz", + "integrity": "sha512-LTxfN8N5hNBNYfuwJr0nyfxlp2P0+GeK+biCa1FQgIqska3wXpTgYaxjVgsw27mKx4N1FOlaGwG+nXdLnl9ykg==" }, "node_modules/@solid/access-token-verifier": { "version": "2.0.3", @@ -18589,9 +18589,9 @@ } }, "@solid/access-control-policy": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@solid/access-control-policy/-/access-control-policy-0.1.2.tgz", - "integrity": "sha512-zviquBk05id837Ff3dJTGwlt0y+ocWtHuLEuZenramh7qVXUoJuFQ6BnxiMDxUJY/rCpNEmjyE8rn+dT/NpMqA==" + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@solid/access-control-policy/-/access-control-policy-0.1.3.tgz", + "integrity": "sha512-LTxfN8N5hNBNYfuwJr0nyfxlp2P0+GeK+biCa1FQgIqska3wXpTgYaxjVgsw27mKx4N1FOlaGwG+nXdLnl9ykg==" }, "@solid/access-token-verifier": { "version": "2.0.3", diff --git a/package.json b/package.json index 98a3e631d..4bf400763 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "@comunica/context-entries": "^2.2.0", "@comunica/query-sparql": "^2.2.1", "@rdfjs/types": "^1.1.0", - "@solid/access-control-policy": "^0.1.2", + "@solid/access-control-policy": "^0.1.3", "@solid/access-token-verifier": "^2.0.3", "@types/async-lock": "^1.1.5", "@types/bcryptjs": "^2.4.2", diff --git a/src/authorization/AcpReader.ts b/src/authorization/AcpReader.ts index e9b842147..0112613f0 100644 --- a/src/authorization/AcpReader.ts +++ b/src/authorization/AcpReader.ts @@ -1,8 +1,6 @@ import { Readable } from 'stream'; -import { allowAccessModes } from '@solid/access-control-policy/dist/algorithm/allow_access_modes'; -import type { IAccessControlledResource } from '@solid/access-control-policy/dist/type/i_access_controlled_resource'; -import type { IContext } from '@solid/access-control-policy/dist/type/i_context'; -import type { IPolicy } from '@solid/access-control-policy/dist/type/i_policy'; +import type { IAccessControlledResource, IContext, IPolicy } from '@solid/access-control-policy'; +import { allowAccessModes } from '@solid/access-control-policy'; import type { Store } from 'n3'; import type { Credentials } from '../authentication/Credentials'; import type { AuxiliaryStrategy } from '../http/auxiliary/AuxiliaryStrategy'; diff --git a/src/authorization/AcpUtil.ts b/src/authorization/AcpUtil.ts index 0fbaaef47..7879d0b6a 100644 --- a/src/authorization/AcpUtil.ts +++ b/src/authorization/AcpUtil.ts @@ -1,9 +1,11 @@ -import type { IAccessControl } from '@solid/access-control-policy/dist/type/i_access_control'; -import type { IAccessControlResource } from '@solid/access-control-policy/dist/type/i_access_control_resource'; -import type { IAccessControlledResource } from '@solid/access-control-policy/dist/type/i_access_controlled_resource'; -import type { IAccessMode } from '@solid/access-control-policy/dist/type/i_access_mode'; -import type { IMatcher } from '@solid/access-control-policy/dist/type/i_matcher'; -import type { IPolicy } from '@solid/access-control-policy/dist/type/i_policy'; +import type { + IAccessControl, + IAccessControlResource, + IAccessControlledResource, + IAccessMode, + IMatcher, + IPolicy, +} from '@solid/access-control-policy'; import type { Store } from 'n3'; import type { NamedNode, Term } from 'rdf-js'; import { ACP } from '../util/Vocabularies'; diff --git a/test/unit/authorization/AcpUtil.test.ts b/test/unit/authorization/AcpUtil.test.ts index 989f0dd5f..36255a01e 100644 --- a/test/unit/authorization/AcpUtil.test.ts +++ b/test/unit/authorization/AcpUtil.test.ts @@ -1,4 +1,4 @@ -import { ACL } from '@solid/access-control-policy/dist/constant/acl'; +import { ACL } from '@solid/access-control-policy'; import { DataFactory, Parser, Store } from 'n3'; import { getAccessControl, diff --git a/test/unit/server/middleware/AcpHeaderHandler.test.ts b/test/unit/server/middleware/AcpHeaderHandler.test.ts index 8b4262fad..4a9b7b033 100644 --- a/test/unit/server/middleware/AcpHeaderHandler.test.ts +++ b/test/unit/server/middleware/AcpHeaderHandler.test.ts @@ -1,4 +1,4 @@ -import { ACP } from '@solid/access-control-policy/dist/constant/acp'; +import { ACP } from '@solid/access-control-policy'; import { createResponse } from 'node-mocks-http'; import type { AuxiliaryIdentifierStrategy } from '../../../../src/http/auxiliary/AuxiliaryIdentifierStrategy'; import type { TargetExtractor } from '../../../../src/http/input/identifier/TargetExtractor'; diff --git a/test/util/AcpHelper.ts b/test/util/AcpHelper.ts index ba73297e7..23689aea4 100644 --- a/test/util/AcpHelper.ts +++ b/test/util/AcpHelper.ts @@ -1,7 +1,4 @@ -import type { IAccessControl } from '@solid/access-control-policy/dist/type/i_access_control'; -import type { IAccessControlledResource } from '@solid/access-control-policy/dist/type/i_access_controlled_resource'; -import type { IMatcher } from '@solid/access-control-policy/dist/type/i_matcher'; -import type { IPolicy } from '@solid/access-control-policy/dist/type/i_policy'; +import type { IAccessControl, IAccessControlledResource, IMatcher, IPolicy } from '@solid/access-control-policy'; import { v4 } from 'uuid'; import { BasicRepresentation } from '../../src/http/representation/BasicRepresentation'; import type { ResourceIdentifier } from '../../src/http/representation/ResourceIdentifier';