Mirroristas/CommunitySolidServer
2
0
Fork 0
mirror of https://github.com/CommunitySolidServer/CommunitySolidServer.git synced 2024-10-03 14:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Clean up ACP imports

Browse Source
This commit is contained in:
Joachim Van Herwegen 2022-11-02 09:17:35 +01:00
parent a1e916b73a
commit 9f04e28dc6
7 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package-lock.json generated
View File

@ -12,7 +12,7 @@
"@comunica/context-entries": "^2.2.0", "@comunica/context-entries": "^2.2.0",
"@comunica/query-sparql": "^2.2.1", "@comunica/query-sparql": "^2.2.1",
"@rdfjs/types": "^1.1.0", "@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", "@solid/access-token-verifier": "^2.0.3",
"@types/async-lock": "^1.1.5", "@types/async-lock": "^1.1.5",
"@types/bcryptjs": "^2.4.2", "@types/bcryptjs": "^2.4.2",
@ -3834,9 +3834,9 @@
} }
}, },
"node_modules/@solid/access-control-policy": { "node_modules/@solid/access-control-policy": {
"version": "0.1.2", "version": "0.1.3",
"resolved": "https://registry.npmjs.org/@solid/access-control-policy/-/access-control-policy-0.1.2.tgz", "resolved": "https://registry.npmjs.org/@solid/access-control-policy/-/access-control-policy-0.1.3.tgz",
"integrity": "sha512-zviquBk05id837Ff3dJTGwlt0y+ocWtHuLEuZenramh7qVXUoJuFQ6BnxiMDxUJY/rCpNEmjyE8rn+dT/NpMqA==" "integrity": "sha512-LTxfN8N5hNBNYfuwJr0nyfxlp2P0+GeK+biCa1FQgIqska3wXpTgYaxjVgsw27mKx4N1FOlaGwG+nXdLnl9ykg=="
}, },
"node_modules/@solid/access-token-verifier": { "node_modules/@solid/access-token-verifier": {
"version": "2.0.3", "version": "2.0.3",
@ -18589,9 +18589,9 @@
} }
}, },
"@solid/access-control-policy": { "@solid/access-control-policy": {
"version": "0.1.2", "version": "0.1.3",
"resolved": "https://registry.npmjs.org/@solid/access-control-policy/-/access-control-policy-0.1.2.tgz", "resolved": "https://registry.npmjs.org/@solid/access-control-policy/-/access-control-policy-0.1.3.tgz",
"integrity": "sha512-zviquBk05id837Ff3dJTGwlt0y+ocWtHuLEuZenramh7qVXUoJuFQ6BnxiMDxUJY/rCpNEmjyE8rn+dT/NpMqA==" "integrity": "sha512-LTxfN8N5hNBNYfuwJr0nyfxlp2P0+GeK+biCa1FQgIqska3wXpTgYaxjVgsw27mKx4N1FOlaGwG+nXdLnl9ykg=="
}, },
"@solid/access-token-verifier": { "@solid/access-token-verifier": {
"version": "2.0.3", "version": "2.0.3",

2
package.json
View File

@ -102,7 +102,7 @@
"@comunica/context-entries": "^2.2.0", "@comunica/context-entries": "^2.2.0",
"@comunica/query-sparql": "^2.2.1", "@comunica/query-sparql": "^2.2.1",
"@rdfjs/types": "^1.1.0", "@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", "@solid/access-token-verifier": "^2.0.3",
"@types/async-lock": "^1.1.5", "@types/async-lock": "^1.1.5",
"@types/bcryptjs": "^2.4.2", "@types/bcryptjs": "^2.4.2",

6
src/authorization/AcpReader.ts
View File

@ -1,8 +1,6 @@
import { Readable } from 'stream'; import { Readable } from 'stream';
import { allowAccessModes } from '@solid/access-control-policy/dist/algorithm/allow_access_modes'; import type { IAccessControlledResource, IContext, IPolicy } from '@solid/access-control-policy';
import type { IAccessControlledResource } from '@solid/access-control-policy/dist/type/i_access_controlled_resource'; import { allowAccessModes } from '@solid/access-control-policy';
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 { Store } from 'n3'; import type { Store } from 'n3';
import type { Credentials } from '../authentication/Credentials'; import type { Credentials } from '../authentication/Credentials';
import type { AuxiliaryStrategy } from '../http/auxiliary/AuxiliaryStrategy'; import type { AuxiliaryStrategy } from '../http/auxiliary/AuxiliaryStrategy';

14
src/authorization/AcpUtil.ts
View File

@ -1,9 +1,11 @@
import type { IAccessControl } from '@solid/access-control-policy/dist/type/i_access_control'; import type {
import type { IAccessControlResource } from '@solid/access-control-policy/dist/type/i_access_control_resource'; IAccessControl,
import type { IAccessControlledResource } from '@solid/access-control-policy/dist/type/i_access_controlled_resource'; IAccessControlResource,
import type { IAccessMode } from '@solid/access-control-policy/dist/type/i_access_mode'; IAccessControlledResource,
import type { IMatcher } from '@solid/access-control-policy/dist/type/i_matcher'; IAccessMode,
import type { IPolicy } from '@solid/access-control-policy/dist/type/i_policy'; IMatcher,
IPolicy,
} from '@solid/access-control-policy';
import type { Store } from 'n3'; import type { Store } from 'n3';
import type { NamedNode, Term } from 'rdf-js'; import type { NamedNode, Term } from 'rdf-js';
import { ACP } from '../util/Vocabularies'; import { ACP } from '../util/Vocabularies';

2
test/unit/authorization/AcpUtil.test.ts
View File

@ -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 { DataFactory, Parser, Store } from 'n3';
import { import {
getAccessControl, getAccessControl,

2
test/unit/server/middleware/AcpHeaderHandler.test.ts
View File

@ -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 { createResponse } from 'node-mocks-http';
import type { AuxiliaryIdentifierStrategy } from '../../../../src/http/auxiliary/AuxiliaryIdentifierStrategy'; import type { AuxiliaryIdentifierStrategy } from '../../../../src/http/auxiliary/AuxiliaryIdentifierStrategy';
import type { TargetExtractor } from '../../../../src/http/input/identifier/TargetExtractor'; import type { TargetExtractor } from '../../../../src/http/input/identifier/TargetExtractor';

5
test/util/AcpHelper.ts
View File

@ -1,7 +1,4 @@
import type { IAccessControl } from '@solid/access-control-policy/dist/type/i_access_control'; import type { IAccessControl, IAccessControlledResource, IMatcher, IPolicy } from '@solid/access-control-policy';
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 { v4 } from 'uuid'; import { v4 } from 'uuid';
import { BasicRepresentation } from '../../src/http/representation/BasicRepresentation'; import { BasicRepresentation } from '../../src/http/representation/BasicRepresentation';
import type { ResourceIdentifier } from '../../src/http/representation/ResourceIdentifier'; import type { ResourceIdentifier } from '../../src/http/representation/ResourceIdentifier';